Patchwork [meta-fsl-ppc,v5,6/8] udev-extraconf: move rules from udev and netbase

login
mail settings
Submitter Ting Liu
Date March 9, 2013, 3:32 p.m.
Message ID <1362843123-18078-7-git-send-email-b28495@freescale.com>
Download mbox | patch
Permalink /patch/45799/
State Accepted
Delegated to: Matthew McClintock
Headers show

Comments

Ting Liu - March 9, 2013, 3:32 p.m.
From: Ting Liu <b28495@freescale.com>

Signed-off-by: Ting Liu <b28495@freescale.com>
---
 recipes-append/netbase/netbase_5.0.bbappend        |   10 +---------
 recipes-append/udev/udev_182.bbappend              |    3 +--
 .../71-fsl-dpaa-persistent-networking.rules        |    0
 .../udev/udev-extraconf}/local.rules               |    0
 recipes-core/udev/udev-extraconf_1.0.bbappend      |   11 +++++++++++
 5 files changed, 13 insertions(+), 11 deletions(-)
 rename {recipes-append/netbase/files => recipes-core/udev/udev-extraconf}/71-fsl-dpaa-persistent-networking.rules (100%)
 rename {recipes-append/udev/files => recipes-core/udev/udev-extraconf}/local.rules (100%)
 create mode 100644 recipes-core/udev/udev-extraconf_1.0.bbappend

Patch

diff --git a/recipes-append/netbase/netbase_5.0.bbappend b/recipes-append/netbase/netbase_5.0.bbappend
index dc0fd0a..8445337 100644
--- a/recipes-append/netbase/netbase_5.0.bbappend
+++ b/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/recipes-append/udev/udev_182.bbappend b/recipes-append/udev/udev_182.bbappend
index f15533b..8445337 100644
--- a/recipes-append/udev/udev_182.bbappend
+++ b/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/recipes-append/netbase/files/71-fsl-dpaa-persistent-networking.rules b/recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules
similarity index 100%
rename from recipes-append/netbase/files/71-fsl-dpaa-persistent-networking.rules
rename to recipes-core/udev/udev-extraconf/71-fsl-dpaa-persistent-networking.rules
diff --git a/recipes-append/udev/files/local.rules b/recipes-core/udev/udev-extraconf/local.rules
similarity index 100%
rename from recipes-append/udev/files/local.rules
rename to recipes-core/udev/udev-extraconf/local.rules
diff --git a/recipes-core/udev/udev-extraconf_1.0.bbappend b/recipes-core/udev/udev-extraconf_1.0.bbappend
new file mode 100644
index 0000000..3b66250
--- /dev/null
+++ b/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
+}
+