udev-extraconf: move rules from udev and netbase

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

diff --git a/meta-fsl-ppc/recipes-append/netbase/netbase_5.0.bbappend b/meta-fsl-ppc/recipes-append/netbase/netbase_5.0.bbappend
index dc0fd0a670f214980a77b8c63048197cafb0d129..8445337ad850aebe1c4afe8d2d85e98386fe30bb 100644 (file)
--- a/meta-fsl-ppc/recipes-append/netbase/netbase_5.0.bbappend
+++ b/meta-fsl-ppc/recipes-append/netbase/netbase_5.0.bbappend
@@ -1,10 +1,2 @@
-FILESEXTRAPATHS_prepend_fsl := "${THISDIR}/files:"
+PRINC := "${@int(PRINC) + 1}"
 
-SRC_URI_append_fsl += "file://71-fsl-dpaa-persistent-networking.rules"
-
-do_install_append_fsl () {
-       install -d ${D}${sysconfdir}/udev/rules.d/
-       install -m 0644 ${WORKDIR}/71-fsl-dpaa-persistent-networking.rules ${D}${sysconfdir}/udev/rules.d
-}
-
-PR_fsl .= "+${DISTRO}"

diff --git a/meta-fsl-ppc/recipes-append/udev/udev_182.bbappend b/meta-fsl-ppc/recipes-append/udev/udev_182.bbappend
index f15533ba75c883d932cfa06085985fb0f330dda0..8445337ad850aebe1c4afe8d2d85e98386fe30bb 100644 (file)
--- a/meta-fsl-ppc/recipes-append/udev/udev_182.bbappend
+++ b/meta-fsl-ppc/recipes-append/udev/udev_182.bbappend
@@ -1,3 +1,2 @@
-FILESEXTRAPATHS_prepend_fsl := "${THISDIR}/files:"
+PRINC := "${@int(PRINC) + 1}"
 
-PR_fsl .= "+${DISTRO}.1"

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

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

diff --git a/meta-fsl-ppc/recipes-core/udev/udev-extraconf_1.0.bbappend b/meta-fsl-ppc/recipes-core/udev/udev-extraconf_1.0.bbappend
new file mode 100644 (file)
index 0000000..3b66250
--- /dev/null
+++ b/meta-fsl-ppc/recipes-core/udev/udev-extraconf_1.0.bbappend
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+PRINC := "${@int(PRINC) + 1}"
+
+SRC_URI_append = " file://71-fsl-dpaa-persistent-networking.rules"
+
+do_install_append () {
+    install -d ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${WORKDIR}/71-fsl-dpaa-persistent-networking.rules ${D}${sysconfdir}/udev/rules.d
+}
+