udev-extraconf: replace bbappend with own recipe

* introduce variable RULE for DPAA FMan ethernet ports name rule.
* use 72-fsl-dpaa-persistent-networking.rules for t1024, same as e6500.

Signed-off-by: Ting Liu <ting.liu@freescale.com>

diff --git a/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc b/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc
index 4c8b84248c907b93c36a462f084216541f7a25fa..539f6a1d2b87451147b504afcef49e2df124b382 100644 (file)
--- a/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc
+++ b/meta-fsl-ppc/conf/machine/include/qoriq-default-settings.inc
@@ -1,5 +1,5 @@
 MACHINE_FEATURES = "keyboard pci ext2 ext3 serial"
-MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules"
+MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules"
 
 IMAGE_CLASSES += "image_types_uboot"
 EXTRA_IMAGEDEPENDS += "u-boot"

diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf_%.bbappend b/meta-fsl-ppc/recipes-core/udev/udev-extraconf_%.bbappend
deleted file mode 100644 (file)
index 896e75f..0000000
--- a/meta-fsl-ppc/recipes-core/udev/udev-extraconf_%.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
-
-SRC_URI_append_qoriq-ppc = " file://${@bb.utils.contains("TUNE_FEATURES", "e6500", \
-    "72-fsl-dpaa-persistent-networking.rules", "71-fsl-dpaa-persistent-networking.rules", d)}"
-
-do_install_append_qoriq-ppc () {
-    install -d ${D}${sysconfdir}/udev/rules.d/
-    install -m 0644 ${WORKDIR}/*-fsl-dpaa-persistent-networking.rules ${D}${sysconfdir}/udev/rules.d
-
-    # skip mmc rpmb partitions
-    echo "/dev/mmcblk.*rpmb" >>${D}${sysconfdir}/udev/mount.blacklist
-    # skip nbd (network block device)
-    echo "/dev/nbd*" >>${D}${sysconfdir}/udev/mount.blacklist
-}
-

diff --git a/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq.bb b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq.bb
new file mode 100644 (file)
index 0000000..546f9e8
--- /dev/null
+++ b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "udev rules for Freescale QorIQ SOCs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+SRC_URI = "\
+    file://71-fsl-dpaa-persistent-networking.rules \
+    file://72-fsl-dpaa-persistent-networking.rules \
+"
+RULE ?= "71-fsl-dpaa-persistent-networking.rules"
+RULE_e6500 = "72-fsl-dpaa-persistent-networking.rules"
+RULE_e6500-64b = "72-fsl-dpaa-persistent-networking.rules"
+RULE_t1024 = "72-fsl-dpaa-persistent-networking.rules"
+
+do_install () {
+    install -d ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/${RULE} ${D}${sysconfdir}/udev/rules.d/
+
+    # skip mmc rpmb partitions
+    echo "/dev/mmcblk.*rpmb" >>${D}${sysconfdir}/udev/mount.blacklist
+    # skip nbd (network block device)
+    echo "/dev/nbd*" >>${D}${sysconfdir}/udev/mount.blacklist
+}
+

diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules
similarity index 100%
rename from meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules
rename to meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules

diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules
similarity index 100%
rename from meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules
rename to meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules

diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules b/meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules
similarity index 100%
rename from meta-fsl-ppc/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules
rename to meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules