Remove SRVTAG and use SRCREV to match standard Yocto practice. Also, rename files with version to have the versions separated to allow for versionless bbappends to be used.

Signed-off-by: Jon Mason jon.mason@arm.com --- conf/machine/include/morello-common.inc | 5 ++++- recipes-core/busybox/busybox-morello.inc | 4 ++-- .../{busybox-morello-1.5.bb => busybox-morello_1.5.bb} | 2 +- recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb | 6 +++--- recipes-kernel/linux/linux-morello.inc | 4 ++-- .../linux/{linux-morello-1.5.bb => linux-morello_1.5.bb} | 6 ++++-- 6 files changed, 16 insertions(+), 11 deletions(-) rename recipes-core/busybox/{busybox-morello-1.5.bb => busybox-morello_1.5.bb} (79%) rename recipes-kernel/linux/{linux-morello-1.5.bb => linux-morello_1.5.bb} (57%)

diff --git a/conf/machine/include/morello-common.inc b/conf/machine/include/morello-common.inc index cea499653c3c..84af1345cd95 100644 --- a/conf/machine/include/morello-common.inc +++ b/conf/machine/include/morello-common.inc @@ -2,6 +2,9 @@ require ${COREBASE}/meta/conf/machine/include/arm/armv8-2a/tune-neoversen1.inc

MACHINEOVERRIDES =. "morello"

+PREFERRED_PROVIDER_virtual/kernel = "linux-morello" +PREFERRED_VERSION_virtual/kernel = "1.5" + LLVM_SHARED_SOURCE ?= "${TMPDIR}/work-shared/${MACHINE}/llvm-morello-source"

MUSL_INSTALL_DIR ??="" @@ -23,4 +26,4 @@ GLOBAL_ARCH_FLAGS ?= "${C64_ARCH_FLAGS}" TMPDIR_BSP = "tmp-bsp" TMPDIR_LINUX = "tmp-linux"

-APP_DIR ?= "pure-cap-apps" \ No newline at end of file +APP_DIR ?= "pure-cap-apps" diff --git a/recipes-core/busybox/busybox-morello.inc b/recipes-core/busybox/busybox-morello.inc index 695321356432..7c5fd9d4a144 100644 --- a/recipes-core/busybox/busybox-morello.inc +++ b/recipes-core/busybox/busybox-morello.inc @@ -13,7 +13,7 @@ PROVIDES += "virtual/morello-busybox" RPROVIDES:${PN} += "busybox-morello"

SRC_URI = " \ - git://git.morello-project.org/morello/morello-busybox;protocol=https;tag=${SRCTAG};branch=${SRCBRANCH} \ + git://git.morello-project.org/morello/morello-busybox;protocol=https;branch=${SRCBRANCH} \ file://files/0001-Remove-elf-patch-append-toolchain-with-relative-path.patch \ "

@@ -49,4 +49,4 @@ do_compile() { do_install() { install -d ${D}/busybox install -m 0755 ${S}/busybox ${D}/busybox/busybox -} \ No newline at end of file +} diff --git a/recipes-core/busybox/busybox-morello-1.5.bb b/recipes-core/busybox/busybox-morello_1.5.bb similarity index 79% rename from recipes-core/busybox/busybox-morello-1.5.bb rename to recipes-core/busybox/busybox-morello_1.5.bb index 46411b6a1d2c..0fdc60ce58dc 100644 --- a/recipes-core/busybox/busybox-morello-1.5.bb +++ b/recipes-core/busybox/busybox-morello_1.5.bb @@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=de10de48642ab74318e893a61105afbb \ file://archival/libarchive/bz/LICENSE;md5=28e3301eae987e8cfe19988e98383dae"

SRCBRANCH = "morello/master" -SRCTAG = "morello-release-1.5.0" \ No newline at end of file +SRCREV = "0f2436d16ddbca4467808735b1357b46e67aeddf" diff --git a/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb b/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb index 5041b9d4b811..c188adecfebd 100644 --- a/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb +++ b/recipes-devtools/gen-init-cpio/gen-init-cpio-native.bb @@ -11,11 +11,11 @@ PROVIDES = "${OUTPUTS_NAME}-native" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"

SRC_URI = " \ - git://git.morello-project.org/morello/kernel/linux;protocol=https;tag=${SRCTAG};branch=${SRCBRANCH} \ + git://git.morello-project.org/morello/kernel/linux;protocol=https;branch=${SRCBRANCH} \ "

