diff options
author | Ting Liu <ting.liu@freescale.com> | 2015-01-07 17:54:59 +0800 |
---|---|---|
committer | Zhenhua Luo <zhenhua.luo@freescale.com> | 2015-01-08 18:14:15 +0800 |
commit | d7df92b6f5c1a673341d54d6b064ad2fd7b16d74 (patch) | |
tree | c34268421c6ed8177249a928e879c5c9fc38a531 | |
parent | 787081bf238095e67e5ac70a93dfe2de8e54452a (diff) | |
download | meta-fsl-ppc-d7df92b6f5c1a673341d54d6b064ad2fd7b16d74.tar.gz |
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>
-rw-r--r-- | conf/machine/include/qoriq-default-settings.inc | 2 | ||||
-rw-r--r-- | recipes-core/udev/udev-extraconf_%.bbappend | 15 | ||||
-rw-r--r-- | recipes-core/udev/udev-rules-qoriq.bb | 23 | ||||
-rw-r--r-- | recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules (renamed from recipes-core/udev/udev-extraconf/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules) | 0 | ||||
-rw-r--r-- | recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules (renamed from recipes-core/udev/udev-extraconf/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules) | 0 | ||||
-rw-r--r-- | recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules (renamed from recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules) | 0 |
6 files changed, 24 insertions, 16 deletions
diff --git a/conf/machine/include/qoriq-default-settings.inc b/conf/machine/include/qoriq-default-settings.inc index 4c8b842..539f6a1 100644 --- a/conf/machine/include/qoriq-default-settings.inc +++ b/conf/machine/include/qoriq-default-settings.inc | |||
@@ -1,5 +1,5 @@ | |||
1 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" | 1 | MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" |
2 | MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf kernel-modules" | 2 | MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" |
3 | 3 | ||
4 | IMAGE_CLASSES += "image_types_uboot" | 4 | IMAGE_CLASSES += "image_types_uboot" |
5 | EXTRA_IMAGEDEPENDS += "u-boot" | 5 | EXTRA_IMAGEDEPENDS += "u-boot" |
diff --git a/recipes-core/udev/udev-extraconf_%.bbappend b/recipes-core/udev/udev-extraconf_%.bbappend deleted file mode 100644 index 896e75f..0000000 --- a/recipes-core/udev/udev-extraconf_%.bbappend +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" | ||
2 | |||
3 | SRC_URI_append_qoriq-ppc = " file://${@bb.utils.contains("TUNE_FEATURES", "e6500", \ | ||
4 | "72-fsl-dpaa-persistent-networking.rules", "71-fsl-dpaa-persistent-networking.rules", d)}" | ||
5 | |||
6 | do_install_append_qoriq-ppc () { | ||
7 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
8 | install -m 0644 ${WORKDIR}/*-fsl-dpaa-persistent-networking.rules ${D}${sysconfdir}/udev/rules.d | ||
9 | |||
10 | # skip mmc rpmb partitions | ||
11 | echo "/dev/mmcblk.*rpmb" >>${D}${sysconfdir}/udev/mount.blacklist | ||
12 | # skip nbd (network block device) | ||
13 | echo "/dev/nbd*" >>${D}${sysconfdir}/udev/mount.blacklist | ||
14 | } | ||
15 | |||
diff --git a/recipes-core/udev/udev-rules-qoriq.bb b/recipes-core/udev/udev-rules-qoriq.bb new file mode 100644 index 0000000..546f9e8 --- /dev/null +++ b/recipes-core/udev/udev-rules-qoriq.bb | |||
@@ -0,0 +1,23 @@ | |||
1 | DESCRIPTION = "udev rules for Freescale QorIQ SOCs" | ||
2 | LICENSE = "MIT" | ||
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" | ||
4 | |||
5 | SRC_URI = "\ | ||
6 | file://71-fsl-dpaa-persistent-networking.rules \ | ||
7 | file://72-fsl-dpaa-persistent-networking.rules \ | ||
8 | " | ||
9 | RULE ?= "71-fsl-dpaa-persistent-networking.rules" | ||
10 | RULE_e6500 = "72-fsl-dpaa-persistent-networking.rules" | ||
11 | RULE_e6500-64b = "72-fsl-dpaa-persistent-networking.rules" | ||
12 | RULE_t1024 = "72-fsl-dpaa-persistent-networking.rules" | ||
13 | |||
14 | do_install () { | ||
15 | install -d ${D}${sysconfdir}/udev/rules.d/ | ||
16 | install -m 0644 ${WORKDIR}/${RULE} ${D}${sysconfdir}/udev/rules.d/ | ||
17 | |||
18 | # skip mmc rpmb partitions | ||
19 | echo "/dev/mmcblk.*rpmb" >>${D}${sysconfdir}/udev/mount.blacklist | ||
20 | # skip nbd (network block device) | ||
21 | echo "/dev/nbd*" >>${D}${sysconfdir}/udev/mount.blacklist | ||
22 | } | ||
23 | |||
diff --git a/recipes-core/udev/udev-extraconf/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules b/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules index 6c6dc35..6c6dc35 100644 --- a/recipes-core/udev/udev-extraconf/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules +++ b/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/71-fsl-dpaa-persistent-networking.rules | |||
diff --git a/recipes-core/udev/udev-extraconf/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules b/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules index d0eec9c..d0eec9c 100644 --- a/recipes-core/udev/udev-extraconf/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules +++ b/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/72-fsl-dpaa-persistent-networking.rules | |||
diff --git a/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules b/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules index a47efda..a47efda 100644 --- a/recipes-core/udev/udev-extraconf/qoriq-ppc/automount.rules +++ b/recipes-core/udev/udev-rules-qoriq/qoriq-ppc/automount.rules | |||