Patchwork systemd: Fix packaging warnings and spin libnss_myhostname to package of its own

login
register
mail settings
Submitter Khem Raj
Date Feb. 15, 2013, 7:29 p.m.
Message ID <1360956550-31119-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/44707/
State New
Headers show

Comments

Khem Raj - Feb. 15, 2013, 7:29 p.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/systemd/systemd_197.bb |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Ross Burton - Feb. 15, 2013, 8:33 p.m.
On 15 February 2013 19:29, Khem Raj <raj.khem@gmail.com> wrote:
> +                /lib/udev/hwdb.d \

Would this obsolete the patch I posted earlier to add pci/usb IDs?

Ross
Enrico Scholz - Feb. 16, 2013, 12:05 p.m.
"Burton, Ross" <ross.burton-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
writes:

> On 15 February 2013 19:29, Khem Raj <raj.khem-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>> +                /lib/udev/hwdb.d \
>
> Would this obsolete the patch I posted earlier to add pci/usb IDs?

no; these files are useless without an 'udevadm hwdb --update' in a
script.

I did not looked at the generated database, but the hwdb.d files are
large (4 MiB) so that they should be moved into an own subpackage.


Enrico

Patch

diff --git a/meta/recipes-core/systemd/systemd_197.bb b/meta/recipes-core/systemd/systemd_197.bb
index 0c3ebc4..aa6fcea 100644
--- a/meta/recipes-core/systemd/systemd_197.bb
+++ b/meta/recipes-core/systemd/systemd_197.bb
@@ -102,7 +102,9 @@  do_install() {
 }
 
 python populate_packages_prepend (){
-    systemdlibdir = d.getVar("base_libdir", True)
+    systemdbaselibdir = d.getVar("base_libdir", True)
+    do_split_packages(d, systemdbaselibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
+    systemdlibdir = d.getVar("libdir", True)
     do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
 }
 PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*"
@@ -149,7 +151,6 @@  FILES_${PN} = " ${base_bindir}/* \
                 ${systemd_unitdir}/system/* \
                 /lib/udev/rules.d/99-systemd.rules \
                 ${base_libdir}/security/*.so \
-                ${libdir}/libnss_myhostname.so.2 \
                 /cgroup \
                 ${bindir}/systemd* \
                 ${bindir}/localectl \
@@ -162,6 +163,7 @@  FILES_${PN} = " ${base_bindir}/* \
                 ${exec_prefix}/lib/sysctl.d \
                 ${localstatedir} \
                 ${libexecdir} \
+                /lib/udev/hwdb.d \
                 /lib/udev/rules.d/70-uaccess.rules \
                 /lib/udev/rules.d/71-seat.rules \
                 /lib/udev/rules.d/73-seat-late.rules \