From patchwork Mon Mar 6 20:50:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 20531 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4CEAC6FD1F for ; Tue, 7 Mar 2023 13:20:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.14903.1678195196669704768 for ; Tue, 07 Mar 2023 05:19:56 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 138282F4 for ; Tue, 7 Mar 2023 05:20:39 -0800 (PST) Received: from jdm-VirtualBox.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 83B513F71A for ; Tue, 7 Mar 2023 05:19:55 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/2] CI: add yml files for defaults Date: Mon, 6 Mar 2023 15:50:45 -0500 Message-Id: <20230306205046.472156-1-jon.mason@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Mar 2023 13:20:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4476 Make things more obvious by adding yml files for the poky defaults instead of disregarding them in the jobs-to-kas script Signed-off-by: Jon Mason --- .gitlab-ci.yml | 11 ++++++----- ci/clang.yml | 2 +- ci/gcc.yml | 7 +++++++ ci/glibc.yml | 7 +++++++ ci/jobs-to-kas | 2 +- ci/u-boot.yml | 8 ++++++++ 6 files changed, 30 insertions(+), 7 deletions(-) create mode 100644 ci/gcc.yml create mode 100644 ci/glibc.yml create mode 100644 ci/u-boot.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75d36094..d5c82dd1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,7 +72,8 @@ update-repos: # Available options for building are # TOOLCHAINS: [gcc, clang, armgcc, external-gccarm] # TCLIBC: [glibc, musl] -# FIRMWARE: [uboot, edk2] +# FIRMWARE: [u-boot, edk2] +# TS: [none, trusted-services] # VIRT: [none, xen] # TESTING: testimage @@ -88,7 +89,7 @@ corstone1000-fvp: extends: .build parallel: matrix: - - TESTING: [testimage,tftf] + - TESTING: [testimage, tftf] tags: - x86_64 @@ -127,7 +128,7 @@ juno: parallel: matrix: - TOOLCHAINS: [gcc, clang] - FIRMWARE: [uboot, edk2] + FIRMWARE: [u-boot, edk2] musca-b1: extends: .build @@ -163,7 +164,7 @@ qemuarm64: parallel: matrix: - TOOLCHAINS: [gcc, clang] - EFI: [uboot, edk2] + FIRMWARE: [u-boot, edk2] TESTING: testimage - VIRT: xen @@ -179,7 +180,7 @@ qemuarm: parallel: matrix: - TOOLCHAINS: [gcc, clang] - EFI: [uboot, edk2] + FIRMWARE: [u-boot, edk2] TESTING: testimage - VIRT: xen diff --git a/ci/clang.yml b/ci/clang.yml index a2063f19..7559f6b0 100644 --- a/ci/clang.yml +++ b/ci/clang.yml @@ -6,5 +6,5 @@ repos: url: https://github.com/kraj/meta-clang local_conf_header: - clang: | + toolchain: | TOOLCHAIN = "clang" diff --git a/ci/gcc.yml b/ci/gcc.yml new file mode 100644 index 00000000..a3943680 --- /dev/null +++ b/ci/gcc.yml @@ -0,0 +1,7 @@ +header: + version: 11 + +#NOTE: This is the default for poky. This is only being added for completeness/clarity +local_conf_header: + toolchain: | + TOOLCHAIN = "gcc" diff --git a/ci/glibc.yml b/ci/glibc.yml new file mode 100644 index 00000000..adc85a76 --- /dev/null +++ b/ci/glibc.yml @@ -0,0 +1,7 @@ +header: + version: 11 + +#NOTE: This is the default for poky. This is only being added for completeness/clarity +local_conf_header: + libc: | + TCLIBC = "glibc" diff --git a/ci/jobs-to-kas b/ci/jobs-to-kas index d6896b77..b8615a5f 100755 --- a/ci/jobs-to-kas +++ b/ci/jobs-to-kas @@ -18,7 +18,7 @@ for i in $(echo $1 | cut -s -d ':' -f 2 | sed 's/[][,]//g'); do # defaults, we can simply ignore those parameters. They are necessary # to pass in so that matrix can correctly setup all of the permutations # of each individual run. - if [[ $i == 'none' || $i == 'gcc' || $i == 'glibc' || $i == 'uboot' ]]; then + if [[ $i == 'none' ]]; then continue fi FILES+=":ci/$i.yml" diff --git a/ci/u-boot.yml b/ci/u-boot.yml new file mode 100644 index 00000000..76bdd23e --- /dev/null +++ b/ci/u-boot.yml @@ -0,0 +1,8 @@ +header: + version: 11 + +local_conf_header: + bootfirmware: | + PREFERRED_PROVIDER_virtual/bootloader = "u-boot" + TFA_UBOOT = "1" + TFA_UEFI = "0" From patchwork Mon Mar 6 20:50:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jon Mason X-Patchwork-Id: 20532 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AACF4C742A7 for ; Tue, 7 Mar 2023 13:20:04 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.14902.1678195196547137002 for ; Tue, 07 Mar 2023 05:19:56 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: jon.mason@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3EDFE11FB for ; Tue, 7 Mar 2023 05:20:39 -0800 (PST) Received: from jdm-VirtualBox.lan?044arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B24333F71A for ; Tue, 7 Mar 2023 05:19:55 -0800 (PST) From: Jon Mason To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/2] CI: add support for dev kernel, rt kernel, and poky-tiny Date: Mon, 6 Mar 2023 15:50:46 -0500 Message-Id: <20230306205046.472156-2-jon.mason@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230306205046.472156-1-jon.mason@arm.com> References: <20230306205046.472156-1-jon.mason@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 07 Mar 2023 13:20:04 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4475 Add the various kernels available in oe-core, as well as the poky-tiny minimal distribution (which has a minimal kernel config). This necessitated combining some kernel bbappends to have patching coverage for all the variants. Signed-off-by: Jon Mason --- .gitlab-ci.yml | 29 +++++++++++++++---- ci/corstone1000-common.yml | 3 +- ci/corstone500.yml | 9 +----- ci/linux-yocto-dev.yml | 6 ++++ ci/linux-yocto-rt.yml | 6 ++++ ci/linux-yocto.yml | 7 +++++ ci/poky-tiny.yml | 14 +++++++++ ci/poky.yml | 4 +++ .../recipes-kernel/linux/files/no-ipvs.cfg | 1 + .../linux/files/qemuarm-phys-virt.cfg | 1 + ...yocto_%.bbappend => linux-yocto%.bbappend} | 12 +++++++- .../linux/linux-yocto_6.1%.bbappend | 7 ----- 12 files changed, 75 insertions(+), 24 deletions(-) create mode 100644 ci/linux-yocto-dev.yml create mode 100644 ci/linux-yocto-rt.yml create mode 100644 ci/linux-yocto.yml create mode 100644 ci/poky-tiny.yml create mode 100644 ci/poky.yml create mode 100644 meta-arm/recipes-kernel/linux/files/no-ipvs.cfg create mode 100644 meta-arm/recipes-kernel/linux/files/qemuarm-phys-virt.cfg rename meta-arm/recipes-kernel/linux/{linux-yocto_%.bbappend => linux-yocto%.bbappend} (74%) delete mode 100644 meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5c82dd1..0bc9a8e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,6 +70,8 @@ update-repos: # Build stage, the actual build jobs # # Available options for building are +# DISTRO: [poky, poky-tiny] +# KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] # TOOLCHAINS: [gcc, clang, armgcc, external-gccarm] # TCLIBC: [glibc, musl] # FIRMWARE: [u-boot, edk2] @@ -147,14 +149,16 @@ qemu-generic-arm64: extends: .build parallel: matrix: - - TOOLCHAINS: [gcc, clang] + - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + TOOLCHAINS: [gcc, clang] TESTING: testimage qemuarm64-secureboot: extends: .build parallel: matrix: - - TOOLCHAINS: [gcc, clang] + - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + TOOLCHAINS: [gcc, clang] TCLIBC: [glibc, musl] TS: [none, trusted-services] TESTING: testimage @@ -163,32 +167,45 @@ qemuarm64: extends: .build parallel: matrix: - - TOOLCHAINS: [gcc, clang] + - DISTRO: poky + KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + TOOLCHAINS: [gcc, clang] FIRMWARE: [u-boot, edk2] TESTING: testimage + - DISTRO: poky-tiny + TESTING: testimage - VIRT: xen qemuarm-secureboot: extends: .build parallel: matrix: - - TOOLCHAINS: [gcc, clang] + - KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + TOOLCHAINS: [gcc, clang] TESTING: testimage qemuarm: extends: .build parallel: matrix: - - TOOLCHAINS: [gcc, clang] + - DISTRO: poky + KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + TOOLCHAINS: [gcc, clang] FIRMWARE: [u-boot, edk2] TESTING: testimage + - DISTRO: poky-tiny + TESTING: testimage - VIRT: xen qemuarmv5: extends: .build parallel: matrix: - - TESTING: testimage + - DISTRO: poky + KERNEL: [linux-yocto, linux-yocto-dev, linux-yocto-rt] + TESTING: testimage + - DISTRO: poky-tiny + TESTING: testimage sgi575: extends: .build diff --git a/ci/corstone1000-common.yml b/ci/corstone1000-common.yml index 65ff9d38..d856cfe7 100644 --- a/ci/corstone1000-common.yml +++ b/ci/corstone1000-common.yml @@ -3,13 +3,12 @@ header: includes: - ci/base.yml - ci/meta-openembedded.yml + - ci/poky-tiny.yml local_conf_header: extrapackages: | # Intentionally blank to prevent perf from being added to the image in base.yml -distro: poky-tiny - target: - corstone1000-image - perf diff --git a/ci/corstone500.yml b/ci/corstone500.yml index 437c97c5..0f9592e3 100644 --- a/ci/corstone500.yml +++ b/ci/corstone500.yml @@ -3,17 +3,10 @@ header: includes: - ci/base.yml - ci/fvp.yml + - ci/poky-tiny.yml local_conf_header: fvp-config: | IMAGE_FEATURES:remove = " ssh-server-dropbear" - extrapackages: | - # Intentionally blank to prevent perf from being added to the image in base.yml machine: corstone500 - -distro: poky-tiny - -target: - - core-image-minimal - - perf diff --git a/ci/linux-yocto-dev.yml b/ci/linux-yocto-dev.yml new file mode 100644 index 00000000..a6fadce1 --- /dev/null +++ b/ci/linux-yocto-dev.yml @@ -0,0 +1,6 @@ +header: + version: 9 + +local_conf_header: + kernel: | + PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev" diff --git a/ci/linux-yocto-rt.yml b/ci/linux-yocto-rt.yml new file mode 100644 index 00000000..69d768c5 --- /dev/null +++ b/ci/linux-yocto-rt.yml @@ -0,0 +1,6 @@ +header: + version: 9 + +local_conf_header: + kernel: | + PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt" diff --git a/ci/linux-yocto.yml b/ci/linux-yocto.yml new file mode 100644 index 00000000..359fea5a --- /dev/null +++ b/ci/linux-yocto.yml @@ -0,0 +1,7 @@ +header: + version: 9 + +#NOTE: This is the default for poky. This is only being added for completeness/clarity +local_conf_header: + kernel: | + PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" diff --git a/ci/poky-tiny.yml b/ci/poky-tiny.yml new file mode 100644 index 00000000..cf252a0e --- /dev/null +++ b/ci/poky-tiny.yml @@ -0,0 +1,14 @@ +header: + version: 9 + +distro: poky-tiny + +local_conf_header: + hacking: | + TEST_SUITES = "ping" + extrapackages: | + # Intentionally blank to prevent perf from being added to the image in base.yml + +target: + - core-image-minimal + - perf diff --git a/ci/poky.yml b/ci/poky.yml new file mode 100644 index 00000000..d4bcfebf --- /dev/null +++ b/ci/poky.yml @@ -0,0 +1,4 @@ +header: + version: 9 + +distro: poky diff --git a/meta-arm/recipes-kernel/linux/files/no-ipvs.cfg b/meta-arm/recipes-kernel/linux/files/no-ipvs.cfg new file mode 100644 index 00000000..fcfd2b21 --- /dev/null +++ b/meta-arm/recipes-kernel/linux/files/no-ipvs.cfg @@ -0,0 +1 @@ +CONFIG_IP_VS=n diff --git a/meta-arm/recipes-kernel/linux/files/qemuarm-phys-virt.cfg b/meta-arm/recipes-kernel/linux/files/qemuarm-phys-virt.cfg new file mode 100644 index 00000000..b014e7f6 --- /dev/null +++ b/meta-arm/recipes-kernel/linux/files/qemuarm-phys-virt.cfg @@ -0,0 +1 @@ +CONFIG_ARM_PATCH_PHYS_VIRT=y diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend similarity index 74% rename from meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend rename to meta-arm/recipes-kernel/linux/linux-yocto%.bbappend index 91dc000e..cab7f47e 100644 --- a/meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend +++ b/meta-arm/recipes-kernel/linux/linux-yocto%.bbappend @@ -1,9 +1,16 @@ ARMFILESPATHS := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}" +SRC_URI:append:aarch64 = " \ + file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \ + file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \ + " + COMPATIBLE_MACHINE:generic-arm64 = "generic-arm64" FILESEXTRAPATHS:prepend:generic-arm64 = "${ARMFILESPATHS}" SRC_URI:append:generic-arm64 = " \ file://generic-arm64-kmeta;type=kmeta;destsuffix=generic-arm64-kmeta \ + file://no-ipvs.cfg \ " FILESEXTRAPATHS:prepend:qemuarm64-secureboot = "${ARMFILESPATHS}" @@ -25,7 +32,10 @@ FILESEXTRAPATHS:prepend:qemuarm64 = "${ARMFILESPATHS}" SRC_URI:append:qemuarm64 = " file://efi.cfg" FILESEXTRAPATHS:prepend:qemuarm = "${ARMFILESPATHS}" -SRC_URI:append:qemuarm = " file://efi.cfg" +SRC_URI:append:qemuarm = " \ + file://efi.cfg \ + file://qemuarm-phys-virt.cfg \ + " FFA_TRANSPORT_INCLUDE = "${@bb.utils.contains('MACHINE_FEATURES', 'arm-ffa', 'arm-ffa-transport.inc', '' , d)}" require ${FFA_TRANSPORT_INCLUDE} diff --git a/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend b/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend deleted file mode 100644 index 754e5c2d..00000000 --- a/meta-arm/recipes-kernel/linux/linux-yocto_6.1%.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -ARMFILESPATHS := "${THISDIR}/files:" - -FILESEXTRAPATHS:prepend:aarch64 = "${ARMFILESPATHS}" -SRC_URI:append:aarch64 = " \ - file://0001-Revert-arm64-defconfig-Enable-Tegra-MGBE-driver.patch \ - file://0002-Revert-arm64-defconfig-Add-Nuvoton-NPCM-family-suppo.patch \ - "