From 58ca1838e372a60781b6b03c7b7a12dce2270e50 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Wed, 7 Jan 2015 17:54:59 +0800 Subject: [PATCH] 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 --- .../include/qoriq-default-settings.inc | 2 +- .../udev/udev-extraconf_%.bbappend | 15 ------------ .../recipes-core/udev/udev-rules-qoriq.bb | 23 +++++++++++++++++++ .../71-fsl-dpaa-persistent-networking.rules | 0 .../72-fsl-dpaa-persistent-networking.rules | 0 .../qoriq-ppc/automount.rules | 0 6 files changed, 24 insertions(+), 16 deletions(-) delete mode 100644 meta-fsl-ppc/recipes-core/udev/udev-extraconf_%.bbappend create mode 100644 meta-fsl-ppc/recipes-core/udev/udev-rules-qoriq.bb rename meta-fsl-ppc/recipes-core/udev/{udev-extraconf => udev-rules-qoriq}/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules (100%) rename meta-fsl-ppc/recipes-core/udev/{udev-extraconf => udev-rules-qoriq}/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules (100%) rename meta-fsl-ppc/recipes-core/udev/{udev-extraconf => udev-rules-qoriq}/qoriq-ppc/automount.rules (100%) 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 4c8b8424..539f6a1d 100644 --- 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 index 896e75f6..00000000 --- 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 index 00000000..546f9e8d --- /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 -- 2.40.1