diff options
Diffstat (limited to 'meta-arm/ci')
-rwxr-xr-x | meta-arm/ci/check-warnings | 2 | ||||
-rw-r--r-- | meta-arm/ci/corstone1000-common.yml | 39 | ||||
-rw-r--r-- | meta-arm/ci/corstone1000-firmware-only.yml | 20 | ||||
-rw-r--r-- | meta-arm/ci/toolchains.yml | 2 |
4 files changed, 4 insertions, 59 deletions
diff --git a/meta-arm/ci/check-warnings b/meta-arm/ci/check-warnings index 89ae955dfe..cdf84aafb9 100755 --- a/meta-arm/ci/check-warnings +++ b/meta-arm/ci/check-warnings @@ -7,7 +7,7 @@ set -e -u LOGFILE=$1 -LINES=$(grep --invert-match "attempting MIRRORS if available" $LOGFILE | wc -l) +LINES=$(sed -e "/attempting MIRRORS if available/d" -e "/Error parsing .*netrc:/d" $LOGFILE | wc -l) if test "$LINES" -ne 0; then echo ============================== echo The build had warnings/errors: diff --git a/meta-arm/ci/corstone1000-common.yml b/meta-arm/ci/corstone1000-common.yml index 4c71517651..7fe9e8793a 100644 --- a/meta-arm/ci/corstone1000-common.yml +++ b/meta-arm/ci/corstone1000-common.yml @@ -4,44 +4,7 @@ header: - ci/base.yml - ci/meta-openembedded.yml - ci/meta-secure-core.yml - -local_conf_header: - extrapackages: | - # Intentionally blank to prevent perf from being added to the image in base.yml - - firmwarebuild: | - # Only needed as kas doesn't add it automatically unless you have 2 targets in seperate configs - BBMULTICONFIG ?= "firmware" - - distrosetup: | - DISTRO_FEATURES = "usbhost ipv4" - - initramfsetup: | - # Telling the build system which image is responsible of the generation of the initramfs rootfs - INITRAMFS_IMAGE_BUNDLE:firmware = "1" - INITRAMFS_IMAGE:firmware ?= "core-image-minimal" - IMAGE_FSTYPES:firmware:pn-core-image-minimal = "${INITRAMFS_FSTYPES}" - IMAGE_NAME_SUFFIX:firmware = "" - - # enable mdev/busybox for init - INIT_MANAGER:firmware = "mdev-busybox" - VIRTUAL-RUNTIME_init_manager:firmware = "busybox" - - # prevent the kernel image from being included in the intramfs rootfs - PACKAGE_EXCLUDE:firmware += "kernel-image-*" - - # Disable openssl in kmod to shrink the initramfs size - PACKAGECONFIG:remove:firmware:pn-kmod = "openssl" - - imageextras: | - # Don't include kernel binary in rootfs /boot path - RRECOMMENDS:${KERNEL_PACKAGE_NAME}-base = "" - - # all optee packages - CORE_IMAGE_EXTRA_INSTALL += "optee-client" - - # TS PSA API tests commands for crypto, its, ps and iat - CORE_IMAGE_EXTRA_INSTALL += "packagegroup-ts-tests-psa" + - kas/corstone1000-image-configuration.yml target: - core-image-minimal diff --git a/meta-arm/ci/corstone1000-firmware-only.yml b/meta-arm/ci/corstone1000-firmware-only.yml index 9cc4299a8e..8af0146a3d 100644 --- a/meta-arm/ci/corstone1000-firmware-only.yml +++ b/meta-arm/ci/corstone1000-firmware-only.yml @@ -1,24 +1,8 @@ --- header: version: 14 - -local_conf_header: - rescuebuild: | - # Need to ensure the rescue linux options are selected - OVERRIDES .= ":firmware" - - # Need to ensure we build with a small libc - TCLIBC="musl" - - mass-storage: | - # Ensure the Mass Storage device is absent - FVP_CONFIG[board.msd_mmc.p_mmc_file] = "invalid.dat" - - test-configuration: | - TEST_SUITES = "_qemutiny ping" - # Remove Dropbear SSH as it will not fit into the corstone1000 image. - IMAGE_FEATURES:remove = "ssh-server-dropbear" - CORE_IMAGE_EXTRA_INSTALL:remove = "ssh-pregen-hostkeys" + includes: + - kas/corstone1000-firmware-only.yml target: - corstone1000-flash-firmware-image diff --git a/meta-arm/ci/toolchains.yml b/meta-arm/ci/toolchains.yml index 9b63bf2850..056269b2bd 100644 --- a/meta-arm/ci/toolchains.yml +++ b/meta-arm/ci/toolchains.yml @@ -16,5 +16,3 @@ target: - nativesdk-gcc-aarch64-none-elf - gcc-arm-none-eabi - nativesdk-gcc-arm-none-eabi - - gcc-arm-none-eabi-11.2 - - nativesdk-gcc-arm-none-eabi-11.2 |