[meta-freescale] [meta-fsl-ppc][PATCH v2] udev-qoriq-rules: avoid failure in universe fetch

[ting.liu at freescale.com]

From: Ting Liu <ting.liu at freescale.com>

The autobuilder does a universe fetch with the meta-fsl-*
layers enabled, and this causes errors when MACHINE=qemux86.

* not put the patches to a machine-specific location
* remove the useless automount.rules
* restrict COMPATIBLE_MACHINE to qoriq-ppc

Fix [Yocto: #8802]

Signed-off-by: Ting Liu <ting.liu at freescale.com>
---
 recipes-core/udev/udev-rules-qoriq.bb              |  1 +
 .../71-fsl-dpaa-persistent-networking.rules        |  0
 .../72-fsl-dpaa-persistent-networking.rules        |  0
 .../udev-rules-qoriq/qoriq-ppc/automount.rules     | 23 ----------------------
 4 files changed, 1 insertion(+), 23 deletions(-)
 rename recipes-core/udev/udev-rules-qoriq/{qoriq-ppc => }/71-fsl-dpaa-persistent-networking.rules (100%)
 rename recipes-core/udev/udev-rules-qoriq/{qoriq-ppc => }/72-fsl-dpaa-persistent-networking.rules (100%)
 delete mode 100644 recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules

diff --git a/recipes-core/udev/udev-rules-qoriq.bb b/recipes-core/udev/udev-rules-qoriq.bb
index 0fec4bd..1f34b8d 100644
--- a/recipes-core/udev/udev-rules-qoriq.bb
+++ b/recipes-core/udev/udev-rules-qoriq.bb
@@ -17,3 +17,4 @@ do_install () {
     install -m 0644 ${WORKDIR}/${RULE} ${D}${sysconfdir}/udev/rules.d/
 }
 
+COMPATIBLE_MACHINE = "(qoriq-ppc)"
diff --git a/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules b/recipes-core/udev/udev-rules-qoriq/71-fsl-dpaa-persistent-networking.rules
similarity index 100%
rename from recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules
rename to recipes-core/udev/udev-rules-qoriq/71-fsl-dpaa-persistent-networking.rules
diff --git a/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules b/recipes-core/udev/udev-rules-qoriq/72-fsl-dpaa-persistent-networking.rules
similarity index 100%
rename from recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules
rename to recipes-core/udev/udev-rules-qoriq/72-fsl-dpaa-persistent-networking.rules
diff --git a/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules b/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules
deleted file mode 100644
index a47efda..0000000
--- a/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules
+++ /dev/null
@@ -1,23 +0,0 @@
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-#    For example, 'sda3' has a "kernel number" of '3'
-# %e the smallest number for that name which does not matches an existing node
-# %k the kernel name for the device
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute
-# %% the '%' char itself
-#
-
-SUBSYSTEM=="block", ENV{DEVTYPE}=="partition", GOTO="automount_end"
-
-# Media automounting
-SUBSYSTEM=="block", ACTION=="add"    RUN+="/etc/udev/scripts/mount.sh"
-SUBSYSTEM=="block", ACTION=="remove" RUN+="/etc/udev/scripts/mount.sh"
-
-LABEL="automount_end"
-
-- 
1.9.1