diff options
| -rw-r--r-- | meta/recipes-core/udev/udev.inc | 15 |
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 | ||
| 32 | inherit autotools pkgconfig update-rc.d | 32 | inherit autotools pkgconfig update-rc.d |
| 33 | 33 | ||
| 34 | # udevd/udevadm -> /sbin/, libudev.so.* -> /lib/ | 34 | libexecdir = "${base_libdir}" |
| 35 | sbindir = "${base_sbindir}" | ||
| 36 | libexecdir = "${base_libdir}" | ||
| 37 | EXTRA_OECONF = "--disable-introspection \ | 35 | EXTRA_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 | ||
| 49 | PACKAGES =+ "udev-acl udev-consolekit udev-utils" | 47 | PACKAGES =+ "udev-utils udev-cache" |
| 50 | PACKAGES =+ "udev-cache libudev libudev-dev libudev-dbg" | 48 | PACKAGES =+ "libudev libudev-dev libudev-dbg" |
| 51 | PACKAGES =+ "libgudev libgudev-dev libgudev-dbg" | 49 | PACKAGES =+ "libgudev libgudev-dev libgudev-dbg" |
| 52 | 50 | ||
| 53 | INITSCRIPT_PACKAGES = "udev udev-cache" | 51 | INITSCRIPT_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" |
| 74 | FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache" | 72 | FILES_udev-cache = "${sysconfdir}/init.d/udev-cache ${sysconfdir}/default/udev-cache" |
| 75 | 73 | ||
| 76 | FILES_udev-acl = "${base_libdir}/udev/udev-acl ${base_libdir}/udev/rules.d/70-acl.rules" | 74 | FILES_udev-utils = "${bindir}/udevadm" |
| 77 | |||
| 78 | FILES_udev-utils = "${bindir}/udevinfo ${bindir}/udevtest ${base_sbindir}/udevadm" | ||
| 79 | |||
| 80 | RDEPENDS_udev-consolekit += "udev-acl" | ||
| 81 | FILES_udev-consolekit = "${libdir}/ConsoleKit" | ||
| 82 | 75 | ||
| 83 | do_install_append () { | 76 | do_install_append () { |
| 84 | install -d ${D}${sysconfdir}/init.d | 77 | install -d ${D}${sysconfdir}/init.d |
