arm-bsp: yocto-check-layer fixes
PATCH 1/1 arm-bsp: yocto-check-layer fixes
Changes necessary to get yocto-check-layer to pass
--- meta-arm-bsp/README.md | 1 + .../recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 3 ++- .../recipes-kernel/linux/linux-yocto-arm-platforms.inc | 7 ++++++- meta-arm/README.md | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 meta-arm-bsp/README.md create mode 100644 meta-arm/README.md
meta-arm-bsp/README.md new file +1 -0
@@ -0,0 +1 @@ +See ../README.md
meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +2 -1
@@ -3,5 +3,6 @@ # # Enable second network interface on startup # +PACKAGE_ARCH = "${MACHINE_ARCH}" -FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files/juno:" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc +6 -1
@@ -8,7 +8,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:" # Arm platforms kmeta -SRC_URI += "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" +SRC_URI_KMETA = "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" +SRC_URI_append_foundation-armv8 = " ${SRC_URI_KMETA}" +SRC_URI_append_fvp-base = " ${SRC_URI_KMETA}" +SRC_URI_append_juno = " ${SRC_URI_KMETA}" +SRC_URI_append_gem5-arm64 = " ${SRC_URI_KMETA}" +SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5" # # FVP FOUNDATION KMACHINE
meta-arm/README.md new file +1 -0
@@ -0,0 +1 @@ +See ../README.md
Signature · 1 line
2.17.1
+1
Quoted 62 lines · Jon Mason
Changes necessary to get yocto-check-layer to pass
Change-Id Ie9ea5047ab1344d14a585552277fdbd6b2bc48abSigned-off-by Jon Mason <[email protected]>--- meta-arm-bsp/README.md | 1 + .../recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 3 ++- .../recipes-kernel/linux/linux-yocto-arm-platforms.inc | 7 ++++++- meta-arm/README.md | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 meta-arm-bsp/README.md create mode 100644 meta-arm/README.mdmeta-arm-bsp/README.md new file +1
-0@@ -0,0 +1 @@ +See ../README.mdmeta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +2
-1@@ -3,5 +3,6 @@ # # Enable second network interface on startup # +PACKAGE_ARCH = "${MACHINE_ARCH}" -FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files/juno:" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc +6
-1@@ -8,7 +8,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:" # Arm platforms kmeta -SRC_URI += "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" +SRC_URI_KMETA = "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" +SRC_URI_append_foundation-armv8 = " ${SRC_URI_KMETA}" +SRC_URI_append_fvp-base = " ${SRC_URI_KMETA}" +SRC_URI_append_juno = " ${SRC_URI_KMETA}" +SRC_URI_append_gem5-arm64 = " ${SRC_URI_KMETA}" +SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5" # # FVP FOUNDATION KMACHINEmeta-arm/README.md new file +1
-1@@ -0,0 +1 @@ +See ../README.md --2.17.1
Quoted 28 lines · Jon Mason
Changes necessary to get yocto-check-layer to pass
Change-Id Ie9ea5047ab1344d14a585552277fdbd6b2bc48abSigned-off-by Jon Mason <[email protected]>--- meta-arm-bsp/README.md | 1 + .../recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 3 ++- .../recipes-kernel/linux/linux-yocto-arm-platforms.inc | 7 ++++++- meta-arm/README.md | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 meta-arm-bsp/README.md create mode 100644 meta-arm/README.mdmeta-arm-bsp/README.md new file +1
-0@@ -0,0 +1 @@ +See ../README.mddiff --git a/meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index 8b5120f..2c5f61a 100644
meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend line 8
Quoted 7 lines
meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +2
-1@@ -3,5 +3,6 @@ # # Enable second network interface on startup # +PACKAGE_ARCH = "${MACHINE_ARCH}" -FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files/juno:" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
hmm. don't these changes impact the metadata with or without this layer added? How can it pass the check-layer script?
Quoted 34 lines
diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc index 4d20a91..3ddebb9 100644
meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc +0
-1@@ -8,7 +8,12 @@ FILESEXTRAPATHS_prepend := "${THISDIR}:${THISDIR}/files:" # Arm platforms kmeta -SRC_URI +="file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta" +SRC_URI_KMETA = "file://arm-platforms-kmeta;type=kmeta;name=arm-platforms-kmeta;destsuffix=arm-platforms-kmeta"
meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc +5
-0+SRC_URI_append_foundation-armv8 = " ${SRC_URI_KMETA}" +SRC_URI_append_fvp-base = " ${SRC_URI_KMETA}" +SRC_URI_append_juno = " ${SRC_URI_KMETA}" +SRC_URI_append_gem5-arm64 = " ${SRC_URI_KMETA}" +SRCREV_arm-platforms-kmeta = "6147e82375aa9df8f2a162d42ea6406c79c854c5" # # FVP FOUNDATION KMACHINEmeta-arm/README.md new file +1
-1@@ -0,0 +1 @@ +See ../README.md --2.17.1
Quoted 38 lines · Nicolas Dechesne
Quoted 35 lines · Jon Mason
Changes necessary to get yocto-check-layer to pass
Change-Id Ie9ea5047ab1344d14a585552277fdbd6b2bc48abSigned-off-by Jon Mason <[email protected]>--- meta-arm-bsp/README.md | 1 + .../recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 3 ++- .../recipes-kernel/linux/linux-yocto-arm-platforms.inc | 7 ++++++- meta-arm/README.md | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 meta-arm-bsp/README.md create mode 100644 meta-arm/README.mdmeta-arm-bsp/README.md new file +1
-0@@ -0,0 +1 @@ +See ../README.md(quoted diff) +0
-0ifupdown_1.0.bbappend b/meta-arm-bsp/recipes-core/init- ifupdown/init-ifupdown_1.0.bbappend
index 8b5120f..2c5f61a 100644
--- a/meta-arm-bsp/recipes-core/init-ifupdown/init- ifupdown_1.0.bbappend
+++ b/meta-arm-bsp/recipes-core/init-ifupdown/init- ifupdown_1.0.bbappendmeta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +1
-0@@ -3,5 +3,6 @@ # # Enable second network interface on startup # +PACKAGE_ARCH = "${MACHINE_ARCH}"
Quoted 5 lines
meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend line 8
Quoted 2 lines
meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +1
-1-FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files/juno:" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"hmm. don't these changes impact the metadata with or without this layer added? How can it pass the check-layer script?
I have to admit I saw this patch and was wondering that too. Unless the recipe is already machine specific in core?
Cheers,
Richard
Quoted 2 lines · Richard Purdie
I have to admit I saw this patch and was wondering that too. Unless the recipe is already machine specific in core?
Good point. Do we get points for finding bugs in the check layer tool?
Ross
Quoted 8 lines · Ross Burton
Quoted 3 lines · Richard Purdie
I have to admit I saw this patch and was wondering that too. Unless the
recipe is already machine specific in core?Good point. Do we get points for finding bugs in the check layer tool?
Offset against the autobuilder failures/warnings ;-)
Cheers,
Richard
Quoted 39 lines · Richard Purdie
Quoted 38 lines · Nicolas Dechesne
Quoted 35 lines · Jon Mason
Changes necessary to get yocto-check-layer to pass
Change-Id Ie9ea5047ab1344d14a585552277fdbd6b2bc48abSigned-off-by Jon Mason <[email protected]>--- meta-arm-bsp/README.md | 1 + .../recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend | 3 ++- .../recipes-kernel/linux/linux-yocto-arm-platforms.inc | 7 ++++++- meta-arm/README.md | 1 + 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 meta-arm-bsp/README.md create mode 100644 meta-arm/README.mdmeta-arm-bsp/README.md new file +1
-0@@ -0,0 +1 @@ +See ../README.md(quoted diff) +0
-0ifupdown_1.0.bbappend b/meta-arm-bsp/recipes-core/init- ifupdown/init-ifupdown_1.0.bbappend
index 8b5120f..2c5f61a 100644
--- a/meta-arm-bsp/recipes-core/init-ifupdown/init- ifupdown_1.0.bbappend
+++ b/meta-arm-bsp/recipes-core/init-ifupdown/init- ifupdown_1.0.bbappendmeta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +1
-0@@ -3,5 +3,6 @@ # # Enable second network interface on startup # +PACKAGE_ARCH = "${MACHINE_ARCH}"
Quoted 9 lines
Quoted 5 lines
meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend line 8
Quoted 2 lines
meta-arm-bsp/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +1
-1-FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files/juno:" +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"hmm. don't these changes impact the metadata with or without this layer added? How can it pass the check-layer script?
I have to admit I saw this patch and was wondering that too. Unless the recipe is already machine specific in core?
right.. the recipe does:PACKAGE_ARCH_qemuall = "${MACHINE_ARCH}"
So it's a luck situation for yocto-check-layer.. since it computes world signature with a qemu machine by default. so they indeed don't change after adding meta-arm-bsp! however for someone not using qemu in the first place, adding meta-arm-bsp would change them!
Quoted 6 lines
Cheers,
Richard
Quoted 4 lines · Nicolas Dechesne
right.. the recipe does:
PACKAGE_ARCH_qemuall= "${MACHINE_ARCH}"So it's a luck situation for yocto-check-layer.. since it computes world signature with a qemu machine by default. so they indeed don't change after adding meta-arm-bsp! however for someone not using qemu in the first place, adding meta-arm-bsp would change them!
Ha, thanks for digging. I guess we should:
1) make the PACKAGE_ARCH change in meta-arm use an override
2) change this recipe in oe-core to always be MACHINE_ARCH
Ross