diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2010-05-25 13:18:06 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-05-25 20:19:28 -0700 |
| commit | 523f22b938703b56a823fa9e9c577869669ddb82 (patch) | |
| tree | 3ba62781507827970ed49ecf6e884da3afd057b3 /recipes/udev/udev.inc | |
| parent | 6fe7cef27069415f2eba36bc640cf59013d4979b (diff) | |
| download | openembedded-523f22b938703b56a823fa9e9c577869669ddb82.tar.gz | |
udev: Use udev.inc and add udevadm to udev pacakge instead of udev-utils
* Main purpose of the patch was to fix the problem where udev-utils was
needed to be in root file system just to get udevadm binary. So this
binary is moved into udev package instead.
* Use INC_PR for all except udev 151.
* Use udev.inc in all recipes except udev 151.
* All udev recipes built udev_151 and udev_124 runs fine too.
* in udev_151 Add module-init-tools-depmod to RDEPENDS.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/udev/udev.inc')
| -rw-r--r-- | recipes/udev/udev.inc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/recipes/udev/udev.inc b/recipes/udev/udev.inc index 14d10b45cc..943fdfcc19 100644 --- a/recipes/udev/udev.inc +++ b/recipes/udev/udev.inc @@ -1,8 +1,9 @@ DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \ /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." + LICENSE = "GPLv2+" -SRC_URI += " \ +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://udev.rules \ file://devfs-udev.rules \ file://links.conf \ @@ -12,6 +13,8 @@ SRC_URI += " \ file://local.rules \ file://init" +INC_PR = "r26" + inherit update-rc.d autotools pkgconfig PARALLEL_MAKE = "" @@ -19,18 +22,19 @@ UDEV_DEVFS_RULES ?= "0" PKG_libvolume-id-dev = "libvolume-id-dev" INITSCRIPT_NAME = "udev" -INITSCRIPT_PARAMS = "start 04 S ." +INITSCRIPT_PARAMS = "start 03 S ." export CROSS = "${TARGET_PREFIX}" export HOSTCC = "${BUILD_CC}" export udevdir ?= "/dev" +# Put stuff in /lib and /sbin +export bindir := "${base_bindir}" +export sbindir := "${base_sbindir}" export usrbindir := "${bindir}" export usrsbindir := "${sbindir}" -export etcdir = "${sysconfdir}" -LD = "${CC}" -bindir = "/bin" -sbindir = "/sbin" +export etcdir := "${sysconfdir}" +TARGET_CC_ARCH += "${LDFLAGS}" UDEV_EXTRAS = "<override me>" EXTRA_OEMAKE = "-e \ 'EXTRAS=${UDEV_EXTRAS}' \ @@ -56,17 +60,13 @@ do_install () { install -m 0755 ${WORKDIR}/mount.sh ${D}${sysconfdir}/udev/scripts/mount.sh install -m 0755 ${WORKDIR}/network.sh ${D}${sysconfdir}/udev/scripts -} - -do_stage () { - autotools_stage_all - install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR} - oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR} + install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${D}${includedir} + oe_libinstall -C extras/volume_id/lib -so libvolume_id ${D}${libdir} } PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev" FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc" -FILES_udev-utils = "${usrbindir}/udevinfo ${sbindir}/udevadm ${usrbindir}/udevtest" +FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest" FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" -FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd" +FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd ${sbindir}/udevadm" FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug" |