summaryrefslogtreecommitdiff
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-07-21 02:53:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 18:06:10 +0100
commit5e26b3df04716010b31b4c7ac0ac6b28982784f3 (patch)
tree78339785ab6bfa6a23aab03e4b195a9bdc0b525b /meta/recipes-core
parente196300e066aef347cee52a4fd2eae21725e41f7 (diff)
downloadopenembedded-core-5e26b3df04716010b31b4c7ac0ac6b28982784f3.tar.gz
openembedded-core-5e26b3df04716010b31b4c7ac0ac6b28982784f3.tar.bz2
openembedded-core-5e26b3df04716010b31b4c7ac0ac6b28982784f3.zip
eudev: don't move udev directory
The code did "mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir}" which is not needed any more, eudev can work with ${base_libdir}/udev. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/udev/eudev_3.2.bb10
1 files changed, 1 insertions, 9 deletions
diff --git a/meta/recipes-core/udev/eudev_3.2.bb b/meta/recipes-core/udev/eudev_3.2.bb
index 8e229fc704..211252cebc 100644
--- a/meta/recipes-core/udev/eudev_3.2.bb
+++ b/meta/recipes-core/udev/eudev_3.2.bb
@@ -27,7 +27,6 @@ inherit autotools update-rc.d qemu pkgconfig
EXTRA_OECONF = " \
--sbindir=${base_sbindir} \
- --libexecdir=${nonarch_base_libdir} \
--with-rootlibdir=${base_libdir} \
--with-rootprefix= \
"
@@ -53,13 +52,6 @@ do_install_append() {
# Use classic network interface naming scheme
touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules
- # Fix for multilib systems where libs along with confs are installed incorrectly
- if ! [ -d ${D}${nonarch_base_libdir}/udev ]
- then
- install -d ${D}${nonarch_base_libdir}/udev
- mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir}
- fi
-
# hid2hci has moved to bluez4. removed in udev as of version 169
rm -f ${D}${base_libdir}/udev/hid2hci
}
@@ -75,7 +67,7 @@ PACKAGES =+ "udev-cache"
PACKAGES =+ "eudev-hwdb"
-FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm"
+FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm"
FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \
${includedir}/libudev.h ${libdir}/libudev.so \
${includedir}/udev.h ${libdir}/libudev.la \