@@ -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
@@ -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
@@ -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
new file mode 100644
@@ -0,0 +1,6 @@
+header:
+ version: 9
+
+local_conf_header:
+ kernel: |
+ PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
new file mode 100644
@@ -0,0 +1,6 @@
+header:
+ version: 9
+
+local_conf_header:
+ kernel: |
+ PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
new file mode 100644
@@ -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"
new file mode 100644
@@ -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
new file mode 100644
@@ -0,0 +1,4 @@
+header:
+ version: 9
+
+distro: poky
new file mode 100644
@@ -0,0 +1 @@
+CONFIG_IP_VS=n
new file mode 100644
@@ -0,0 +1 @@
+CONFIG_ARM_PATCH_PHYS_VIRT=y
similarity index 74%
rename from meta-arm/recipes-kernel/linux/linux-yocto_%.bbappend
rename to 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}
deleted file mode 100644
@@ -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 \
- "
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 <jon.mason@arm.com> --- .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