summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2013-02-10 00:09:56 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-11 14:32:18 +0000
commitcf8d4f7cc82cadb2137c02e8d74460dbd3d8fe98 (patch)
treef34c05a1c1934bb33ebbc91e3bd7ea1ba633a203
parentaac88707fe0cf33d01a1a82e7e1e683bbbd49f73 (diff)
downloadpoky-cf8d4f7cc82cadb2137c02e8d74460dbd3d8fe98.tar.gz
udev: Cleanup .inc file
* udev-acl and udev-concolekit have no files so remove these packages * there's nothing in sbindir so remove useless sbindir = "${base_sbindir}" * there is no udevinfo or udevtest so remove these from udev-utils * udevadm is installed in bindir so modify it's path in FILES_udev-utils (From OE-Core rev: 25e01e11586f422f3659318796cb847cb701b03e) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/udev/udev.inc15
1 files changed, 4 insertions, 11 deletions
diff --git a/meta/recipes-core/udev/udev.inc b/meta/recipes-core/udev/udev.inc
index facad0cc46..bd82c34b57 100644
--- a/meta/recipes-core/udev/udev.inc
+++ b/meta/recipes-core/udev/udev.inc
@@ -31,9 +31,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
31 31
32inherit autotools pkgconfig update-rc.d 32inherit autotools pkgconfig update-rc.d
33 33
34# udevd/udevadm -> /sbin/, libudev.so.* -> /lib/ 34libexecdir = "${base_libdir}"
35sbindir = "${base_sbindir}"
36libexecdir = "${base_libdir}"
37EXTRA_OECONF = "--disable-introspection \ 35EXTRA_OECONF = "--disable-introspection \
38 --with-rootlibdir=${base_libdir} \ 36 --with-rootlibdir=${base_libdir} \
39 --with-pci-ids-path=${datadir}/pci.ids \ 37 --with-pci-ids-path=${datadir}/pci.ids \
@@ -46,8 +44,8 @@ EXTRA_OECONF = "--disable-introspection \
46 --with-rootprefix= \ 44 --with-rootprefix= \
47 " 45 "
48 46
49PACKAGES =+ "udev-acl udev-consolekit udev-utils" 47PACKAGES =+ "udev-utils udev-cache"
50PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg" 48PACKAGES =+ "libudev libudev-dev libudev-dbg"
51PACKAGES =+ "libgudev libgudev-dev libgudev-dbg" 49PACKAGES =+ "libgudev libgudev-dev libgudev-dbg"
52 50
53INITSCRIPT_PACKAGES = "udev udev-cache" 51INITSCRIPT_PACKAGES = "udev udev-cache"
@@ -73,12 +71,7 @@ FILES_libgudev-dev = "${includedir}/gudev* ${libdir}/libgudev*.so ${libdir}/libg
73 ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc" 71 ${libdir}/libgudev*.a ${libdir}/pkgconfig/gudev*.pc"
74FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache" 72FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache"
75 73
76FILES_udev-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules" 74FILES_udev-utils = "${bindir}/udevadm"
77
78FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm"
79
80RDEPENDS_udev-consolekit += "udev-acl"
81FILES_udev-consolekit = "${libdir}/ConsoleKit"
82 75
83do_install_append () { 76do_install_append () {
84 install -d ${D}${sysconfdir}/init.d 77 install -d ${D}${sysconfdir}/init.d