diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2014-10-04 04:27:55 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:17:06 +0000 |
| commit | 35b72a6d7698c0b89efca2fc64dd473ee684743b (patch) | |
| tree | 6e55b04f38e0ace9a5685bc8ac4bdb0ce35a194b | |
| parent | e5fcc237807d064578028ecf8af51d82c5a66c18 (diff) | |
| download | openembedded-core-contrib-35b72a6d7698c0b89efca2fc64dd473ee684743b.tar.gz | |
systemd: don't move libgudev around, it breaks libgudev-1.0.la
* libgudev-1.0.la still references /usr/lib and this change was breaking gypsy (detected in navit) and
network-manager-applet
(From OE-Core rev: 7807d1d8b9535a87ba3e5ab7df21a2954708333f)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/recipes-core/systemd/systemd_216.bb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb index 598d45e7de..8ded3ede50 100644 --- a/meta/recipes-core/systemd/systemd_216.bb +++ b/meta/recipes-core/systemd/systemd_216.bb @@ -130,9 +130,6 @@ do_install() { sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd fi - # Move libgudev back to ${rootlibdir} to keep backward compatibility - [ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev* - # Delete journal README, as log can be symlinked inside volatile. rm -f ${D}/${localstatedir}/log/README @@ -172,10 +169,10 @@ python populate_packages_prepend (){ systemdlibdir = d.getVar("rootlibdir", True) do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) } -PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*" +PACKAGES_DYNAMIC += "^lib(udev|systemd).*" PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \ - ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh" + ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev" SYSTEMD_PACKAGES = "${PN}-binfmt" SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" @@ -189,6 +186,8 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze" FILES_${PN}-initramfs = "/init" RDEPENDS_${PN}-initramfs = "${PN}" +FILES_libgudev = "${libdir}/libgudev*${SOLIBS}" + # The test cases need perl and bash to run correctly. RDEPENDS_${PN}-ptest += "perl bash" FILES_${PN}-ptest += "${libdir}/udev/rules.d" |