summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2014-10-04 04:27:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-04 10:27:09 +0000
commit41ae2056e6b6f17a1d9fe7408596a448f3e605ad (patch)
treea878acac5766bb606c85ff753fa253e04c653a29
parent8619d937261da462acb01f24701add1201698f9f (diff)
downloadpoky-41ae2056e6b6f17a1d9fe7408596a448f3e605ad.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>
-rw-r--r--meta/recipes-core/systemd/systemd_216.bb9
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() {
131 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd 131 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
132 fi 132 fi
133 133
134 # Move libgudev back to ${rootlibdir} to keep backward compatibility
135 [ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev*
136
137 # Delete journal README, as log can be symlinked inside volatile. 134 # Delete journal README, as log can be symlinked inside volatile.
138 rm -f ${D}/${localstatedir}/log/README 135 rm -f ${D}/${localstatedir}/log/README
139 136
@@ -173,10 +170,10 @@ python populate_packages_prepend (){
173 systemdlibdir = d.getVar("rootlibdir", True) 170 systemdlibdir = d.getVar("rootlibdir", True)
174 do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) 171 do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True)
175} 172}
176PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*" 173PACKAGES_DYNAMIC += "^lib(udev|systemd).*"
177 174
178PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \ 175PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \
179 ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh" 176 ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev"
180 177
181SYSTEMD_PACKAGES = "${PN}-binfmt" 178SYSTEMD_PACKAGES = "${PN}-binfmt"
182SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" 179SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service"
@@ -190,6 +187,8 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze"
190FILES_${PN}-initramfs = "/init" 187FILES_${PN}-initramfs = "/init"
191RDEPENDS_${PN}-initramfs = "${PN}" 188RDEPENDS_${PN}-initramfs = "${PN}"
192 189
190FILES_libgudev = "${libdir}/libgudev*${SOLIBS}"
191
193# The test cases need perl and bash to run correctly. 192# The test cases need perl and bash to run correctly.
194RDEPENDS_${PN}-ptest += "perl bash" 193RDEPENDS_${PN}-ptest += "perl bash"
195FILES_${PN}-ptest += "${libdir}/udev/rules.d" 194FILES_${PN}-ptest += "${libdir}/udev/rules.d"