summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRadu Moisan <radu.moisan@intel.com>2013-04-08 19:29:15 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-09 13:31:37 +0100
commitb49ddeb11c0319b7ece278fd7cef6b0223114ca9 (patch)
tree0a51c664d0e1eecdd70fce5968d73d429fa556c8 /meta
parent9776a7ee7c10d658b705aa88e35705f6310517ef (diff)
downloadpoky-b49ddeb11c0319b7ece278fd7cef6b0223114ca9.tar.gz
udev: Move udevd back to /sbin
Along with v182 upgrade udevd was moved to ${base_libdir} making scripts like init-live.sh to fail in finding udevd. We have some problems here since the placing binaries into either libdir breaks the way our multilib handling works. That code and its associated sanity tests assume that libdir contains binaries of a particular architecture and that these are not allowed to overlap. This is in contrast to the bindirs where conflicts are expected and handled appropriately. So whilst upstream may desire this directory layout, it won't work for OE's usage of it and we need to configure udev differently. The scripts already have fallback code to handle udev in the two locations so there is no issue is going back to our previous layout. [Yocto #4046] (From OE-Core rev: a866e1e298dab5c52e7b8ba9ab68104604511713) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/udev/udev.inc3
-rw-r--r--meta/recipes-core/udev/udev_182.bb2
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index e358d2d200..c4d2ce4c7d 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_libdir} \ 43 --libexecdir=${base_sbindir} \
44 --with-rootlibdir=${base_libdir} \ 44 --with-rootlibdir=${base_libdir} \
45 --with-rootprefix= \ 45 --with-rootprefix= \
46 " 46 "
@@ -61,6 +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}-dev = "${datadir}/pkgconfig/udev.pc" 65FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc"
65FILES_libudev = "${base_libdir}/libudev.so.*" 66FILES_libudev = "${base_libdir}/libudev.so.*"
66FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*" 67FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*"
diff --git a/meta/recipes-core/udev/udev_182.bb b/meta/recipes-core/udev/udev_182.bb
index 42b4d08752..d66292ed7a 100644
--- a/meta/recipes-core/udev/udev_182.bb
+++ b/meta/recipes-core/udev/udev_182.bb
@@ -1,6 +1,6 @@
1include udev.inc 1include udev.inc
2 2
3PR = "r6" 3PR = "r7"
4 4
5# module-init-tools from kmod_git will provide libkmod runtime 5# module-init-tools from kmod_git will provide libkmod runtime
6DEPENDS += "module-init-tools" 6DEPENDS += "module-init-tools"