[PATCH 1/4] CI: add meta-gem5 to the pending upgrades report

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report
@ 2022-02-11 11:45 Ross Burton
  2022-02-11 11:45 ` [PATCH 2/4] gem5/gem-aarch64-native: remove duplicate --command-line Ross Burton
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Ross Burton @ 2022-02-11 11:45 UTC (permalink / raw)
  To: meta-arm

The gem5-arm64 machine was missing.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d7a47ad0..bd495cf9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -91,8 +91,9 @@ pending-updates:
       - update-report
   script:
     - rm -fr update-report
-    - kas shell ci/qemuarm64.yml:ci/meta-openembedded.yml --command \
-      "$CI_PROJECT_DIR/scripts/machine-summary.py -t report -o $CI_PROJECT_DIR/update-report $($CI_PROJECT_DIR/ci/listmachines.py meta-arm meta-arm-bsp)"
+    # This configuration has all of the layers we need enabled
+    - kas shell ci/gem5-arm64.yml --command \
+      "$CI_PROJECT_DIR/scripts/machine-summary.py -t report -o $CI_PROJECT_DIR/update-report $($CI_PROJECT_DIR/ci/listmachines.py meta-arm meta-arm-bsp meta-gem5)"
   # Do this on x86 whilst the compilers are x86-only
   tags:
     - x86_64
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/4] gem5/gem-aarch64-native: remove duplicate --command-line
  2022-02-11 11:45 [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report Ross Burton
@ 2022-02-11 11:45 ` Ross Burton
  2022-02-11 11:45 ` [PATCH 3/4] gem5/linux-yocto: use wildcards in the bbappend Ross Burton
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2022-02-11 11:45 UTC (permalink / raw)
  To: meta-arm

The contents of GEM5_RUN_CMDLINE is passed via --command-line, so there
is no need to include --command-line in it.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc
index 0a8e34c1..2fd5206e 100644
--- a/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc
+++ b/meta-gem5/recipes-devtools/gem5/gem5-aarch64-native.inc
@@ -21,8 +21,7 @@ GEM5_RUN_DISK ?= "*-${MACHINE}.ext4"
 GEM5_RUN_DTB ?= "${@os.path.basename(d.getVar('KERNEL_DEVICETREE'))}"
 
 # Linux command line to pass
-GEM5_RUN_CMDLINE ?= "--command-line='earlyprintk=pl011,0x1c090000 \
-        console=ttyAMA0 rw mem=512MB root=/dev/sda rootwait'"
+GEM5_RUN_CMDLINE ?= "earlyprintk=pl011,0x1c090000 console=ttyAMA0 rw mem=512MB root=/dev/sda rootwait"
 
 # Extra arguments to pass to gem5
 GEM5_RUN_EXTRA ?= "--mem-size=512MB -n 4 --machine-type=VExpress_GEM5_V2"
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/4] gem5/linux-yocto: use wildcards in the bbappend
  2022-02-11 11:45 [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report Ross Burton
  2022-02-11 11:45 ` [PATCH 2/4] gem5/gem-aarch64-native: remove duplicate --command-line Ross Burton
@ 2022-02-11 11:45 ` Ross Burton
  2022-02-11 18:57   ` [meta-arm] " Denys Dmytriyenko
  2022-02-11 11:45 ` [PATCH 4/4] atp/linux-yocto: " Ross Burton
  2022-02-11 15:49 ` [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report Jon Mason
  3 siblings, 1 reply; 6+ messages in thread
From: Ross Burton @ 2022-02-11 11:45 UTC (permalink / raw)
  To: meta-arm

Don't hard-code 5.4, use wildcards instead.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../recipes-kernel/linux/linux-yocto_%.bbappend      | 11 +++++++++++
 .../recipes-kernel/linux/linux-yocto_5.4.bbappend    | 12 ------------
 2 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend

diff --git a/meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend
new file mode 100644
index 00000000..b36ea064
--- /dev/null
+++ b/meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -0,0 +1,11 @@
+FILESEXTRAPATHS:prepend:gem5-arm64 := "${THISDIR}:${THISDIR}/files:"
+
+COMPATIBLE_MACHINE:gem5-arm64 = "gem5-arm64"
+KMACHINE:gem5-arm64 = "gem5-arm64"
+SRC_URI:append:gem5-arm64 = " file://gem5-kmeta;type=kmeta;name=gem5-kmeta;destsuffix=gem5-kmeta \
+                              file://dts/gem5-arm64;subdir=add-files"
+
+do_patch:append:gem5-arm64() {
+    tar -C ${WORKDIR}/add-files/dts -cf - gem5-arm64 | \
+        tar -C arch/arm64/boot/dts -xf -
+}
diff --git a/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend
index 480c5e23..078b684f 100644
--- a/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend
+++ b/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend
@@ -1,13 +1 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/files:"
-
 require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'recipes-kernel/linux/linux-yocto_virtualization.inc', '', d)}
