Skip to contentSkip to conversation

CI: track master

PATCH Superseded Jon Mason 1 participant 9 messages Jul 17, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/9 CI: track master

From: Ross Burton <[email protected]>

---
 ci/base.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
ci/base.yml +1 -1
index 38d8584f..4296d270 100644
@@ -5,7 +5,7 @@ distro: poky
 
 defaults:
   repos:
-    branch: mickledore
+    branch: master
 
 repos:
   meta-arm:
Signature · 1 line
2.30.2
author
#1 lore raw

PATCH 2/9 arm-bsp/u-boot: add temporary 2023.01 recipe

From: Ross Burton <[email protected]>

---
 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2023.01.bb | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2023.01.bb
meta-arm-bsp/recipes-bsp/u-boot/u-boot_2023.01.bb new file +4 -0
new file mode 100644
index 00000000..2dd5e04a
@@ -0,0 +1,4 @@
+require recipes-bsp/u-boot/u-boot-common.inc
+require recipes-bsp/u-boot/u-boot.inc
+
+SRCREV = "62e2ad1ceafbfdf2c44d3dc1b6efc81e768a96b9"
Signature · 1 line
2.30.2
author
#2 lore raw

PATCH 3/9 toolchain: remove pointless provides

In reply to Jon Mason

From: Ross Burton <[email protected]>

---
 .../external-arm-toolchain/gcc-aarch64-none-elf_12.2.rel1.bb    | 2 --
 .../external-arm-toolchain/gcc-arm-none-eabi_12.2.rel1.bb       | 2 --
 2 files changed, 4 deletions(-)
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_12.2.rel1.bb +0 -2
index b3b09bae..db8851eb 100644
@@ -11,8 +11,6 @@ LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
 LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=0aef214b835259b64f026f4ad00c703e"
 LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=7ba3bc8ef145b48e2756a844db2029a3"
 
-PROVIDES = "virtual/aarch64-none-elf-gcc"
-
 SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/arm-gnu-toolchain-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gcc-${HOST_ARCH}"
 SRC_URI[gcc-aarch64.sha256sum] = "570a9bd42e2067d79d59b0747891681ebec66f30d989d17a05856563fe38f78b"
 SRC_URI[gcc-x86_64.sha256sum] = "62d66e0ad7bd7f2a183d236ee301a5c73c737c886c7944aa4f39415aab528daf"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_12.2.rel1.bb +0 -2
index 948933b9..48ddd163 100644
@@ -11,8 +11,6 @@ LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only"
 LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=0aef214b835259b64f026f4ad00c703e"
 LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=7ba3bc8ef145b48e2756a844db2029a3"
 
-PROVIDES = "virtual/arm-none-eabi-gcc"
-
 SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/arm-gnu-toolchain-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gcc-${HOST_ARCH}"
 SRC_URI[gcc-aarch64.sha256sum] = "7ee332f7558a984e239e768a13aed86c6c3ac85c90b91d27f4ed38d7ec6b3e8c"
 SRC_URI[gcc-x86_64.sha256sum] = "84be93d0f9e96a15addd490b6e237f588c641c8afdf90e7610a628007fc96867"
Signature · 1 line
2.30.2
author
#3 lore raw

PATCH 4/9 arm-bsp/linux-yocto: fix Upstream-Status

In reply to Jon Mason

From: Ross Burton <[email protected]>

---
 .../files/corstone1000/0002-Add-external-system-driver.patch    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Add-external-system-driver.patch +1 -1
index b68edbc1..5af041ef 100644
@@ -7,7 +7,7 @@ Adds external system driver to control it
 from user-space. It provides run and reset
 functionality at the moment.
 
-Upstream-Status: Pending[Not submitted to upstream yet]
+Upstream-Status: Pending [Not submitted to upstream yet]
 Signed-off-by: Emekcan Aras <[email protected]>
 Signed-off-by: Rui Miguel Silva <[email protected]>
 ---
Signature · 1 line
2.30.2
author
#4 lore raw

PATCH 5/9 arm-bsp/conf: Remove hardcoded .rootfs from image path

In reply to Jon Mason

From: Ziad Elhanafy <[email protected]>

Remove hardcoded .rootfs from image path in:
1- fvp-common.inc
2- corstone1000-fvp.conf
3- corstone500.conf
4- fvp-baser-aemv8r64.conf

---
 meta-arm-bsp/conf/machine/corstone1000-fvp.conf   | 2 +-
 meta-arm-bsp/conf/machine/corstone500.conf        | 2 +-
 meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf | 2 +-
 meta-arm-bsp/conf/machine/include/fvp-common.inc  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
meta-arm-bsp/conf/machine/corstone1000-fvp.conf +1 -1
index 66236515..fffefc90 100644
@@ -32,7 +32,7 @@ FVP_CONFIG[se.nvm.update_raw_image] ?= "0"
 FVP_CONFIG[se.cryptocell.USER_OTP_FILTERING_DISABLE] ?= "1"
 
 # Boot image
-FVP_DATA ?= "board.flash0=${IMAGE_NAME}.rootfs.wic@0x68000000"
+FVP_DATA ?= "board.flash0=${IMAGE_NAME}.wic@0x68000000"
 
 # External system (cortex-M3)
 FVP_CONFIG[extsys_harness0.extsys_flashloader.fname] ?= "es_flashfw.bin"
meta-arm-bsp/conf/machine/corstone500.conf +1 -1
index 4794028a..9ded5c4a 100644
@@ -38,7 +38,7 @@ TEST_SUITES = "linuxboot"
 FVP_PROVIDER ?= "fvp-corstone500-native"
 FVP_EXE ?= "FVP_Corstone-500"
 FVP_CONFIG[board.flashloader0.fname] ?= "bl1.bin"
-FVP_DATA ?= "css.cluster.cpu0=${IMAGE_NAME}.rootfs.wic.nopt@0x80000000"
+FVP_DATA ?= "css.cluster.cpu0=${IMAGE_NAME}.wic.nopt@0x80000000"
 FVP_CONSOLE ?= "terminal_0"
 FVP_TERMINALS[css.terminal_0] ?= "console"
 FVP_TERMINALS[css.terminal_1] ?= ""
meta-arm-bsp/conf/machine/fvp-baser-aemv8r64.conf +1 -1
index 62c9cbd0..2c1391b3 100644
@@ -50,7 +50,7 @@ FVP_CONFIG[bp.virtio_net.hostbridge.userNetworking] ?= "1"
 FVP_CONFIG[bp.virtio_net.secure_accesses] = "1"
 FVP_CONFIG[bp.virtio_rng.enabled] ?= "1"
 FVP_CONFIG[bp.virtio_rng.secure_accesses] = "1"
-FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.rootfs.wic"
+FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic"
 FVP_CONFIG[bp.virtioblockdevice.secure_accesses] = "1"
 FVP_CONFIG[cache_state_modelled] ?= "0"
 FVP_CONFIG[cci400.force_on_from_start] = "1"
meta-arm-bsp/conf/machine/include/fvp-common.inc +1 -1
index 47b7ffce..b9b36a09 100644
@@ -35,7 +35,7 @@ FVP_CONFIG[bp.virtio_net.hostbridge.userNetPorts] = "8022=22"
 FVP_CONFIG[cache_state_modelled] ?= "0"
 FVP_CONFIG[bp.secureflashloader.fname] ?= "bl1-fvp.bin"
 FVP_CONFIG[bp.flashloader0.fname] ?= "fip-fvp.bin"
-FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.rootfs.wic"
+FVP_CONFIG[bp.virtioblockdevice.image_path] ?= "${IMAGE_NAME}.wic"
 # Set the baseline to ARMv8.4, as the default is 8.0.
 FVP_CONFIG[cluster0.has_arm_v8-4] = "1"
 FVP_CONFIG[cluster1.has_arm_v8-4] = "1"
Signature · 1 line
2.30.2
author
#5 lore raw

PATCH 6/9 arm/classes: Remove IMAGE_NAME_SUFFIX from image path

In reply to Jon Mason

From: Ziad Elhanafy <[email protected]>

Remove IMAGE_NAME_SUFFIX from image path in
wic_nopt.bblass

---
 meta-arm/classes/wic_nopt.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-arm/classes/wic_nopt.bbclass +1 -1
index 9c78fd77..529bf138 100644
@@ -6,4 +6,4 @@ IMAGE_TYPES:append = " wic.nopt"
 CONVERSIONTYPES += "nopt"
 
 # 1024 bytes are skipped which corresponds to the size of the partition table header to remove
-CONVERSION_CMD:nopt = "tail -c +1025 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} >  ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.nopt"
+CONVERSION_CMD:nopt = "tail -c +1025 ${IMAGE_NAME}.${type} >  ${IMAGE_NAME}.${type}.nopt"
Signature · 1 line
2.30.2
author
#6 lore raw

PATCH 7/9 arm/lib: Modify fvp.py to neglect fstype

In reply to Jon Mason

From: Ziad Elhanafy <[email protected]>

---
 meta-arm/lib/oeqa/controllers/fvp.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
meta-arm/lib/oeqa/controllers/fvp.py +11 -7
index 38484072..7e95ddf6 100644
@@ -14,16 +14,20 @@ class OEFVPSSHTarget(OESSHTarget):
     def __init__(self, logger, target_ip, server_ip, timeout=300, user='root',
                  port=None, dir_image=None, rootfs=None, bootlog=None, **kwargs):
         super().__init__(logger, target_ip, server_ip, timeout, user, port)
-        image_dir = pathlib.Path(dir_image)
-        # rootfs may have multiple extensions so we need to strip *all* suffixes
+        image_dir = pathlib.Path(dir_image)    
         basename = pathlib.Path(rootfs)
-        basename = basename.name.replace("".join(basename.suffixes), "")
-        self.fvpconf = image_dir / (basename + ".fvpconf")
+        basename = basename.name.replace("".join(basename.suffixes), "")       
+        # All .fvpconf configuration files
+        configs = image_dir.glob(basename + "*.fvpconf")
+        # Just the symbolic links
+        configs = [p for p in configs if p.is_file() and p.is_symlink()]
+        if not configs:
+            raise FileNotFoundError(f"Cannot find any .fvpconf in {image_dir}")
+        # Sorted by modification time
+        configs = sorted(configs, key=lambda p: p.stat().st_mtime)
+        self.fvpconf = configs[-1]
         self.bootlog = bootlog
 
-        if not self.fvpconf.exists():
-            raise FileNotFoundError(f"Cannot find {self.fvpconf}")
-
     def _after_start(self):
         pass
 
Signature · 1 line
2.30.2
author
#7 lore raw

PATCH 8/9 arm-bsp/machine: work around rootfs name issue

In reply to Jon Mason

Upstream change 26d97acc71379ab6702fa54a23b6542a3f51779c changed the IMAGE_LINK_NAME to have IMAGE_NAME_SUFFIX and breaks the automatic finding of the image by name. Work around here until upstream fix can be added.

---
 meta-arm-bsp/conf/machine/corstone500.conf         | 2 ++
 meta-arm-bsp/conf/machine/include/corstone1000.inc | 1 +
 meta-arm-bsp/conf/machine/include/tc.inc           | 1 +
 meta-arm-bsp/conf/machine/juno.conf                | 1 +
 4 files changed, 5 insertions(+)
meta-arm-bsp/conf/machine/corstone500.conf +2 -0
index 9ded5c4a..405d1f91 100644
@@ -45,3 +45,5 @@ FVP_TERMINALS[css.terminal_1] ?= ""
 
 # Disable openssl in kmod to shink the initramfs size
 PACKAGECONFIG:remove:pn-kmod = "openssl"
+
+IMAGE_NAME_SUFFIX = ""
meta-arm-bsp/conf/machine/include/corstone1000.inc +1 -0
index 198c7ec8..8a2e2a02 100644
@@ -57,6 +57,7 @@ INITRAMFS_IMAGE_BUNDLE ?= "1"
 
 #telling the build system which image is responsible of the generation of the initramfs rootfs
 INITRAMFS_IMAGE = "corstone1000-initramfs-image"
+IMAGE_NAME_SUFFIX = ""
 
 # add FF-A support in the kernel
 MACHINE_FEATURES += "arm-ffa"
meta-arm-bsp/conf/machine/include/tc.inc +1 -0
index 14ec7205..f6674ba4 100644
@@ -25,6 +25,7 @@ KERNEL_CLASSES = " kernel-fitimage "
 
 IMAGE_FSTYPES += "cpio.gz"
 INITRAMFS_IMAGE ?= "core-image-minimal"
+IMAGE_NAME_SUFFIX = ""
 
 SERIAL_CONSOLES = "115200;ttyAMA0"
 
meta-arm-bsp/conf/machine/juno.conf +1 -0
index 43d6b3e3..6c666efc 100644
@@ -27,3 +27,4 @@ UBOOT_MACHINE = "vexpress_aemv8a_juno_defconfig"
 
 INITRAMFS_IMAGE_BUNDLE ?= "1"
 INITRAMFS_IMAGE = "core-image-minimal"
+IMAGE_NAME_SUFFIX = ""
Signature · 1 line
2.30.2
author
#8 lore raw

PATCH 9/9 ci/clang: add llvm-native from clang README

In reply to Jon Mason

The following error is seen:
ERROR: Nothing PROVIDES 'llvm-native' (but virtual:native:/builds/jonmason00/meta-arm/work/build/../poky/meta/recipes-graphics/mesa/mesa_23.1.3.bb DEPENDS on or otherwise requires it). Close matches:
ovmf-native
rust-llvm-native
vim-native

Work around this by using the llvm-native from meta-clang

---
 ci/clang.yml | 6 ++++++
 1 file changed, 6 insertions(+)
ci/clang.yml +6 -0
index ecfd73b2..b9425fa7 100644
@@ -8,6 +8,12 @@ repos:
 local_conf_header:
   toolchain: |
     TOOLCHAIN = "clang"
+    PREFERRED_PROVIDER_llvm = "clang"
+    PREFERRED_PROVIDER_llvm-native = "clang-native"
+    PREFERRED_PROVIDER_nativesdk-llvm = "nativesdk-clang"
+    PROVIDES:pn-clang = "llvm"
+    PROVIDES:pn-clang-native = "llvm-native"
+    PROVIDES:pn-nativesdk-clang = "nativesdk-llvm"
     # This is needed to stop bitbake getting confused about what clang/llvm is
     # being used, see https://github.com/kraj/meta-clang/pull/766
     BBMASK += "/meta/recipes-devtools/llvm/llvm.*\.bb"
Signature · 1 line
2.30.2