summaryrefslogtreecommitdiffstats
path: root/meta/packages/udev
diff options
context:
space:
mode:
authorChris Larson <kergoth@openedhand.com>2006-10-05 21:56:07 +0000
committerChris Larson <kergoth@openedhand.com>2006-10-05 21:56:07 +0000
commit16e5c3b37721d0e2b335de6a9d4514f394c2f336 (patch)
treee7ea111f3e549383d82ed773579d2cd00c1cb1b9 /meta/packages/udev
parent009c24a4011928da2a9a4e38e6ca384fa7c654f8 (diff)
downloadpoky-16e5c3b37721d0e2b335de6a9d4514f394c2f336.tar.gz
Update udev from upstream oe (still using 092, just a newer PR, so the .debug stuff is split out of its packaging).
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@788 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/udev')
-rw-r--r--meta/packages/udev/files/50-hostap_cs.rules4
-rw-r--r--meta/packages/udev/udev-092/local.rules2
-rw-r--r--meta/packages/udev/udev-092/udev.rules4
-rw-r--r--meta/packages/udev/udev.inc5
-rw-r--r--meta/packages/udev/udev_092.bb17
5 files changed, 25 insertions, 7 deletions
diff --git a/meta/packages/udev/files/50-hostap_cs.rules b/meta/packages/udev/files/50-hostap_cs.rules
new file mode 100644
index 0000000000..efefdc58fc
--- /dev/null
+++ b/meta/packages/udev/files/50-hostap_cs.rules
@@ -0,0 +1,4 @@
1# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards
2#
3ACTION=="add", DEVICE=="hostap_cs", \
4 SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1"
diff --git a/meta/packages/udev/udev-092/local.rules b/meta/packages/udev/udev-092/local.rules
index d053334652..2308b52c4a 100644
--- a/meta/packages/udev/udev-092/local.rules
+++ b/meta/packages/udev/udev-092/local.rules
@@ -28,4 +28,4 @@ KERNEL=="rtc0", SYMLINK+="rtc"
28ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" 28ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
29 29
30# Create a symlink to any touchscreen input device 30# Create a symlink to any touchscreen input device
31SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*k*a0,1,*18,*", SYMLINK+="input/touchscreen0" \ No newline at end of file 31SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/meta/packages/udev/udev-092/udev.rules b/meta/packages/udev/udev-092/udev.rules
index 9c4ea4214d..c1834a9a1c 100644
--- a/meta/packages/udev/udev-092/udev.rules
+++ b/meta/packages/udev/udev-092/udev.rules
@@ -96,3 +96,7 @@ KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
96 96
97# Firmware Helper 97# Firmware Helper
98ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" 98ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
99
100# Samsung UARTS
101KERNEL=="s3c2410_serial[0-9]" NAME="ttySAC%n"
102
diff --git a/meta/packages/udev/udev.inc b/meta/packages/udev/udev.inc
index a3896a6978..5245d6e2b3 100644
--- a/meta/packages/udev/udev.inc
+++ b/meta/packages/udev/udev.inc
@@ -1,4 +1,4 @@
1DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \ 1DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \
2/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel." 2/dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
3LICENSE = "GPL" 3LICENSE = "GPL"
4 4
@@ -33,7 +33,8 @@ bindir = "/bin"
33sbindir = "/sbin" 33sbindir = "/sbin"
34 34
35UDEV_EXTRAS = "<override me>" 35UDEV_EXTRAS = "<override me>"
36FILES_${PN} += "${usrbindir} ${usrsbindir}" 36FILES_${PN} += "${usrbindir}/* ${usrsbindir}/*"
37FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
37EXTRA_OEMAKE = "-e \ 38EXTRA_OEMAKE = "-e \
38 'EXTRAS=${UDEV_EXTRAS}' \ 39 'EXTRAS=${UDEV_EXTRAS}' \
39 'STRIP=echo'" 40 'STRIP=echo'"
diff --git a/meta/packages/udev/udev_092.bb b/meta/packages/udev/udev_092.bb
index 794a525754..87febedf05 100644
--- a/meta/packages/udev/udev_092.bb
+++ b/meta/packages/udev/udev_092.bb
@@ -3,21 +3,26 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
3the hotplug package and requires a kernel not older than 2.6.12." 3the hotplug package and requires a kernel not older than 2.6.12."
4RPROVIDES = "hotplug" 4RPROVIDES = "hotplug"
5 5
6PR = "r7" 6PR = "r11"
7 7
8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ 8SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
9 file://noasmlinkage.patch;patch=1 \ 9 file://noasmlinkage.patch;patch=1 \
10 file://flags.patch;patch=1 \ 10 file://flags.patch;patch=1 \
11 file://udevsynthesize.patch;patch=1 \ 11 file://udevsynthesize.patch;patch=1 \
12 file://arm_inotify_fix.patch;patch=1 \
13 file://udevsynthesize.sh \ 12 file://udevsynthesize.sh \
14 file://mount.blacklist" 13 file://arm_inotify_fix.patch;patch=1 \
14 file://mount.blacklist \
15 "
16
17SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
18PACKAGE_ARCH_h2200 = "h2200"
15 19
16require udev.inc 20require udev.inc
17 21
18INITSCRIPT_PARAMS = "start 03 S ." 22INITSCRIPT_PARAMS = "start 03 S ."
19 23
20FILES_${PN} += "${base_libdir}" 24FILES_${PN} += "${base_libdir}/udev/*"
25FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
21UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/" 26UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
22EXTRA_OEMAKE += "libudevdir=/lib/udev" 27EXTRA_OEMAKE += "libudevdir=/lib/udev"
23 28
@@ -48,3 +53,7 @@ do_install () {
48 install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize 53 install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize
49 install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize 54 install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize
50} 55}
56
57do_install_append_h2200() {
58 install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
59}