diff options
-rw-r--r-- | meta/packages/udev/udev-extraconf_0.0.bb | 12 | ||||
-rw-r--r-- | meta/packages/udev/udev.inc | 2 | ||||
-rw-r--r-- | meta/packages/udev/udev_092.bb | 2 | ||||
-rw-r--r-- | meta/packages/udev/udev_115.bb | 2 | ||||
-rw-r--r-- | meta/packages/udev/udev_124.bb | 4 |
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 @@ +DESCRIPTION = "Extra machine specific configuration files" +LICENCE = "GPL" + +PR = "r0" + +SRC_URI = "file://mount.blacklist" + +do_install () { + install -d ${D}${sysconfdir}/udev/ + + install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ +} 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" FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest" FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*" +RRECOMMENDS_${PN} = "udev-extraconf" + inherit update-rc.d autotools pkgconfig INITSCRIPT_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 \ file://udevsynthesize.patch;patch=1 \ file://udevsynthesize.sh \ file://arm_inotify_fix.patch;patch=1 \ - file://mount.blacklist \ " SRC_URI_append_h2200 = " file://50-hostap_cs.rules " @@ -35,7 +34,6 @@ do_install () { install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules 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 \ file://flags.patch;patch=1 \ file://vol_id_ld.patch;patch=1 \ file://udevtrigger_add_devname_filtering.patch;patch=1 \ - file://mount.blacklist \ " SRC_URI_append_h2200 = " file://50-hostap_cs.rules " @@ -34,7 +33,6 @@ do_install () { install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules 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 the hotplug package and requires a kernel not older than 2.6.12." RPROVIDES_${PN} = "hotplug" -PR = "r1" +PR = "r2" SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://noasmlinkage.patch;patch=1 \ file://flags.patch;patch=1 \ file://vol_id_ld.patch;patch=1 \ file://udevtrigger_add_devname_filtering.patch;patch=1 \ - file://mount.blacklist \ " SRC_URI_append_h2200 = " file://50-hostap_cs.rules " @@ -34,7 +33,6 @@ do_install () { install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/mount.blacklist ${D}${sysconfdir}/udev/ install -m 0644 ${WORKDIR}/local.rules ${D}${sysconfdir}/udev/rules.d/local.rules install -m 0644 ${WORKDIR}/permissions.rules ${D}${sysconfdir}/udev/rules.d/permissions.rules install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/udev.rules |