diff options
-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() { | |||
130 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd | 130 | sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd |
131 | fi | 131 | fi |
132 | 132 | ||
133 | # Move libgudev back to ${rootlibdir} to keep backward compatibility | ||
134 | [ ${rootlibdir} != ${libdir} ] && mv -t ${D}${rootlibdir} ${D}${libdir}/libgudev* | ||
135 | |||
136 | # Delete journal README, as log can be symlinked inside volatile. | 133 | # Delete journal README, as log can be symlinked inside volatile. |
137 | rm -f ${D}/${localstatedir}/log/README | 134 | rm -f ${D}/${localstatedir}/log/README |
138 | 135 | ||
@@ -172,10 +169,10 @@ python populate_packages_prepend (){ | |||
172 | systemdlibdir = d.getVar("rootlibdir", True) | 169 | systemdlibdir = d.getVar("rootlibdir", True) |
173 | do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) | 170 | do_split_packages(d, systemdlibdir, '^lib(.*)\.so\.*', 'lib%s', 'Systemd %s library', extra_depends='', allow_links=True) |
174 | } | 171 | } |
175 | PACKAGES_DYNAMIC += "^lib(udev|gudev|systemd).*" | 172 | PACKAGES_DYNAMIC += "^lib(udev|systemd).*" |
176 | 173 | ||
177 | PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \ | 174 | PACKAGES =+ "${PN}-gui ${PN}-vconsole-setup ${PN}-initramfs ${PN}-analyze ${PN}-kernel-install \ |
178 | ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh" | 175 | ${PN}-rpm-macros ${PN}-binfmt ${PN}-pam ${PN}-zsh libgudev" |
179 | 176 | ||
180 | SYSTEMD_PACKAGES = "${PN}-binfmt" | 177 | SYSTEMD_PACKAGES = "${PN}-binfmt" |
181 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" | 178 | SYSTEMD_SERVICE_${PN}-binfmt = "systemd-binfmt.service" |
@@ -189,6 +186,8 @@ FILES_${PN}-analyze = "${bindir}/systemd-analyze" | |||
189 | FILES_${PN}-initramfs = "/init" | 186 | FILES_${PN}-initramfs = "/init" |
190 | RDEPENDS_${PN}-initramfs = "${PN}" | 187 | RDEPENDS_${PN}-initramfs = "${PN}" |
191 | 188 | ||
189 | FILES_libgudev = "${libdir}/libgudev*${SOLIBS}" | ||
190 | |||
192 | # The test cases need perl and bash to run correctly. | 191 | # The test cases need perl and bash to run correctly. |
193 | RDEPENDS_${PN}-ptest += "perl bash" | 192 | RDEPENDS_${PN}-ptest += "perl bash" |
194 | FILES_${PN}-ptest += "${libdir}/udev/rules.d" | 193 | FILES_${PN}-ptest += "${libdir}/udev/rules.d" |