diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-07-21 02:53:46 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-24 07:30:09 +0100 |
commit | fa7849939a763855139b052fe2179de71f728fee (patch) | |
tree | 1949daac8fbc1e63162dd89574bb52b8bfdd6f30 /meta | |
parent | c0dbfc6dea4361fcd10bee9697af2b4ac2edb73f (diff) | |
download | poky-fa7849939a763855139b052fe2179de71f728fee.tar.gz |
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.
(From OE-Core rev: 5e26b3df04716010b31b4c7ac0ac6b28982784f3)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/udev/eudev_3.2.bb | 10 |
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 | |||
27 | 27 | ||
28 | EXTRA_OECONF = " \ | 28 | EXTRA_OECONF = " \ |
29 | --sbindir=${base_sbindir} \ | 29 | --sbindir=${base_sbindir} \ |
30 | --libexecdir=${nonarch_base_libdir} \ | ||
31 | --with-rootlibdir=${base_libdir} \ | 30 | --with-rootlibdir=${base_libdir} \ |
32 | --with-rootprefix= \ | 31 | --with-rootprefix= \ |
33 | " | 32 | " |
@@ -53,13 +52,6 @@ do_install_append() { | |||
53 | # Use classic network interface naming scheme | 52 | # Use classic network interface naming scheme |
54 | touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules | 53 | touch ${D}${sysconfdir}/udev/rules.d/80-net-name-slot.rules |
55 | 54 | ||
56 | # Fix for multilib systems where libs along with confs are installed incorrectly | ||
57 | if ! [ -d ${D}${nonarch_base_libdir}/udev ] | ||
58 | then | ||
59 | install -d ${D}${nonarch_base_libdir}/udev | ||
60 | mv ${D}${base_libdir}/udev ${D}${nonarch_base_libdir} | ||
61 | fi | ||
62 | |||
63 | # hid2hci has moved to bluez4. removed in udev as of version 169 | 55 | # hid2hci has moved to bluez4. removed in udev as of version 169 |
64 | rm -f ${D}${base_libdir}/udev/hid2hci | 56 | rm -f ${D}${base_libdir}/udev/hid2hci |
65 | } | 57 | } |
@@ -75,7 +67,7 @@ PACKAGES =+ "udev-cache" | |||
75 | PACKAGES =+ "eudev-hwdb" | 67 | PACKAGES =+ "eudev-hwdb" |
76 | 68 | ||
77 | 69 | ||
78 | FILES_${PN} += "${libexecdir} ${nonarch_base_libdir}/udev ${bindir}/udevadm" | 70 | FILES_${PN} += "${libexecdir} ${base_libdir}/udev ${bindir}/udevadm" |
79 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ | 71 | FILES_${PN}-dev = "${datadir}/pkgconfig/udev.pc \ |
80 | ${includedir}/libudev.h ${libdir}/libudev.so \ | 72 | ${includedir}/libudev.h ${libdir}/libudev.so \ |
81 | ${includedir}/udev.h ${libdir}/libudev.la \ | 73 | ${includedir}/udev.h ${libdir}/libudev.la \ |