musl-morello-1.5.inc is not referenced anywhere but contains the branch and srcrev. Remove this file and transfer the data to musl-morello-common.inc, which appears to be used by musl-morello-a64.inc and musl-morello-c64.inc

Signed-off-by: Jon Mason jon.mason@arm.com --- recipes-core/musl/musl-morello-1.5.inc | 4 ---- recipes-core/musl/musl-morello-common.inc | 10 +++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 recipes-core/musl/musl-morello-1.5.inc

diff --git a/recipes-core/musl/musl-morello-1.5.inc b/recipes-core/musl/musl-morello-1.5.inc deleted file mode 100644 index 750120da99ce..000000000000 --- a/recipes-core/musl/musl-morello-1.5.inc +++ /dev/null @@ -1,4 +0,0 @@ -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68" - -SRCBRANCH = "morello/master" -SRCTAG = "morello-release-1.5.0" \ No newline at end of file diff --git a/recipes-core/musl/musl-morello-common.inc b/recipes-core/musl/musl-morello-common.inc index 158331c6f980..c0ada533a6da 100644 --- a/recipes-core/musl/musl-morello-common.inc +++ b/recipes-core/musl/musl-morello-common.inc @@ -6,11 +6,15 @@ FILESEXTRAPATHS:prepend := "${THISDIR}:"

SUMMARY = "CHERI enabled musl libc" SRC_URI = " \ - git://git.morello-project.org/morello/musl-libc;protocol=https;tag=${SRCTAG};branch=${SRCBRANCH} \ + git://git.morello-project.org/morello/musl-libc;protocol=https;branch=${SRCBRANCH} \ file://files/compiler_rt.cmake \ "

-SRCREV ="" +# morello-release-1.5.0 +SRCREV = "df8f6409fb58efe35a3300b91a1f1941e2f89022" +SRCBRANCH = "morello/master" + +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=b03f1cc25363d094011f8f4fd8bcfb68"

PV = "git${SRCPV}" S = "${WORKDIR}/git" @@ -60,4 +64,4 @@ do_configure() { do_compile() { export CFLAGS="" oe_runmake -} \ No newline at end of file +}

Signed-off-by: Jon Mason jon.mason@arm.com --- conf/machine/morello-linux-musl.conf | 4 +- kas/base.yml | 47 ++++++++++--------- .../images/morello-linux-image-musl.bb | 4 +- 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/conf/machine/morello-linux-musl.conf b/conf/machine/morello-linux-musl.conf index c030a358f8d7..f33e31b51bd3 100644 --- a/conf/machine/morello-linux-musl.conf +++ b/conf/machine/morello-linux-musl.conf @@ -10,8 +10,8 @@ PREFFERED_PROVIDER_morello-initramfs = "morello-initramfs-musl" TCLIBC = "musl"

BSP_GRUB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/grub-efi" -BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/trusted-firmware-a" +BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp"

TMPDIR = "${TOPDIR}/${TMPDIR_LINUX}"

-DISTRO = "" \ No newline at end of file +DISTRO = "" diff --git a/kas/base.yml b/kas/base.yml index f955eada4850..7d673f48d255 100644 --- a/kas/base.yml +++ b/kas/base.yml @@ -1,33 +1,36 @@ header: version: 11 -distro: "" -repos: - poky: - path: poky - url: "https://git.yoctoproject.org/poky" + +distro: poky + +defaults: + repos: refspec: kirkstone - layers: - meta: - meta-poky: - meta-yocto-bsp: excluded + +repos: + meta-morello: + meta-arm: - path: poky/meta-arm - url: "https://git.yoctoproject.org/meta-arm" - refspec: kirkstone + url: https://git.yoctoproject.org/meta-arm layers: meta-arm: meta-arm-bsp: meta-arm-toolchain: - meta-morello: - path: poky/meta-morello - url: "https://github.com/The-Good-Penguin/meta-morello" - refspec: kirkstone -bblayers_conf_header: - custom-local-conf: | - LCONF_VERSION = "7" - - YOCTOROOT := "${@os.path.abspath(os.path.dirname(d.getVar('FILE', True)) + '/../..')}" + + poky: + url: https://git.yoctoproject.org/git/poky + layers: + meta: + meta-poky: + local_conf_header: base: | CONF_VERSION = "2" - EXTRA_IMAGE_FEATURES ?= "debug-tweaks" \ No newline at end of file + setup: | + PACKAGE_CLASSES = "package_ipk" + EXTRA_IMAGE_FEATURES:append = " debug-tweaks" + +machine: unset + +target: + - core-image-minimal diff --git a/recipes-morello/images/morello-linux-image-musl.bb b/recipes-morello/images/morello-linux-image-musl.bb index 7b5e6eb375b3..45196d09a971 100644 --- a/recipes-morello/images/morello-linux-image-musl.bb +++ b/recipes-morello/images/morello-linux-image-musl.bb @@ -86,11 +86,11 @@ do_install() { : > ${OUTPUTS_NAME}.img truncate --size="$(mult ${IMAGE_SIZE} 3)M" ${OUTPUTS_NAME}.img