SRCBRANCH = "morello/master" -SRCTAG = "morello-release-1.5.0" +SRCREV = "87d06928f90fe910311210a0149d03f3420f593c"

S = "${WORKDIR}/git/usr"

@@ -31,4 +31,4 @@ do_compile(){ do_install(){ install -d ${D}${bindir} install -m 0744 ${S}/gen_init_cpio ${D}${bindir}/gen_init_cpio -} \ No newline at end of file +} diff --git a/recipes-kernel/linux/linux-morello.inc b/recipes-kernel/linux/linux-morello.inc index a5effbb50694..cb9f1db54ae8 100644 --- a/recipes-kernel/linux/linux-morello.inc +++ b/recipes-kernel/linux/linux-morello.inc @@ -12,7 +12,7 @@ DEPENDS += "rsync-native" PROVIDES += "virtual/${OUTPUTS_NAME}"

SRC_URI = " \ - git://git.morello-project.org/morello/kernel/linux;protocol=https;tag=${SRCTAG};branch=${SRCBRANCH} \ + git://git.morello-project.org/morello/kernel/linux;protocol=https;branch=${SRCBRANCH} \ "

PV = "${LINUX_VERSION}+git${SRCPV}" @@ -44,4 +44,4 @@ do_configure:prepend(){

do_install:append() { oe_runmake headers_install ARCH=arm64 INSTALL_HDR_PATH=${STAGING_KERNEL_BUILDDIR}/kernel-headers -} \ No newline at end of file +} diff --git a/recipes-kernel/linux/linux-morello-1.5.bb b/recipes-kernel/linux/linux-morello_1.5.bb similarity index 57% rename from recipes-kernel/linux/linux-morello-1.5.bb rename to recipes-kernel/linux/linux-morello_1.5.bb index ea3e0cadebe6..db43225633d3 100644 --- a/recipes-kernel/linux/linux-morello-1.5.bb +++ b/recipes-kernel/linux/linux-morello_1.5.bb @@ -2,8 +2,10 @@ require linux-morello.inc

LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"

+SRCREV = "87d06928f90fe910311210a0149d03f3420f593c" SRCBRANCH = "morello/master" -SRCTAG = "morello-release-1.5.0"

LINUX_VERSION = "5.18" -LINUX_VERSION_EXTENSION= "-yocto-purecap" \ No newline at end of file +LINUX_VERSION_EXTENSION= "-yocto-purecap" + +COMPATIBLE_MACHINE = "morello"

