summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/udev/udev-extraconf_0.0.bb12
-rw-r--r--meta/packages/udev/udev.inc2
-rw-r--r--meta/packages/udev/udev_092.bb2
-rw-r--r--meta/packages/udev/udev_115.bb2
-rw-r--r--meta/packages/udev/udev_124.bb4
5 files changed, 15 insertions, 7 deletions
diff --git a/meta/packages/udev/udev-extraconf_0.0.bb b/meta/packages/udev/udev-extraconf_0.0.bb
new file mode 100644
index 0000000000..34c8400ddd
--- /dev/null
+++ b/meta/packages/udev/udev-extraconf_0.0.bb
@@ -0,0 +1,12 @@
1DESCRIPTION = "Extra machine specific configuration files"
2LICENCE = "GPL"
3
4PR = "r0"
5
6SRC_URI = "file://mount.blacklist"
7
8do_install () {
9 install -d ${D}${sysconfdir}/udev/
10
11 install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
12}
diff --git a/meta/packages/udev/udev.inc b/meta/packages/udev/udev.inc
index cd1e842f1b..d201d5877b 100644
--- a/meta/packages/udev/udev.inc
+++ b/meta/packages/udev/udev.inc
@@ -18,6 +18,8 @@ PACKAGES =+ "udev-utils libvolume-id"
18FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest" 18FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
19FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" 19FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
20 20
21RRECOMMENDS_${PN} = "udev-extraconf"
22
21inherit update-rc.d autotools pkgconfig 23inherit update-rc.d autotools pkgconfig
22 24
23INITSCRIPT_NAME = "udev" 25INITSCRIPT_NAME = "udev"
diff --git a/meta/packages/udev/udev_092.bb b/meta/packages/udev/udev_092.bb
index 4389ee03cc..cce65d83da 100644
--- a/meta/packages/udev/udev_092.bb
+++ b/meta/packages/udev/udev_092.bb
@@ -11,7 +11,6 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
11 file://udevsynthesize.patch;patch=1 \ 11 file://udevsynthesize.patch;patch=1 \
12 file://udevsynthesize.sh \ 12 file://udevsynthesize.sh \
13 file://arm_inotify_fix.patch;patch=1 \ 13 file://arm_inotify_fix.patch;patch=1 \
14 file://mount.blacklist \
15 " 14 "
16 15
17SRC_URI_append_h2200 = " file://50-hostap_cs.rules " 16SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
@@ -35,7 +34,6 @@ do_install () {
35 34
36 install -d ${D}${sysconfdir}/udev/rules.d/ 35 install -d ${D}${sysconfdir}/udev/rules.d/
37 36
38 install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
39 install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules 37 install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
40 install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules 38 install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
41 install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules 39 install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
diff --git a/meta/packages/udev/udev_115.bb b/meta/packages/udev/udev_115.bb
index 4bac1d3cfb..6d9eede57c 100644
--- a/meta/packages/udev/udev_115.bb
+++ b/meta/packages/udev/udev_115.bb
@@ -10,7 +10,6 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
10 file://flags.patch;patch=1 \ 10 file://flags.patch;patch=1 \
11 file://vol_id_ld.patch;patch=1 \ 11 file://vol_id_ld.patch;patch=1 \
12 file://udevtrigger_add_devname_filtering.patch;patch=1 \ 12 file://udevtrigger_add_devname_filtering.patch;patch=1 \
13 file://mount.blacklist \
14 " 13 "
15 14
16SRC_URI_append_h2200 = " file://50-hostap_cs.rules " 15SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
@@ -34,7 +33,6 @@ do_install () {
34 33
35 install -d ${D}${sysconfdir}/udev/rules.d/ 34 install -d ${D}${sysconfdir}/udev/rules.d/
36 35
37 install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
38 install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules 36 install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
39 install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules 37 install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
40 install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules 38 install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules
diff --git a/meta/packages/udev/udev_124.bb b/meta/packages/udev/udev_124.bb
index 0a80af9bd0..4a403c542f 100644
--- a/meta/packages/udev/udev_124.bb
+++ b/meta/packages/udev/udev_124.bb
@@ -3,14 +3,13 @@ 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_${PN} = "hotplug" 4RPROVIDES_${PN} = "hotplug"
5 5
6PR = "r1" 6PR = "r2"
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://vol_id_ld.patch;patch=1 \ 11 file://vol_id_ld.patch;patch=1 \
12 file://udevtrigger_add_devname_filtering.patch;patch=1 \ 12 file://udevtrigger_add_devname_filtering.patch;patch=1 \
13 file://mount.blacklist \
14 " 13 "
15 14
16SRC_URI_append_h2200 = " file://50-hostap_cs.rules " 15SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
@@ -34,7 +33,6 @@ do_install () {
34 33
35 install -d ${D}${sysconfdir}/udev/rules.d/ 34 install -d ${D}${sysconfdir}/udev/rules.d/
36 35
37 install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/
38 install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules 36 install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules
39 install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules 37 install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules
40 install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules 38 install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules