[meta-arm] arm-bsp: yocto-check-layer fixes

Submitted by Jon Mason on July 4, 2020, 3:43 p.m. | Patch ID: 174268

Details

Message ID 20200704154301.15546-1-jon.mason@arm.com
State New
Headers show

Commit Message

Jon Mason July 4, 2020, 3:43 p.m.
Changes necessary to get yocto-check-layer to pass

Change-Id: Ie9ea5047ab1344d14a585552277fdbd6b2bc48ab
Signed-off-by: Jon Mason <jon.mason@arm.com>
---
 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

Patch hide | download patch | download mbox

diff --git a/meta-arm-bsp/README.md b/meta-arm-bsp/README.md
new file mode 100644
index 0000000..490ddca
--- /dev/null
+++ b/meta-arm-bsp/README.md
@@ -0,0 +1 @@ 
+See ../README.md
diff --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
--- 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
@@ -3,5 +3,6 @@ 
 #
 # Enable second network interface on startup
 #
+PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files/juno:"
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
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
--- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
+++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
@@ -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
diff --git a/meta-arm/README.md b/meta-arm/README.md
new file mode 100644
index 0000000..490ddca
--- /dev/null
+++ b/meta-arm/README.md
@@ -0,0 +1 @@ 
+See ../README.md

Comments

Ross Burton July 8, 2020, 9:54 a.m.
+1

On Mon, 6 Jul 2020 at 22:39, Jon Mason <jon.mason@arm.com> wrote:
>
> Changes necessary to get yocto-check-layer to pass
>
> Change-Id: Ie9ea5047ab1344d14a585552277fdbd6b2bc48ab
> Signed-off-by: Jon Mason <jon.mason@arm.com>
> ---
>  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
>
> diff --git a/meta-arm-bsp/README.md b/meta-arm-bsp/README.md
> new file mode 100644
> index 0000000..490ddca
> --- /dev/null
> +++ b/meta-arm-bsp/README.md
> @@ -0,0 +1 @@
> +See ../README.md
> diff --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
> --- 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
> @@ -3,5 +3,6 @@
>  #
>  # Enable second network interface on startup
>  #
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>
> -FILESEXTRAPATHS_prepend_juno := "${THISDIR}/files/juno:"
> +FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
> 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
> --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> @@ -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
> diff --git a/meta-arm/README.md b/meta-arm/README.md
> new file mode 100644
> index 0000000..490ddca
> --- /dev/null
> +++ b/meta-arm/README.md
> @@ -0,0 +1 @@
> +See ../README.md
> --
> 2.17.1
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#819): https://lists.yoctoproject.org/g/meta-arm/message/819
Mute This Topic: https://lists.yoctoproject.org/mt/75343628/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Nicolas Dechesne July 8, 2020, 9:57 a.m.
On Mon, Jul 6, 2020 at 11:39 PM Jon Mason <jon.mason@arm.com> wrote:

> Changes necessary to get yocto-check-layer to pass
>
> Change-Id: Ie9ea5047ab1344d14a585552277fdbd6b2bc48ab
> Signed-off-by: Jon Mason <jon.mason@arm.com>
> ---
>  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
>
> diff --git a/meta-arm-bsp/README.md b/meta-arm-bsp/README.md
> new file mode 100644
> index 0000000..490ddca
> --- /dev/null
> +++ b/meta-arm-bsp/README.md
> @@ -0,0 +1 @@
> +See ../README.md
> diff --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
> --- 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
> @@ -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?


> 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
> --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-arm-platforms.inc
> @@ -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
> diff --git a/meta-arm/README.md b/meta-arm/README.md
> new file mode 100644
> index 0000000..490ddca
> --- /dev/null
> +++ b/meta-arm/README.md
> @@ -0,0 +1 @@
> +See ../README.md
> --
> 2.17.1
>
> 
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#820): https://lists.yoctoproject.org/g/meta-arm/message/820
Mute This Topic: https://lists.yoctoproject.org/mt/75343628/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Richard Purdie July 8, 2020, 10:02 a.m.
On Wed, 2020-07-08 at 11:57 +0200, Nicolas Dechesne wrote:
> 
> 
> On Mon, Jul 6, 2020 at 11:39 PM Jon Mason <jon.mason@arm.com> wrote:
> > Changes necessary to get yocto-check-layer to pass
> > 
> > Change-Id: Ie9ea5047ab1344d14a585552277fdbd6b2bc48ab
> > Signed-off-by: Jon Mason <jon.mason@arm.com>
> > ---
> >  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
> > 
> > diff --git a/meta-arm-bsp/README.md b/meta-arm-bsp/README.md
> > new file mode 100644
> > index 0000000..490ddca
> > --- /dev/null
> > +++ b/meta-arm-bsp/README.md
> > @@ -0,0 +1 @@
> > +See ../README.md
> > diff --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
> > --- 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
> > @@ -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?

I have to admit I saw this patch and was wondering that too. Unless the
recipe is already machine specific in core?

Cheers,

Richard
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#821): https://lists.yoctoproject.org/g/meta-arm/message/821
Mute This Topic: https://lists.yoctoproject.org/mt/75343628/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Ross Burton July 8, 2020, 6:16 p.m.
On Wed, 8 Jul 2020 at 11:02, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> 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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#822): https://lists.yoctoproject.org/g/meta-arm/message/822
Mute This Topic: https://lists.yoctoproject.org/mt/75343628/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Richard Purdie July 8, 2020, 6:31 p.m.
On Wed, 2020-07-08 at 19:16 +0100, Ross Burton wrote:
> On Wed, 8 Jul 2020 at 11:02, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > 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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#823): https://lists.yoctoproject.org/g/meta-arm/message/823
Mute This Topic: https://lists.yoctoproject.org/mt/75343628/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Nicolas Dechesne July 9, 2020, 8:13 a.m.
On Wed, Jul 8, 2020 at 12:02 PM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Wed, 2020-07-08 at 11:57 +0200, Nicolas Dechesne wrote:
> >
> >
> > On Mon, Jul 6, 2020 at 11:39 PM Jon Mason <jon.mason@arm.com> wrote:
> > > Changes necessary to get yocto-check-layer to pass
> > >
> > > Change-Id: Ie9ea5047ab1344d14a585552277fdbd6b2bc48ab
> > > Signed-off-by: Jon Mason <jon.mason@arm.com>
> > > ---
> > >  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
> > >
> > > diff --git a/meta-arm-bsp/README.md b/meta-arm-bsp/README.md
> > > new file mode 100644
> > > index 0000000..490ddca
> > > --- /dev/null
> > > +++ b/meta-arm-bsp/README.md
> > > @@ -0,0 +1 @@
> > > +See ../README.md
> > > diff --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
> > > --- 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
> > > @@ -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?
>
> 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!


>
> Cheers,
>
> Richard
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#824): https://lists.yoctoproject.org/g/meta-arm/message/824
Mute This Topic: https://lists.yoctoproject.org/mt/75343628/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-
Ross Burton July 9, 2020, 8:55 a.m.
On Thu, 9 Jul 2020 at 09:14, Nicolas Dechesne
<nicolas.dechesne@linaro.org> wrote:
> 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
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#825): https://lists.yoctoproject.org/g/meta-arm/message/825
Mute This Topic: https://lists.yoctoproject.org/mt/75343628/3617530
Group Owner: meta-arm+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub  [oe-patchwork@oe-patch.openembedded.org]
-=-=-=-=-=-=-=-=-=-=-=-