Signed-off-by: Jon Mason jon.mason@arm.com --- .gitlab-ci.yml | 78 +++++++++++++++++++++++++++++++++++++++++++++++ ci/check-warnings | 19 ++++++++++++ ci/jobs-to-kas | 16 ++++++++++ ci/logging.yml | 13 ++++++++ ci/update-repos | 40 ++++++++++++++++++++++++ 5 files changed, 166 insertions(+) create mode 100644 .gitlab-ci.yml create mode 100755 ci/check-warnings create mode 100755 ci/jobs-to-kas create mode 100644 ci/logging.yml create mode 100755 ci/update-repos

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000000..8be7d551454a --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,78 @@ +image: ghcr.io/siemens/kas/kas:3.2 + +variables: + CPU_REQUEST: "" + DEFAULT_TAG: "" + # These are needed as the k8s executor doesn't respect the container + # entrypoint by default + FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: 0 + FF_KUBERNETES_HONOR_ENTRYPOINT: 1 + +stages: + - prep + - build + +# Common job fragment to get a worker ready +.setup: + tags: + - $DEFAULT_TAG + stage: build + interruptible: true + variables: + KAS_WORK_DIR: $CI_PROJECT_DIR/work + KAS_REPO_REF_DIR: $CI_BUILDS_DIR/persist/repos + SSTATE_DIR: $CI_BUILDS_DIR/persist/sstate + DL_DIR: $CI_BUILDS_DIR/persist/downloads + BB_LOGCONFIG: $CI_PROJECT_DIR/ci/logging.yml + before_script: + - echo KAS_WORK_DIR = $KAS_WORK_DIR + - echo SSTATE_DIR = $SSTATE_DIR + - echo DL_DIR = $DL_DIR + - rm -rf $KAS_WORK_DIR + - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR + - sudo apt-get update && sudo apt install -y libtinfo5 + +# Generalised fragment to do a Kas build +.build: + extends: .setup + variables: + KUBERNETES_CPU_REQUEST: $CPU_REQUEST + script: + - KASFILES=$(./ci/jobs-to-kas "$CI_JOB_NAME") + - kas shell --update --force-checkout $KASFILES -c 'cat conf/*.conf' + - kas build $KASFILES + - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log + artifacts: + name: "logs" + when: on_failure + paths: + - $CI_PROJECT_DIR/work/build/tmp/work*/**/temp/log.do_*.* + +# +# Prep stage, update repositories once +# +update-repos: + extends: .setup + stage: prep + script: + - flock --verbose --timeout 60 $KAS_REPO_REF_DIR ./ci/update-repos + +check-layers: + extends: .setup + coverage: '/Coverage: \d+/' + script: + - kas shell --update --force-checkout kas/base.yml --command \ + "yocto-check-layer-wrapper $CI_PROJECT_DIR -n --dependency $KAS_WORK_DIR/meta-arm/meta-arm $KAS_WORK_DIR/meta-arm/meta-arm-toolchain" + +# +# Build stage, the actual build jobs +# + +morello-bsp: + extends: .build + +morello-linux-glibc: + extends: .build + +morello-linux-musl: + extends: .build diff --git a/ci/check-warnings b/ci/check-warnings new file mode 100755 index 000000000000..9d080103b50b --- /dev/null +++ b/ci/check-warnings @@ -0,0 +1,19 @@ +#! /bin/bash + +# Expects the path to a log file as $1, and if this file has any content +# then display the contents and exit with an error code. + +set -e -u + +LOGFILE=$1 + +LINES=$(grep --invert-match "relocations in .text" $LOGFILE | wc -l) +if test "$LINES" -ne 0; then + echo ============================== + echo The build had warnings/errors: + echo ============================== + cat $LOGFILE + exit 1 +fi + +exit 0 diff --git a/ci/jobs-to-kas b/ci/jobs-to-kas new file mode 100755 index 000000000000..95df56c74a76 --- /dev/null +++ b/ci/jobs-to-kas @@ -0,0 +1,16 @@ +#! /bin/bash + +# This script is expecting an input of machine name, optionally followed by a +# colon and a list of one or more parameters separated by commas between +# brackets. For example, the following are acceptable: +# qemu-x86 +# qemu-cortex-m3: [testimage] +# qemu-cortex-a53: [zephyr-toolchain, testimage] +# +# Turn this list into a series of yml files separated by colons to pass to kas + +set -e -u + +FILES="kas/$(echo $1 | cut -d ':' -f 1).yml" + +echo $FILES diff --git a/ci/logging.yml b/ci/logging.yml new file mode 100644 index 000000000000..3af10295f8f3 --- /dev/null +++ b/ci/logging.yml @@ -0,0 +1,13 @@ +# Python logging configuration to write all warnings to a separate file +version: 1 + +handlers: + warnings: + class: logging.FileHandler + level: WARNING + filename: warnings.log + formatter: BitBake.logfileFormatter + +loggers: + BitBake: + handlers: [warnings] diff --git a/ci/update-repos b/ci/update-repos new file mode 100755 index 000000000000..fa638aad2efb --- /dev/null +++ b/ci/update-repos @@ -0,0 +1,40 @@ +#! /usr/bin/env python3 + +# Update clones of the repositories we need in KAS_REPO_REF_DIR to speed up fetches + +import sys +import os +import subprocess +import pathlib + +def repo_shortname(url): + # Taken from Kas (Repo.__getattr__) to ensure the logic is right + from urllib.parse import urlparse + url = urlparse(url) + return ('{url.netloc}{url.path}' + .format(url=url) + .replace('@', '.') + .replace(':', '.') + .replace('/', '.') + .replace('*', '.')) + +repositories = ( + "https://git.yoctoproject.org/git/poky", + "https://git.openembedded.org/meta-openembedded", +) + +if __name__ == "__main__": + if "KAS_REPO_REF_DIR" not in os.environ: + print("KAS_REPO_REF_DIR needs to be set") + sys.exit(1) + + base_repodir = pathlib.Path(os.environ["KAS_REPO_REF_DIR"]) + + for repo in repositories: + repodir = base_repodir / repo_shortname(repo) + if repodir.exists(): + print("Updating %s..." % repo) + subprocess.run(["git", "-C", repodir, "fetch"], check=True) + else: + print("Cloning %s..." % repo) + subprocess.run(["git", "clone", "--bare", repo, repodir], check=True)