diff options
| -rw-r--r-- | packages/udev/udev-115/.mtn2git_empty (renamed from packages/udev/udev-118/.mtn2git_empty) | 0 | ||||
| -rw-r--r-- | packages/udev/udev-115/flags.patch (renamed from packages/udev/udev-118/flags.patch) | 0 | ||||
| -rw-r--r-- | packages/udev/udev-115/init (renamed from packages/udev/udev-118/init) | 0 | ||||
| -rw-r--r-- | packages/udev/udev-115/local.rules (renamed from packages/udev/udev-118/local.rules) | 0 | ||||
| -rw-r--r-- | packages/udev/udev-115/permissions.rules (renamed from packages/udev/udev-118/permissions.rules) | 0 | ||||
| -rw-r--r-- | packages/udev/udev-115/udev.rules (renamed from packages/udev/udev-118/udev.rules) | 0 | ||||
| -rw-r--r-- | packages/udev/udev-115/udevtrigger_add_devname_filtering.patch (renamed from packages/udev/udev-118/udevtrigger_add_devname_filtering.patch) | 0 | ||||
| -rw-r--r-- | packages/udev/udev-115/vol_id_ld.patch (renamed from packages/udev/udev-118/vol_id_ld.patch) | 0 | ||||
| -rw-r--r-- | packages/udev/udev.inc | 29 | ||||
| -rw-r--r-- | packages/udev/udev_115.bb (renamed from packages/udev/udev_118.bb) | 18 |
10 files changed, 23 insertions, 24 deletions
diff --git a/packages/udev/udev-118/.mtn2git_empty b/packages/udev/udev-115/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/udev/udev-118/.mtn2git_empty +++ b/packages/udev/udev-115/.mtn2git_empty diff --git a/packages/udev/udev-118/flags.patch b/packages/udev/udev-115/flags.patch index 13f20eb6a8..13f20eb6a8 100644 --- a/packages/udev/udev-118/flags.patch +++ b/packages/udev/udev-115/flags.patch diff --git a/packages/udev/udev-118/init b/packages/udev/udev-115/init index e44c675f2f..e44c675f2f 100644 --- a/packages/udev/udev-118/init +++ b/packages/udev/udev-115/init diff --git a/packages/udev/udev-118/local.rules b/packages/udev/udev-115/local.rules index 5b926018f5..5b926018f5 100644 --- a/packages/udev/udev-118/local.rules +++ b/packages/udev/udev-115/local.rules diff --git a/packages/udev/udev-118/permissions.rules b/packages/udev/udev-115/permissions.rules index 99e03b1036..99e03b1036 100644 --- a/packages/udev/udev-118/permissions.rules +++ b/packages/udev/udev-115/permissions.rules diff --git a/packages/udev/udev-118/udev.rules b/packages/udev/udev-115/udev.rules index 72be706e84..72be706e84 100644 --- a/packages/udev/udev-118/udev.rules +++ b/packages/udev/udev-115/udev.rules diff --git a/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch b/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch index 87cafcaa9d..87cafcaa9d 100644 --- a/packages/udev/udev-118/udevtrigger_add_devname_filtering.patch +++ b/packages/udev/udev-115/udevtrigger_add_devname_filtering.patch diff --git a/packages/udev/udev-118/vol_id_ld.patch b/packages/udev/udev-115/vol_id_ld.patch index 11126eef8d..11126eef8d 100644 --- a/packages/udev/udev-118/vol_id_ld.patch +++ b/packages/udev/udev-115/vol_id_ld.patch diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc index d04b63e1e0..87361aef8a 100644 --- a/packages/udev/udev.inc +++ b/packages/udev/udev.inc @@ -2,15 +2,16 @@ DESCRIPTION ?= "udev is a program which dynamically creates and removes device n /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." LICENSE = "GPL" -SRC_URI += " \ - file://udev.rules \ - file://devfs-udev.rules \ - file://links.conf \ - file://permissions.rules \ - file://mount.sh \ - file://network.sh \ - file://local.rules \ - file://init" +SRC_URI += "\ + file://udev.rules \ + file://devfs-udev.rules \ + file://links.conf \ + file://permissions.rules \ + file://mount.sh \ + file://network.sh \ + file://local.rules \ + file://init \ +" inherit update-rc.d autotools pkgconfig @@ -37,9 +38,11 @@ EXTRA_OEMAKE = "-e \ 'STRIP=echo'" do_install () { - install -d ${D}${usrsbindir} \ - ${D}${sbindir} + install -d ${D}${usrsbindir} + install -d ${D}${sbindir} + oe_runmake 'DESTDIR=${D}' INSTALL=install install + install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev @@ -60,8 +63,8 @@ do_install () { 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 ${STAGING_INCDIR} + oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR} } PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev" diff --git a/packages/udev/udev_118.bb b/packages/udev/udev_115.bb index 20fef83d74..2e68b017ca 100644 --- a/packages/udev/udev_118.bb +++ b/packages/udev/udev_115.bb @@ -2,16 +2,14 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod /dev/, handles hotplug events and loads drivers at boot time. It replaces \ the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" - -PR = "r3" - -DEFAULT_PREFERENCE = "-118" +PR = "r0" SRC_URI = "\ http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://flags.patch;patch=1 \ file://vol_id_ld.patch;patch=1 \ file://udevtrigger_add_devname_filtering.patch;patch=1 \ + file://noasmlinkage.patch;patch=1 \ file://mount.blacklist \ " @@ -24,15 +22,13 @@ FILES_${PN}-dbg += "${base_libdir}/udev/.debug" UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/" EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix=" -do_compile_prepend() { - sed -i s,asmlinkage,, *.c -} - do_install () { - install -d ${D}${usrsbindir} \ - ${D}${sysconfdir} \ - ${D}${sbindir} + install -d ${D}${usrsbindir} + install -d ${D}${sysconfdir} + install -d ${D}${sbindir} + oe_runmake 'DESTDIR=${D}' INSTALL=install install + install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev |