summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Smith <msmith@cbnco.com>2009-08-12 00:28:05 -0400
committerMichael Smith <msmith@cbnco.com>2009-10-22 19:29:38 -0400
commitba8ce6a3fdb2e5af2d73857cadab99895d734240 (patch)
tree0a358ea6b14e540cd98a0a8a58025625790126b0
parentda48a59464fcaf00ad1b7f38ed2c1b081e6e4818 (diff)
udev 141: fix packaging on x86_64
udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir} is ${prefix}/lib64. This means some paths need to be hardcoded to "/lib" instead of "${base_libdir}". Signed-off-by: Michael Smith <msmith@cbnco.com>
-rw-r--r--recipes/udev/udev_141.bb15
1 files changed, 10 insertions, 5 deletions
diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb
index 3f4256470f..13b380855d 100644
--- a/recipes/udev/udev_141.bb
+++ b/recipes/udev/udev_141.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
# Untested
DEFAULT_PREFERENCE = "-1"
-PR = "r11"
+PR = "r12"
# needed for init.d script
RDEPENDS_${PN} += "udev-utils"
@@ -51,8 +51,10 @@ RPROVIDES_${PN} = "hotplug"
FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
-FILES_${PN} += "${libdir}/udev/* ${base_libdir}/udev/*"
-FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
+# udev installs binaries under $(udev_prefix)/lib/udev, even if ${libdir}
+# is ${prefix}/lib64
+FILES_${PN} += "/lib/udev/* /lib/udev/*"
+FILES_${PN}-dbg += "/lib/udev/.debug"
do_install () {
install -d ${D}${usrsbindir} \
@@ -64,8 +66,11 @@ do_install () {
install -d ${D}${sysconfdir}/default
install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev
- mv ${D}${base_libdir}/udev/rules.d ${D}${sysconfdir}/udev/
- ln -sf ${sysconfdir}/udev/rules.d ${D}${base_libdir}/udev/
+ # Move udev rules from $(udev_prefix)/lib to /etc.
+ # This is hardcoded to $(udev_prefix)/lib/udev/rules.d in the
+ # Makefile, even if libdir is lib64.
+ mv ${D}/lib/udev/rules.d ${D}${sysconfdir}/udev/
+ ln -sf ${sysconfdir}/udev/rules.d ${D}/lib/udev/
cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/
cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/