[meta-freescale] [meta-fsl-arm][PATCH 2/2] udev-extraconf: replace bbappend with own recipe

[Alexander Shashkevich]

Forcing udev-extraconf causes various strange effects. 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: Alexander Shashkevich <alex at stunpix.com>
---
 conf/machine/include/imx-base.inc             |  2 +-
 recipes-core/udev/udev-extraconf/10-imx.rules | 23 -----------------------
 recipes-core/udev/udev-rules-imx.bb           | 10 ++++++++++
 recipes-core/udev/udev-rules-imx/10-imx.rules | 23 +++++++++++++++++++++++
 4 files changed, 34 insertions(+), 24 deletions(-)
 delete mode 100644 recipes-core/udev/udev-extraconf/10-imx.rules
 create mode 100644 recipes-core/udev/udev-rules-imx.bb
 create mode 100644 recipes-core/udev/udev-rules-imx/10-imx.rules

diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 83476bc..7a74f80 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -72,7 +72,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/10-imx.rules b/recipes-core/udev/udev-extraconf/10-imx.rules
deleted file mode 100644
index 6afc1e8..0000000
--- a/recipes-core/udev/udev-extraconf/10-imx.rules
+++ /dev/null
@@ -1,23 +0,0 @@
-# Create symlinks for i.mx keypads and touchscreens
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxckpd",     SYMLINK+="input/keyboard0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxc_ts",     SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="imx_adc_ts", SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mpr084",     SYMLINK+="input/keyboard0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="tsc2007",    SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="STMP3XXX touchscreen",    SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="MXS touchscreen",    SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="HannStar P1003 Touchscreen",	SYMLINK+="input/ts0"
-#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="eGalax Touch Screen",	SYMLINK+="input/ts0"
-
-# The long class name gets cut off to be mc13783_connectiv in 
-# /sys/class/mc13783_connectivity/mc13783_connectivit
-KERNEL=="mc13783_connectiv*",  NAME="mc13783_connectivity"
-# Anyone has readonly permission to IIM device file
-KERNEL=="mxc_iim",  MODE="0444", SYMLINK+="mxc_mem"
-KERNEL=="mxs_viim", MODE="0444", SYMLINK+="mxc_mem"
-KERNEL=="mxc_ipu",  MODE="0666"
-KERNEL=="mxc_vpu",  MODE="0666"
-SUBSYSTEM=="video", MODE="0660"
-KERNEL=="fb[0-9]",  MODE="0660", GROUP="video"
-KERNEL=="gsl_kmod", MODE="0660", GROUP="video"
-KERNEL=="galcore",  MODE="0660", GROUP="video"
diff --git a/recipes-core/udev/udev-rules-imx.bb b/recipes-core/udev/udev-rules-imx.bb
new file mode 100644
index 0000000..5d1938f
--- /dev/null
+++ b/recipes-core/udev/udev-rules-imx.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "udev rules for Freescale i.MX 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/
+}
\ No newline at end of file
diff --git a/recipes-core/udev/udev-rules-imx/10-imx.rules b/recipes-core/udev/udev-rules-imx/10-imx.rules
new file mode 100644
index 0000000..6afc1e8
--- /dev/null
+++ b/recipes-core/udev/udev-rules-imx/10-imx.rules
@@ -0,0 +1,23 @@
+# Create symlinks for i.mx keypads and touchscreens
+#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxckpd",     SYMLINK+="input/keyboard0"
+#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mxc_ts",     SYMLINK+="input/ts0"
+#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="imx_adc_ts", SYMLINK+="input/ts0"
+#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="mpr084",     SYMLINK+="input/keyboard0"
+#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name}=="tsc2007",    SYMLINK+="input/ts0"
+#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="STMP3XXX touchscreen",    SYMLINK+="input/ts0"
+#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="MXS touchscreen",    SYMLINK+="input/ts0"
+#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="HannStar P1003 Touchscreen",	SYMLINK+="input/ts0"
+#SUBSYSTEM=="input" KERNEL=="event*" ATTRS{name} =="eGalax Touch Screen",	SYMLINK+="input/ts0"
+
+# The long class name gets cut off to be mc13783_connectiv in 
+# /sys/class/mc13783_connectivity/mc13783_connectivit
+KERNEL=="mc13783_connectiv*",  NAME="mc13783_connectivity"
+# Anyone has readonly permission to IIM device file
+KERNEL=="mxc_iim",  MODE="0444", SYMLINK+="mxc_mem"
+KERNEL=="mxs_viim", MODE="0444", SYMLINK+="mxc_mem"
+KERNEL=="mxc_ipu",  MODE="0666"
+KERNEL=="mxc_vpu",  MODE="0666"
+SUBSYSTEM=="video", MODE="0660"
+KERNEL=="fb[0-9]",  MODE="0660", GROUP="video"
+KERNEL=="gsl_kmod", MODE="0660", GROUP="video"
+KERNEL=="galcore",  MODE="0660", GROUP="video"
-- 
1.9.1