[meta-freescale] [meta-fsl-arm][PATCH 1/2] replace udev-extraconf append by udev-rules-imx

[Andreas Müller]

forcing udev-extraconf causes various strange effects. On my xfce image
automount failed for unpriviledged user. This was discussed long time
ago in oe-core on [1] and resulted in [2].

[1] http://lists.openembedded.org/pipermail/openembedded-core/2013-April/077880.html
[2] http://lists.openembedded.org/pipermail/openembedded-commits/2013-May/148591.html

Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
---
 conf/machine/include/imx-base.inc                       |  2 +-
 recipes-core/udev/udev-extraconf_%.bbappend             | 17 -----------------
 .../{udev-extraconf => udev-rules-imx}/10-imx.rules     |  0
 recipes-core/udev/udev-rules-imx_1.0.bb                 | 10 ++++++++++
 4 files changed, 11 insertions(+), 18 deletions(-)
 delete mode 100644 recipes-core/udev/udev-extraconf_%.bbappend
 rename recipes-core/udev/{udev-extraconf => udev-rules-imx}/10-imx.rules (100%)
 create mode 100644 recipes-core/udev/udev-rules-imx_1.0.bb

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index cd84c18..8f531b9 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -75,7 +75,7 @@ MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE}"
 MACHINE_EXTRA_RRECOMMENDS_append_mx6 = " fsl-alsa-plugins"
 
 # Extra udev rules
-MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
+MACHINE_EXTRA_RRECOMMENDS += "udev-rules-imx"
 
 # GStreamer 0.10 plugins
 MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
diff --git a/recipes-core/udev/udev-extraconf_%.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend
deleted file mode 100644
index f73e4bc..0000000
--- a/recipes-core/udev/udev-extraconf_%.bbappend
+++ /dev/null
@@ -1,17 +0,0 @@
-# Freescale imx extra configuration udev rules
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI_append_mxs = " file://10-imx.rules"
-SRC_URI_append_mx5 = " file://10-imx.rules"
-SRC_URI_append_mx6 = " file://10-imx.rules"
-
-do_install_prepend () {
-	if [ -e "${WORKDIR}/10-imx.rules" ]; then
-		install -d ${D}${sysconfdir}/udev/rules.d
-		install -m 0644 ${WORKDIR}/10-imx.rules ${D}${sysconfdir}/udev/rules.d
-	fi
-}
-
-PACKAGE_ARCH_mxs = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"
-PACKAGE_ARCH_mx6 = "${MACHINE_ARCH}"
diff --git a/recipes-core/udev/udev-extraconf/10-imx.rules b/recipes-core/udev/udev-rules-imx/10-imx.rules
similarity index 100%
rename from recipes-core/udev/udev-extraconf/10-imx.rules
rename to recipes-core/udev/udev-rules-imx/10-imx.rules
diff --git a/recipes-core/udev/udev-rules-imx_1.0.bb b/recipes-core/udev/udev-rules-imx_1.0.bb
new file mode 100644
index 0000000..daf7208
--- /dev/null
+++ b/recipes-core/udev/udev-rules-imx_1.0.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "udev rules for Freescale imx SOCs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+SRC_URI = " file://10-imx.rules"
+
+do_install () {
+	install -d ${D}${sysconfdir}/udev/rules.d
+	install -m 0644 ${WORKDIR}/10-imx.rules ${D}${sysconfdir}/udev/rules.d
+}
-- 
1.8.3.1