diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2014-10-04 04:27:55 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-04 10:19:54 +0000 |
| commit | 7807d1d8b9535a87ba3e5ab7df21a2954708333f (patch) | |
| tree | 4edba480bf5efa2600507e8c1a468a3acc214779 /meta/recipes-core | |
| parent | 9c59d3d8b538d3a98ff4b5e5b189a4a23a85da2d (diff) | |
| download | openembedded-core-7807d1d8b9535a87ba3e5ab7df21a2954708333f.tar.gz openembedded-core-7807d1d8b9535a87ba3e5ab7df21a2954708333f.tar.bz2 openembedded-core-7807d1d8b9535a87ba3e5ab7df21a2954708333f.zip | |
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core')
| -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 6d3e47fbe9..27a5d926ff 100644 --- a/meta/recipes-core/systemd/systemd_216.bb +++ b/meta/recipes-core/systemd/systemd_216.bb @@ -131,9 +131,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 @@ -173,10 +170,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" @@ -190,6 +187,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" |