From b5bf3dd458c1f1eedb69e6a6c8b472a817ddf7a6 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Fri, 13 Jun 2008 20:31:58 +0000 Subject: [PATCH] udev-118: go back in time to udev-115 which seems to work slightly better on some Zaurus models Zaurus models: need to force downgrade, I don't want to raise PE here. --- .../{udev-118 => udev-115}/.mtn2git_empty | 0 .../udev/{udev-118 => udev-115}/flags.patch | 0 packages/udev/{udev-118 => udev-115}/init | 0 .../udev/{udev-118 => udev-115}/local.rules | 0 .../{udev-118 => udev-115}/permissions.rules | 0 .../udev/{udev-118 => udev-115}/udev.rules | 0 .../udevtrigger_add_devname_filtering.patch | 0 .../{udev-118 => udev-115}/vol_id_ld.patch | 0 packages/udev/udev.inc | 29 ++++++++++--------- packages/udev/{udev_118.bb => udev_115.bb} | 18 +++++------- 10 files changed, 23 insertions(+), 24 deletions(-) rename packages/udev/{udev-118 => udev-115}/.mtn2git_empty (100%) rename packages/udev/{udev-118 => udev-115}/flags.patch (100%) rename packages/udev/{udev-118 => udev-115}/init (100%) rename packages/udev/{udev-118 => udev-115}/local.rules (100%) rename packages/udev/{udev-118 => udev-115}/permissions.rules (100%) rename packages/udev/{udev-118 => udev-115}/udev.rules (100%) rename packages/udev/{udev-118 => udev-115}/udevtrigger_add_devname_filtering.patch (100%) rename packages/udev/{udev-118 => udev-115}/vol_id_ld.patch (100%) rename packages/udev/{udev_118.bb => udev_115.bb} (91%) diff --git a/packages/udev/udev-118/.mtn2git_empty b/packages/udev/udev-115/.mtn2git_empty similarity index 100% rename from packages/udev/udev-118/.mtn2git_empty rename to packages/udev/udev-115/.mtn2git_empty diff --git a/packages/udev/udev-118/flags.patch b/packages/udev/udev-115/flags.patch similarity index 100% rename from packages/udev/udev-118/flags.patch rename to packages/udev/udev-115/flags.patch diff --git a/packages/udev/udev-118/init b/packages/udev/udev-115/init similarity index 100% rename from packages/udev/udev-118/init rename to packages/udev/udev-115/init diff --git a/packages/udev/udev-118/local.rules b/packages/udev/udev-115/local.rules similarity index 100% rename from packages/udev/udev-118/local.rules rename to packages/udev/udev-115/local.rules diff --git a/packages/udev/udev-118/permissions.rules b/packages/udev/udev-115/permissions.rules similarity index 100% rename from packages/udev/udev-118/permissions.rules rename to packages/udev/udev-115/permissions.rules diff --git a/packages/udev/udev-118/udev.rules b/packages/udev/udev-115/udev.rules similarity index 100% rename from packages/udev/udev-118/udev.rules rename to 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 similarity index 100% rename from packages/udev/udev-118/udevtrigger_add_devname_filtering.patch rename to 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 similarity index 100% rename from packages/udev/udev-118/vol_id_ld.patch rename to 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 similarity index 91% rename from packages/udev/udev_118.bb rename to 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 -- 2.39.5