diff options
Diffstat (limited to 'recipes/udev')
-rw-r--r-- | recipes/udev/udev-092/mtd-exclude-persistent.patch | 17 | ||||
-rw-r--r-- | recipes/udev/udev-100/mtd-exclude-persistent.patch | 17 | ||||
-rw-r--r-- | recipes/udev/udev-118/mtd-exclude-persistent.patch | 13 | ||||
-rw-r--r-- | recipes/udev/udev-124/mtd-exclude-persistent.patch | 13 | ||||
-rw-r--r-- | recipes/udev/udev-141/bug/10-mx31.rules | 49 | ||||
-rw-r--r-- | recipes/udev/udev-141/bug/30-BUG.rules | 26 | ||||
-rw-r--r-- | recipes/udev/udev-141/bug/bmi_eventpipe.sh | 8 | ||||
-rw-r--r-- | recipes/udev/udev-141/cache | 18 | ||||
-rw-r--r-- | recipes/udev/udev-141/init | 8 | ||||
-rw-r--r-- | recipes/udev/udev_092.bb | 3 | ||||
-rw-r--r-- | recipes/udev/udev_100.bb | 3 | ||||
-rw-r--r-- | recipes/udev/udev_118.bb | 3 | ||||
-rw-r--r-- | recipes/udev/udev_124.bb | 3 | ||||
-rw-r--r-- | recipes/udev/udev_141.bb | 33 |
14 files changed, 199 insertions, 15 deletions
diff --git a/recipes/udev/udev-092/mtd-exclude-persistent.patch b/recipes/udev/udev-092/mtd-exclude-persistent.patch new file mode 100644 index 0000000000..30032d402d --- /dev/null +++ b/recipes/udev/udev-092/mtd-exclude-persistent.patch @@ -0,0 +1,17 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +--- + etc/udev/60-persistent-storage.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- udev-092.orig/etc/udev/60-persistent-storage.rules ++++ udev-092/etc/udev/60-persistent-storage.rules +@@ -5,7 +5,7 @@ ACTION!="add", GOTO="persistent_storage_ + SUBSYSTEM!="block", GOTO="persistent_storage_end" + + # skip rules for inappropriate block devices +-KERNEL=="ram*|loop*|fd*|nbd*", GOTO="persistent_storage_end" ++KERNEL=="ram*|loop*|fd*|mtd*|nbd*", GOTO="persistent_storage_end" + + # never access removable ide devices, the drivers are causing event loops on open() + KERNEL=="hd*[!0-9]", SYSFS{removable}=="1", DRIVER=="ide-cs|ide-floppy", GOTO="persistent_storage_end" diff --git a/recipes/udev/udev-100/mtd-exclude-persistent.patch b/recipes/udev/udev-100/mtd-exclude-persistent.patch new file mode 100644 index 0000000000..2b848810d2 --- /dev/null +++ b/recipes/udev/udev-100/mtd-exclude-persistent.patch @@ -0,0 +1,17 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +--- + etc/udev/rules.d/60-persistent-storage.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- udev-100.orig/etc/udev/rules.d/60-persistent-storage.rules ++++ udev-100/etc/udev/rules.d/60-persistent-storage.rules +@@ -5,7 +5,7 @@ ACTION!="add", GOTO="persistent_storage_ + SUBSYSTEM!="block", GOTO="persistent_storage_end" + + # skip rules for inappropriate block devices +-KERNEL=="ram*|loop*|fd*|nbd*|dm-*", GOTO="persistent_storage_end" ++KERNEL=="ram*|loop*|fd*|mtd*|nbd*|dm-*", GOTO="persistent_storage_end" + + # never access non-cdrom removable ide devices, the drivers are causing event loops on open() + KERNEL=="hd*[!0-9]", ATTRS{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end" diff --git a/recipes/udev/udev-118/mtd-exclude-persistent.patch b/recipes/udev/udev-118/mtd-exclude-persistent.patch new file mode 100644 index 0000000000..204b7b487d --- /dev/null +++ b/recipes/udev/udev-118/mtd-exclude-persistent.patch @@ -0,0 +1,13 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +--- a/etc/udev/rules.d/60-persistent-storage.rules 2008-06-12 07:24:30.000000000 +0200 ++++ b/etc/udev/rules.d/60-persistent-storage.rules 2009-08-18 11:39:23.595063264 +0200 +@@ -10,7 +10,7 @@ + SUBSYSTEM!="block", GOTO="persistent_storage_end" + + # skip rules for inappropriate block devices +-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end" ++KERNEL=="ram*|loop*|fd*|mtd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end" + + # never access non-cdrom removable ide devices, the drivers are causing event loops on open() + KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end" diff --git a/recipes/udev/udev-124/mtd-exclude-persistent.patch b/recipes/udev/udev-124/mtd-exclude-persistent.patch new file mode 100644 index 0000000000..204b7b487d --- /dev/null +++ b/recipes/udev/udev-124/mtd-exclude-persistent.patch @@ -0,0 +1,13 @@ +Copyright (c) 2009 MontaVista Software, Inc. All rights reserved. + +--- a/etc/udev/rules.d/60-persistent-storage.rules 2008-06-12 07:24:30.000000000 +0200 ++++ b/etc/udev/rules.d/60-persistent-storage.rules 2009-08-18 11:39:23.595063264 +0200 +@@ -10,7 +10,7 @@ + SUBSYSTEM!="block", GOTO="persistent_storage_end" + + # skip rules for inappropriate block devices +-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end" ++KERNEL=="ram*|loop*|fd*|mtd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end" + + # never access non-cdrom removable ide devices, the drivers are causing event loops on open() + KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end" diff --git a/recipes/udev/udev-141/bug/10-mx31.rules b/recipes/udev/udev-141/bug/10-mx31.rules new file mode 100644 index 0000000000..de427fc8b2 --- /dev/null +++ b/recipes/udev/udev-141/bug/10-mx31.rules @@ -0,0 +1,49 @@ +KERNEL=="ttyS[0-9]", NAME="tts/%n", SYMLINK+="tts%n" +KERNEL=="ttymxc[0-9]", NAME="ttymxc/%n", SYMLINK+="ttymxc%n" + +KERNEL=="mxc_mu[0-9]", NAME="mxc_mu/%n", SYMLINK+="mxc_mu%n" +KERNEL=="fb*", NAME="fb/%n", SYMLINK+="fb%n" +KERNEL=="i2c*", NAME="i2c/%n" +KERNEL=="mxc_ipc*", NAME="mxc_ipc/%n" +KERNEL=="video*", NAME="v4l/video%n" + +KERNEL=="rtc", NAME="misc/rtc" +KERNEL=="watchdog", NAME="misc/watchdog" + +KERNEL=="mc13783_adc", NAME="mc13783_adc", SYMLINK+="ts" +KERNEL=="pmic_adc", NAME="pmic_adc", SYMLINK+="ts" + +# The long class name gets cut off to be mc13783_connectiv in +# /sys/class/mc13783_connectivity/mc13783_connectivit +KERNEL=="mc13783_connectiv*", NAME="mc13783_connectivity" + +KERNEL=="mxc_ssi[0-9]*", NAME="mxc_ssi/%n", SYMLINK+="mxc_ssi%n" +KERNEL=="spi[0-9]*", NAME="spi/%n", SYMLINK+="spi%n" + +KERNEL=="mtdblock*", NAME="mtdblock/%n" SYMLINK+="mtdblock%n" +KERNEL=="mtd[0-9]", NAME="mtd/%n" + +# A more elegant way of doing this must exist... +KERNEL=="mtd0ro", NAME="mtd/0ro" +KERNEL=="mtd1ro", NAME="mtd/1ro" +KERNEL=="mtd2ro", NAME="mtd/2ro" +KERNEL=="mtd3ro", NAME="mtd/3ro" +KERNEL=="mtd4ro", NAME="mtd/4ro" +KERNEL=="mtd5ro", NAME="mtd/5ro" +KERNEL=="mtd6ro", NAME="mtd/6ro" +KERNEL=="mtd7ro", NAME="mtd/7ro" +KERNEL=="mtd8ro", NAME="mtd/8ro" +KERNEL=="mtd9ro", NAME="mtd/9ro" + +# Note that we want /dev/dsp linked to /dev/sound/dsp1... +KERNEL=="dsp", NAME="sound/dsp" +KERNEL=="dspW", NAME="sound/dspW" +KERNEL=="dsp1", NAME="sound/dsp1", SYMLINK+="dsp" +KERNEL=="mixer", NAME="sound/mixer", SYMLINK+="mixer" +KERNEL=="sequencer", NAME="sound/sequencer" +KERNEL=="sequencer2", NAME="sound/sequencer2" + +KERNEL=="ram[0-9]*", NAME="ram/%n", SYMLINK+="ram%n" + +KERNEL=="dvfs_dptc", NAME="dvfs_dptc", SYMLINK+="dptc dvfs" + diff --git a/recipes/udev/udev-141/bug/30-BUG.rules b/recipes/udev/udev-141/bug/30-BUG.rules new file mode 100644 index 0000000000..06faa6bb91 --- /dev/null +++ b/recipes/udev/udev-141/bug/30-BUG.rules @@ -0,0 +1,26 @@ +## +## BUG/BMI specific +## +KERNEL=="event*", ATTRS{name}=="bugnav", SYMLINK+="input/bugnav" +KERNEL=="event*", ATTRS{name}=="bmi_motion", SYMLINK+="input/bmi_motion" +KERNEL=="event*", ATTRS{name}=="bug_cam", SYMLINK+="input/bmi_cam" +KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m1", SYMLINK+="input/bmi_audio_m1" +KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m2", SYMLINK+="input/bmi_audio_m2" +KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m3", SYMLINK+="input/bmi_audio_m3" +KERNEL=="event*", ATTRS{name}=="bmi_audio_status_m4", SYMLINK+="input/bmi_audio_m4" +DEVPATH=="/devices/platform/bugfb.0", SYMLINK+="bugfb" +KERNEL=="rtc0", SYMLINK+="rtc" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts0", SYMLINK+="input/bmi_lcd_ts0" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts1", SYMLINK+="input/bmi_lcd_ts1" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts2", SYMLINK+="input/bmi_lcd_ts2" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts3", SYMLINK+="input/bmi_lcd_ts3" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts4", SYMLINK+="input/bmi_lcd_ts4" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts5", SYMLINK+="input/bmi_lcd_ts5" +KERNEL=="event*", ATTRS{name}=="bmi_lcd_ts6", SYMLINK+="input/bmi_lcd_ts6" +ACTION=="add", DEVPATH=="/devices/conn*", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" +ACTION=="remove", DEVPATH=="/devices/conn*", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" +# +# For USB PBPSD, which we've arbitrarily decided will be module F001 +# +ACTION=="remove", SUBSYSTEM=="usb", DRIVERS=="psd_driver", ENV{BMIBUS_PRODUCT}="F001", ENV{BMIBUS_SLOT}="%n", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" +ACTION=="add", SUBSYSTEM=="usb", DRIVERS=="psd_driver", ENV{BMIBUS_PRODUCT}="F001", ENV{BMIBUS_SLOT}="%n", RUN+="/bin/sh /etc/udev/scripts/bmi_eventpipe.sh" diff --git a/recipes/udev/udev-141/bug/bmi_eventpipe.sh b/recipes/udev/udev-141/bug/bmi_eventpipe.sh new file mode 100644 index 0000000000..acbae56118 --- /dev/null +++ b/recipes/udev/udev-141/bug/bmi_eventpipe.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# +# This script passes BMI state variables to the running JVM. +# +if [ ${BMIBUS_PRODUCT} != "" ] && [ ${BMIBUS_SLOT} != "" ] && [ ${ACTION} != "" ]; +then + echo $BMIBUS_PRODUCT 0 $BMIBUS_SLOT $ACTION > /tmp/eventpipe +fi diff --git a/recipes/udev/udev-141/cache b/recipes/udev/udev-141/cache new file mode 100644 index 0000000000..4db1466817 --- /dev/null +++ b/recipes/udev/udev-141/cache @@ -0,0 +1,18 @@ +#!/bin/sh -e + +export TZ=/etc/localtime + +[ -f /etc/default/udev ] && . /etc/default/udev + +echo "Caching udev devnodes" + + if [ "$DEVCACHE" != "" ]; then + echo -n "Populating dev cache" + (cd /; tar cf $DEVCACHE dev) + mv /tmp/uname /etc/udev/saved.uname + mv /tmp/cmdline /etc/udev/saved.cmdline + mv /tmp/atags /etc/udev/saved.atags + echo + fi + +exit 0 diff --git a/recipes/udev/udev-141/init b/recipes/udev/udev-141/init index a0bdf4050a..24ca9d874d 100644 --- a/recipes/udev/udev-141/init +++ b/recipes/udev/udev-141/init @@ -68,14 +68,6 @@ kill_udevd > "/dev/null" 2>&1 else /sbin/udevadm trigger /sbin/udevadm settle - if [ "$DEVCACHE" != "" ]; then - echo -n "Populating dev cache" - (cd /; tar cf $DEVCACHE dev) - mv /tmp/uname /etc/udev/saved.uname - mv /tmp/cmdline /etc/udev/saved.cmdline - mv /tmp/atags /etc/udev/saved.atags - echo - fi fi exit 0 diff --git a/recipes/udev/udev_092.bb b/recipes/udev/udev_092.bb index d9f5cbaa68..50d2156bcd 100644 --- a/recipes/udev/udev_092.bb +++ b/recipes/udev/udev_092.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r24" +PR = "r25" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -11,6 +11,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz file://udevsynthesize.patch;patch=1 \ file://udevsynthesize.sh \ file://arm_inotify_fix.patch;patch=1 \ + file://mtd-exclude-persistent.patch;patch=1 \ file://mount.blacklist \ " diff --git a/recipes/udev/udev_100.bb b/recipes/udev/udev_100.bb index ef08aa4636..550d047cf1 100644 --- a/recipes/udev/udev_100.bb +++ b/recipes/udev/udev_100.bb @@ -9,11 +9,12 @@ used to detect the type of a file system and read its metadata." DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \ needed to link programs with libvolume_id." -PR = "r15" +PR = "r16" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ file://flags.patch;patch=1 \ + file://mtd-exclude-persistent.patch;patch=1 \ file://mount.blacklist \ file://mount.sh \ " diff --git a/recipes/udev/udev_118.bb b/recipes/udev/udev_118.bb index b7043496af..631b8c2df3 100644 --- a/recipes/udev/udev_118.bb +++ b/recipes/udev/udev_118.bb @@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r5" +PR = "r6" DEFAULT_PREFERENCE = "-118" @@ -12,6 +12,7 @@ SRC_URI = "\ file://flags.patch;patch=1 \ file://vol_id_ld.patch;patch=1 \ file://udevtrigger_add_devname_filtering.patch;patch=1 \ + file://mtd-exclude-persistent.patch;patch=1 \ file://mount.blacklist \ " TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/recipes/udev/udev_124.bb b/recipes/udev/udev_124.bb index 9477c55ab9..ab391a3394 100644 --- a/recipes/udev/udev_124.bb +++ b/recipes/udev/udev_124.bb @@ -2,7 +2,7 @@ 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 = "r17" +PR = "r18" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ @@ -10,6 +10,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://vol_id_ld.patch;patch=1 \ file://udevtrigger_add_devname_filtering.patch;patch=1 \ file://libvolume-id-soname.patch;patch=1 \ + file://mtd-exclude-persistent.patch;patch=1 \ file://mount.blacklist \ file://run.rules \ file://default \ diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb index b54b059516..df5e346c4d 100644 --- a/recipes/udev/udev_141.bb +++ b/recipes/udev/udev_141.bb @@ -6,7 +6,7 @@ LICENSE = "GPL" # Untested DEFAULT_PREFERENCE = "-1" -PR = "r15" +PR = "r20" # needed for init.d script RDEPENDS_${PN} += "udev-utils" @@ -24,11 +24,21 @@ SRC_URI += " \ file://network.sh \ file://local.rules \ file://default \ - file://init" + file://init \ + file://cache \ +" SRC_URI_append_h2200 = " file://50-hostap_cs.rules " PACKAGE_ARCH_h2200 = "h2200" +#buglabs's bug device +SRC_URI_append_bug = " \ + file://30-BUG.rules \ + file://10-mx31.rules \ + file://bmi_eventpipe.sh " + +PACKAGE_ARCH_bug = "bug" + inherit update-rc.d autotools_stage # Put stuff in /lib and /sbin @@ -62,6 +72,7 @@ do_install () { oe_runmake 'DESTDIR=${D}' INSTALL=install install install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/udev + install -m 0755 ${WORKDIR}/cache ${D}${sysconfdir}/init.d/udev-cache install -d ${D}${sysconfdir}/default install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/udev @@ -70,7 +81,6 @@ do_install () { # This is hardcoded to $(udev_prefix)/lib/udev/rules.d in the # Makefile, even if libdir is lib64. mv ${D}/lib/udev/rules.d ${D}${sysconfdir}/udev/ - ln -sf ${sysconfdir}/udev/rules.d ${D}/lib/udev/ cp ${S}/rules/rules.d/* ${D}${sysconfdir}/udev/rules.d/ cp ${S}/rules/packages/* ${D}${sysconfdir}/udev/rules.d/ @@ -99,6 +109,23 @@ do_install_append_h2200() { install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules } +do_install_append_bug() { + install -m 0644 ${WORKDIR}/30-BUG.rules ${D}${sysconfdir}/udev/rules.d/30-BUG.rules + install -m 0644 ${WORKDIR}/10-mx31.rules ${D}${sysconfdir}/udev/rules.d/10-mx31.rules + install -m 0644 ${WORKDIR}/bmi_eventpipe.sh ${D}${sysconfdir}/udev/scripts/bmi_eventpipe.sh +} + +# Create the cache after checkroot has run +pkg_postinst_${PN}_append() { +update-rc.d $OPT udev-cache start 12 S . + +if [ -d $D/lib/udev/rules.d ] ; then + echo "$D/lib/udev/rules.d is not a symlink, fixing that" + mv $D/lib/udev/rules.d/* $D${sysconfdir}/udev/rules.d/ + rm -rf $D/lib/udev/rules.d + ln -sf ${sysconfdir}/udev/rules.d $D/lib/udev/ +fi +} do_stage_append() { install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR} |