-
-COMPATIBLE_MACHINE:gem5-arm64 = "gem5-arm64"
-KMACHINE:gem5-arm64 = "gem5-arm64"
-SRC_URI:append:gem5-arm64 = " file://gem5-kmeta;type=kmeta;name=gem5-kmeta;destsuffix=gem5-kmeta \
-                              file://dts/gem5-arm64;subdir=add-files"
-
-do_patch:append:gem5-arm64() {
-    tar -C ${WORKDIR}/add-files/dts -cf - gem5-arm64 | \
-        tar -C arch/arm64/boot/dts -xf -
-}
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [meta-arm] [PATCH 3/4] gem5/linux-yocto: use wildcards in the bbappend
  2022-02-11 11:45 ` [PATCH 3/4] gem5/linux-yocto: use wildcards in the bbappend Ross Burton
@ 2022-02-11 18:57   ` Denys Dmytriyenko
  0 siblings, 0 replies; 6+ messages in thread
From: Denys Dmytriyenko @ 2022-02-11 18:57 UTC (permalink / raw)
  To: Ross Burton; +Cc: meta-arm

Why not use --find-renames so the patch like this is more readable and 
reviewable?


On Fri, Feb 11, 2022 at 11:45:26AM +0000, Ross Burton wrote:
> Don't hard-code 5.4, use wildcards instead.
> 
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  .../recipes-kernel/linux/linux-yocto_%.bbappend      | 11 +++++++++++
>  .../recipes-kernel/linux/linux-yocto_5.4.bbappend    | 12 ------------
>  2 files changed, 11 insertions(+), 12 deletions(-)
>  create mode 100644 meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend
> 
> diff --git a/meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend
> new file mode 100644
> index 00000000..b36ea064
> --- /dev/null
> +++ b/meta-gem5/recipes-kernel/linux/linux-yocto_%.bbappend
> @@ -0,0 +1,11 @@
> +FILESEXTRAPATHS:prepend:gem5-arm64 := "${THISDIR}:${THISDIR}/files:"
> +
> +COMPATIBLE_MACHINE:gem5-arm64 = "gem5-arm64"
> +KMACHINE:gem5-arm64 = "gem5-arm64"
> +SRC_URI:append:gem5-arm64 = " file://gem5-kmeta;type=kmeta;name=gem5-kmeta;destsuffix=gem5-kmeta \
> +                              file://dts/gem5-arm64;subdir=add-files"
> +
> +do_patch:append:gem5-arm64() {
> +    tar -C ${WORKDIR}/add-files/dts -cf - gem5-arm64 | \
> +        tar -C arch/arm64/boot/dts -xf -
> +}
> diff --git a/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend
> index 480c5e23..078b684f 100644
> --- a/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend
> +++ b/meta-gem5/recipes-kernel/linux/linux-yocto_5.4.bbappend
> @@ -1,13 +1 @@
> -FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/files:"
> -
>  require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'recipes-kernel/linux/linux-yocto_virtualization.inc', '', d)}
> -
> -COMPATIBLE_MACHINE:gem5-arm64 = "gem5-arm64"
> -KMACHINE:gem5-arm64 = "gem5-arm64"
> -SRC_URI:append:gem5-arm64 = " file://gem5-kmeta;type=kmeta;name=gem5-kmeta;destsuffix=gem5-kmeta \
> -                              file://dts/gem5-arm64;subdir=add-files"
> -
> -do_patch:append:gem5-arm64() {
> -    tar -C ${WORKDIR}/add-files/dts -cf - gem5-arm64 | \
> -        tar -C arch/arm64/boot/dts -xf -
> -}
> -- 
> 2.25.1
> 


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 4/4] atp/linux-yocto: use wildcards in the bbappend
  2022-02-11 11:45 [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report Ross Burton
  2022-02-11 11:45 ` [PATCH 2/4] gem5/gem-aarch64-native: remove duplicate --command-line Ross Burton
  2022-02-11 11:45 ` [PATCH 3/4] gem5/linux-yocto: use wildcards in the bbappend Ross Burton
@ 2022-02-11 11:45 ` Ross Burton
  2022-02-11 15:49 ` [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report Jon Mason
  3 siblings, 0 replies; 6+ messages in thread
From: Ross Burton @ 2022-02-11 11:45 UTC (permalink / raw)
  To: meta-arm

Don't hard-code 5.4, use wildcards instead.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../linux/{linux-yocto-5.4 => files}/no_ftrace.cfg              | 0
 .../recipes-kernel/linux/{linux-yocto-5.4 => files}/smmuv3.cfg  | 0
 .../linux/{linux-yocto_5.4.bbappend => linux-yocto_%.bbappend}  | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta-atp/recipes-kernel/linux/{linux-yocto-5.4 => files}/no_ftrace.cfg (100%)
 rename meta-atp/recipes-kernel/linux/{linux-yocto-5.4 => files}/smmuv3.cfg (100%)
 rename meta-atp/recipes-kernel/linux/{linux-yocto_5.4.bbappend => linux-yocto_%.bbappend} (50%)

diff --git a/meta-atp/recipes-kernel/linux/linux-yocto-5.4/no_ftrace.cfg b/meta-atp/recipes-kernel/linux/files/no_ftrace.cfg
similarity index 100%
rename from meta-atp/recipes-kernel/linux/linux-yocto-5.4/no_ftrace.cfg
rename to meta-atp/recipes-kernel/linux/files/no_ftrace.cfg
diff --git a/meta-atp/recipes-kernel/linux/linux-yocto-5.4/smmuv3.cfg b/meta-atp/recipes-kernel/linux/files/smmuv3.cfg
similarity index 100%
rename from meta-atp/recipes-kernel/linux/linux-yocto-5.4/smmuv3.cfg
rename to meta-atp/recipes-kernel/linux/files/smmuv3.cfg
diff --git a/meta-atp/recipes-kernel/linux/linux-yocto_5.4.bbappend b/meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend
similarity index 50%
rename from meta-atp/recipes-kernel/linux/linux-yocto_5.4.bbappend
rename to meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend
index c8352206..f59f8d44 100644
--- a/meta-atp/recipes-kernel/linux/linux-yocto_5.4.bbappend
+++ b/meta-atp/recipes-kernel/linux/linux-yocto_%.bbappend
@@ -1,2 +1,2 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-5.4:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI += "file://no_ftrace.cfg file://smmuv3.cfg"
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report
  2022-02-11 11:45 [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report Ross Burton
                   ` (2 preceding siblings ...)
  2022-02-11 11:45 ` [PATCH 4/4] atp/linux-yocto: " Ross Burton
@ 2022-02-11 15:49 ` Jon Mason
  3 siblings, 0 replies; 6+ messages in thread
From: Jon Mason @ 2022-02-11 15:49 UTC (permalink / raw)
  To: meta-arm, Ross Burton

On Fri, 11 Feb 2022 11:45:24 +0000, Ross Burton wrote:
> The gem5-arm64 machine was missing.

Applied, thanks!

[1/4] CI: add meta-gem5 to the pending upgrades report
      commit: bade8df2d882098e7a06b419e4924efd87b717b2
[2/4] gem5/gem-aarch64-native: remove duplicate --command-line
      commit: 6c410376dfd2188ee9f071a1cc4f2c8cccc25d07
[3/4] gem5/linux-yocto: use wildcards in the bbappend
      commit: e5334bfabfbb5ea6d0a6819d62085f58520c6181
[4/4] atp/linux-yocto: use wildcards in the bbappend
      commit: 31446384e6dfa9d0bbf26ebe11adbff8250a3964

Best regards,
-- 
Jon Mason <jon.mason@arm.com>


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-02-11 18:57 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-11 11:45 [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report Ross Burton
2022-02-11 11:45 ` [PATCH 2/4] gem5/gem-aarch64-native: remove duplicate --command-line Ross Burton
2022-02-11 11:45 ` [PATCH 3/4] gem5/linux-yocto: use wildcards in the bbappend Ross Burton
2022-02-11 18:57   ` [meta-arm] " Denys Dmytriyenko
2022-02-11 11:45 ` [PATCH 4/4] atp/linux-yocto: " Ross Burton
2022-02-11 15:49 ` [PATCH 1/4] CI: add meta-gem5 to the pending upgrades report Jon Mason

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.