- create_gpt ${OUTPUTS_NAME}.img ${ESP_IMAGE}.img /home/pawel/Code/ArmMorello/linux/output/root.img + create_gpt ${OUTPUTS_NAME}.img ${ESP_IMAGE}.img ${D}/root.img install ${OUTPUTS_NAME}.img ${D}/${OUTPUTS_NAME}.img }

do_deploy() { install ${D}/${OUTPUTS_NAME}.img ${DEPLOYDIR}/${OUTPUTS_NAME}-${MORELLO_ARCH}-${TCLIBC}.img } -addtask deploy after do_install \ No newline at end of file +addtask deploy after do_install

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)

-BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/trusted-firmware-a" +BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp"

Good catch.

/home/pawel/Code/ArmMorello/linux/output/root.img

Yikes ! :)

Pawel

On Fri, 10 Feb 2023 at 11:53, Jon Mason jdmason@kudzu.us wrote:

Signed-off-by: Jon Mason jon.mason@arm.com

conf/machine/morello-linux-musl.conf | 4 +- kas/base.yml | 47 ++++++++++--------- .../images/morello-linux-image-musl.bb | 4 +- 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/conf/machine/morello-linux-musl.conf b/conf/machine/morello-linux-musl.conf index c030a358f8d7..f33e31b51bd3 100644 --- a/conf/machine/morello-linux-musl.conf +++ b/conf/machine/morello-linux-musl.conf @@ -10,8 +10,8 @@ PREFFERED_PROVIDER_morello-initramfs = "morello-initramfs-musl" TCLIBC = "musl"

BSP_GRUB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/grub-efi" -BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp/trusted-firmware-a" +BSP_DTB_DIR ?= "${TOPDIR}/${TMPDIR_BSP}/deploy/images/morello-bsp"

TMPDIR = "${TOPDIR}/${TMPDIR_LINUX}"

-DISTRO = "" \ No newline at end of file +DISTRO = "" diff --git a/kas/base.yml b/kas/base.yml index f955eada4850..7d673f48d255 100644 --- a/kas/base.yml +++ b/kas/base.yml @@ -1,33 +1,36 @@ header: version: 11 -distro: "" -repos:

• poky:
• path: poky
• url: "https://git.yoctoproject.org/poky"

+distro: poky

+defaults:

• repos: refspec: kirkstone

• layers:

•  meta:
  

•  meta-poky:
  

•  meta-yocto-bsp: excluded
  

+repos:

• meta-morello:
• meta-arm:

• path: poky/meta-arm
• url: "https://git.yoctoproject.org/meta-arm"
• refspec: kirkstone

• url: https://git.yoctoproject.org/meta-arm layers: meta-arm: meta-arm-bsp: meta-arm-toolchain:

• meta-morello:

•  path: poky/meta-morello
  

•  url: "https://github.com/The-Good-Penguin/meta-morello"
  

•  refspec: kirkstone
  

-bblayers_conf_header:

• custom-local-conf: |
• LCONF_VERSION = "7"
• YOCTOROOT := "${@os.path.abspath(os.path.dirname(d.getVar('FILE',

True)) + '/../..')}"

• poky:
• url: https://git.yoctoproject.org/git/poky
• layers:

•  meta:
  

•  meta-poky:
  

local_conf_header: base: | CONF_VERSION = "2"

• EXTRA_IMAGE_FEATURES ?= "debug-tweaks"

\ No newline at end of file

• setup: |
• PACKAGE_CLASSES = "package_ipk"
• EXTRA_IMAGE_FEATURES:append = " debug-tweaks"

+machine: unset

+target:

• • core-image-minimal

diff --git a/recipes-morello/images/morello-linux-image-musl.bb b/recipes-morello/images/morello-linux-image-musl.bb index 7b5e6eb375b3..45196d09a971 100644 --- a/recipes-morello/images/morello-linux-image-musl.bb +++ b/recipes-morello/images/morello-linux-image-musl.bb @@ -86,11 +86,11 @@ do_install() { : > ${OUTPUTS_NAME}.img truncate --size="$(mult ${IMAGE_SIZE} 3)M" ${OUTPUTS_NAME}.img

• create_gpt ${OUTPUTS_NAME}.img ${ESP_IMAGE}.img

/home/pawel/Code/ArmMorello/linux/output/root.img

• create_gpt ${OUTPUTS_NAME}.img ${ESP_IMAGE}.img ${D}/root.img install ${OUTPUTS_NAME}.img ${D}/${OUTPUTS_NAME}.img

}

do_deploy() { install ${D}/${OUTPUTS_NAME}.img ${DEPLOYDIR}/${OUTPUTS_NAME}-${MORELLO_ARCH}-${TCLIBC}.img } -addtask deploy after do_install \ No newline at end of file

+addtask deploy after do_install

2.30.2

---

linux-morello-distros mailing list -- linux-morello-distros@op-lists.linaro.org To unsubscribe send an email to linux-morello-distros-leave@op-lists.linaro.org