From ca4ce80ed8077fe3275439938f2b146fc2bdb2bc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 17 Apr 2013 14:53:21 +0000 Subject: 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 --- meta/recipes-core/udev/udev.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta') 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 \ ac_cv_file__usr_share_hwdata_pci_ids=no \ ac_cv_file__usr_share_misc_pci_ids=yes \ --sbindir=${base_sbindir} \ - --libexecdir=${base_sbindir} \ + --libexecdir=${nonarch_base_libdir} \ --with-rootlibdir=${base_libdir} \ --with-rootprefix= \ " @@ -61,7 +61,7 @@ RRECOMMENDS_${PN} += "udev-utils" FILES_${PN}-dbg += "${libexecdir}/.debug" FILES_${PN}-dbg += "${base_libdir}/udev/.debug/" FILES_${PN}-dbg += "${base_libdir}/udev/.debug/*" -FILES_${PN}-dbg += "${base_sbindir}/udev/.debug/*" +FILES_${PN}-dbg += "${nonarch_base_libdir}/udev/.debug/*" FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc" FILES_libudev = "${base_libdir}/libudev.so.*" FILES_libudev-dbg = "${base_libdir}/.debug/libudev.so.*" @@ -79,8 +79,8 @@ do_install_append () { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev install -m 0755 ${WORKDIR}/udev-cache ${D}${sysconfdir}/init.d/udev-cache - sed -i s%@UDEVD@%${base_sbindir}/udev/udevd% ${D}${sysconfdir}/init.d/udev - sed -i s%@UDEVD@%${base_sbindir}/udev/udevd% ${D}${sysconfdir}/init.d/udev-cache + sed -i s%@UDEVD@%${nonarch_base_libdir}/udev/udevd% ${D}${sysconfdir}/init.d/udev + sed -i s%@UDEVD@%${nonarch_base_libdir}/udev/udevd% ${D}${sysconfdir}/init.d/udev-cache install -d ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/udev-cache.default ${D}${sysconfdir}/default/udev-cache -- cgit v1.2.3-54-g00ecf