From e8973acd3a4fd93315707e4673c4428d8ab31260 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Sat, 9 Mar 2013 15:32:01 +0000 Subject: [PATCH] udev-extraconf: move rules from udev and netbase Signed-off-by: Ting Liu --- .../recipes-append/netbase/netbase_5.0.bbappend | 10 +--------- meta-fsl-ppc/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 meta-fsl-ppc/{recipes-append/netbase/files => recipes-core/udev/udev-extraconf}/71-fsl-dpaa-persistent-networking.rules (100%) rename meta-fsl-ppc/{recipes-append/udev/files => recipes-core/udev/udev-extraconf}/local.rules (100%) create mode 100644 meta-fsl-ppc/recipes-core/udev/udev-extraconf_1.0.bbappend 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 dc0fd0a6..8445337a 100644 --- 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 f15533ba..8445337a 100644 --- 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 index 00000000..3b662508 --- /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 +} + -- 2.40.1