summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-17 14:53:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-18 00:38:01 +0100
commitca4ce80ed8077fe3275439938f2b146fc2bdb2bc (patch)
tree305581da85c0f6a9dd199c1a1d1c7d9c2a1ce003
parentace492a436a8a08c4a6f1be3a4996438a8d0cc29 (diff)
downloadpoky-ca4ce80ed8077fe3275439938f2b146fc2bdb2bc.tar.gz
udev: Effectively revert the move to /sbin
This effectively reverts the changes made in b49ddeb11c0319b7ece278fd7cef6b0223114ca9 to move udev's libexecdir to sbin. The changes caused too many issues in other places and were not well enough tested this close to a release. Rather than use base_libdir, the nonarch version is used to try and give some chance of multilib not being totally broken in the release. (From OE-Core rev: c50e50fdafad378d75b7b74259a3d55ca0fe3d18) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/udev/udev.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index d025458947..7752452915 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -40,7 +40,7 @@ EXTRA_OECONF = "--disable-introspection \
40 ac_cv_file__usr_share_hwdata_pci_ids=no \ 40 ac_cv_file__usr_share_hwdata_pci_ids=no \
41 ac_cv_file__usr_share_misc_pci_ids=yes \ 41 ac_cv_file__usr_share_misc_pci_ids=yes \
42 --sbindir=${base_sbindir} \ 42 --sbindir=${base_sbindir} \
43 --libexecdir=${base_sbindir} \ 43 --libexecdir=${nonarch_base_libdir} \
44 --with-rootlibdir=${base_libdir} \ 44 --with-rootlibdir=${base_libdir} \
45 --with-rootprefix= \ 45 --with-rootprefix= \
46 " 46 "
@@ -61,7 +61,7 @@ RRECOMMENDS_${PN} += "udev-utils"
61FILES_${PN}-dbg += "${libexecdir}/.debug" 61FILES_${PN}-dbg += "${libexecdir}/.debug"
62FILES_${PN}-dbg += "${base_libdir}/udev/.debug/" 62FILES_${PN}-dbg += "${base_libdir}/udev/.debug/"
63FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*" 63FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*"
64FILES_${PN}-dbg += "${base_sbindir}/udev/.debug/*" 64FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*"
65FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc" 65FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
66FILES_libudev = "${base_libdir}/libudev.so.*" 66FILES_libudev = "${base_libdir}/libudev.so.*"
67FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*" 67FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
@@ -79,8 +79,8 @@ do_install_append () {
79 install -d ${D}${sysconfdir}/init.d 79 install -d ${D}${sysconfdir}/init.d
80 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev 80 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev
81 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache 81 install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache
82 sed -i s%@UDEVD@%${base_sbindir}/udev/udevd% ${D}${sysconfdir}/init.d/udev 82 sed -i s%@UDEVD@%${nonarch_base_libdir}/udev/udevd% ${D}${sysconfdir}/init.d/udev
83 sed -i s%@UDEVD@%${base_sbindir}/udev/udevd% ${D}${sysconfdir}/init.d/udev-cache 83 sed -i s%@UDEVD@%${nonarch_base_libdir}/udev/udevd% ${D}${sysconfdir}/init.d/udev-cache
84 84
85 install -d ${D}${sysconfdir}/default 85 install -d ${D}${sysconfdir}/default
86 install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache 86 install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache