diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2023-07-21 17:06:10 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2023-08-04 00:02:23 +0300 |
commit | 23e02799f2c379a4725b7dad4a071253cf9794a8 (patch) | |
tree | 27af205828952a2d5acf58eff14939179ea640c5 /meta-arm/kas | |
parent | 2c9842e3c4584e2d785a80c2d79732ed36273cf5 (diff) | |
download | openbmc-23e02799f2c379a4725b7dad4a071253cf9794a8.tar.xz |
subtree updates july 21 2023 pi,security,arm
meta-arm: d6fac49541..b4d50a273d:
Abdellatif El Khlifi (5):
arm-bsp/documentation: corstone1000: Update change log
arm-bsp/doc: corstone1000: Update the software architecture document
arm-bsp/documentation: corstone1000: update the release note
arm-bsp/documentation: corstone1000: update user guide
kas: set the SHAs for 2023.06 release
Jon Mason (7):
arm/optee-test: modify to use build openssl
arm/optee: update to 3.22.0
arm-bsp/machine: work around rootfs name issue
ci/clang: add llvm-native from clang README
arm/optee-os: update/clean-up patches and recipes
arm-bsp/juno: remove commented out KCONFIG
arm/linux-yocto: move 6.1 patches to a unique bbappend
Khem Raj (1):
gn: Disable warning as error but not disable completely
Mikko Rapeli (1):
optee-os optee-test: switch from SRC_URI:append to SRC_URI +=
Peter Hoyes (5):
runfvp: Add missing conffile include
arm/oeqa: Merge all OEFVP*Target classes
arm/OEFVPTarget: Add support for model state transitions
arm/oeqa: Convert linuxboot test case into fvp_boot
arm/oeqa: Introduce the fvp_devices test suite
Ross Burton (14):
CI: use Kas 3.3
CI: update to Kas format 14
CI: use branch, not refspec
CI: generate and use a Kas lock file
CI: add a tool to fetch a lockfile.yml for a specified build
arm/scp-firmware: set default SCP_PLATFORM to MACHINE
arm-bsp/scp-firmware: remove redundant SCP_PLATFORM
arm/scp-firware: update compiler variables
arm/scp-firmware: log what platform/firmware/type is being built
arm/scp-firmware: fix intermittent compile failures
CI: track master
arm-bsp/u-boot: add temporary 2023.01 recipe
toolchain: remove pointless provides
arm-bsp/linux-yocto: fix Upstream-Status
Rouven Czerwinski (3):
optee-os: add optional optee-os-ta package
optee-os: deploy ta elf files
optee-test: add TA elfs to deploydir
Tomás González (2):
arm-bsp/documentation: corstone1000: Update the user guide
arm-bsp/documentation: corstone1000: Update the release notes
Ziad Elhanafy (5):
arm-bsp/conf: Remove hardcoded .rootfs from image path
arm/classes: Remove IMAGE_NAME_SUFFIX from image path
arm: Set FVP EULA environment variable details message
kas: Add fvp-eula.yml and remove license related settings
arm-bsp/documentation: Replace FVP_BASE_R_ARM_EULA_ACCEPT with ARM_FVP_EULA_ACCEPT
meta-raspberrypi: dff85b9a9f..e3f733cadd:
Khem Raj (1):
linux-raspberrypi_6.1.bb: Update to 6.1.38
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Iebdd94d49998e9297e49ee2463761f2f3acb45c1
Diffstat (limited to 'meta-arm/kas')
-rw-r--r-- | meta-arm/kas/corstone1000-base.yml | 2 | ||||
-rw-r--r-- | meta-arm/kas/corstone1000-fvp.yml | 2 | ||||
-rw-r--r-- | meta-arm/kas/corstone500.yml | 3 | ||||
-rw-r--r-- | meta-arm/kas/fvp-baser-aemv8r64-bsp.yml | 6 | ||||
-rw-r--r-- | meta-arm/kas/fvp-eula.yml | 5 |
5 files changed, 12 insertions, 6 deletions
diff --git a/meta-arm/kas/corstone1000-base.yml b/meta-arm/kas/corstone1000-base.yml index 9cfe1a20a6..85706dc0f4 100644 --- a/meta-arm/kas/corstone1000-base.yml +++ b/meta-arm/kas/corstone1000-base.yml @@ -16,6 +16,7 @@ repos: poky: url: https://git.yoctoproject.org/git/poky + refspec: 31dd418207f6c95ef0aad589cd03cd2a4c9a8bf2 layers: meta: meta-poky: @@ -23,6 +24,7 @@ repos: meta-openembedded: url: https://git.openembedded.org/meta-openembedded + refspec: 5a01ab461c9bcabcbb2298236602373948f8f073 layers: meta-oe: meta-python: diff --git a/meta-arm/kas/corstone1000-fvp.yml b/meta-arm/kas/corstone1000-fvp.yml index d0d10a738f..7d23a53abc 100644 --- a/meta-arm/kas/corstone1000-fvp.yml +++ b/meta-arm/kas/corstone1000-fvp.yml @@ -2,6 +2,7 @@ header: version: 11 includes: - kas/corstone1000-base.yml + - kas/fvp-eula.yml machine: corstone1000-fvp @@ -10,7 +11,6 @@ local_conf_header: # Remove Dropbear SSH as it will not fit into the corstone1000 image. IMAGE_FEATURES:remove = " ssh-server-dropbear" INHERIT = " ${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'fvpboot', '', d)}" - LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA" target: - corstone1000-image diff --git a/meta-arm/kas/corstone500.yml b/meta-arm/kas/corstone500.yml index f1587b4461..d40b59df3a 100644 --- a/meta-arm/kas/corstone500.yml +++ b/meta-arm/kas/corstone500.yml @@ -1,5 +1,7 @@ header: version: 11 + includes: + - kas/fvp-eula.yml distro: poky-tiny @@ -38,7 +40,6 @@ local_conf_header: PACKAGECONFIG:append:pn-perf = " coresight" fvp-config: | IMAGE_CLASSES:append = " ${@bb.utils.contains('BUILD_ARCH', 'x86_64', 'fvpboot', '', d)}" - LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA" machine: corstone500 diff --git a/meta-arm/kas/fvp-baser-aemv8r64-bsp.yml b/meta-arm/kas/fvp-baser-aemv8r64-bsp.yml index dd175d03da..9f16a3f959 100644 --- a/meta-arm/kas/fvp-baser-aemv8r64-bsp.yml +++ b/meta-arm/kas/fvp-baser-aemv8r64-bsp.yml @@ -1,5 +1,7 @@ header: version: 9 + includes: + - kas/fvp-eula.yml distro: poky machine: fvp-baser-aemv8r64 @@ -24,9 +26,6 @@ repos: meta: meta-poky: -env: - FVP_BASE_R_ARM_EULA_ACCEPT: "False" - local_conf_header: base: | CONF_VERSION = "2" @@ -34,7 +33,6 @@ local_conf_header: PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl" EXTRA_IMAGE_FEATURES:append = " debug-tweaks ssh-server-openssh" CORE_IMAGE_EXTRA_INSTALL:append = " ssh-pregen-hostkeys" - LICENSE_FLAGS_ACCEPTED:append = " ${@oe.utils.vartrue('FVP_BASE_R_ARM_EULA_ACCEPT', 'Arm-FVP-EULA', '', d)}" IMAGE_CLASSES:append = " testimage" target: diff --git a/meta-arm/kas/fvp-eula.yml b/meta-arm/kas/fvp-eula.yml new file mode 100644 index 0000000000..ab1fae0e54 --- /dev/null +++ b/meta-arm/kas/fvp-eula.yml @@ -0,0 +1,5 @@ +header: + version: 13 + +env: + ARM_FVP_EULA_ACCEPT: |