diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef7cf19045..3d2c3e11e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,14 +9,10 @@ variables: CPU_REQUEST: "" # The default machine tag for the build jobs DEFAULT_TAG: "" - # The machine tag for the ACS test jobs - ACS_TAG: "$DEFAULT_TAG" # The directory to use as the persistent cache (the root for DL_DIR, SSTATE_DIR, etc) CACHE_DIR: $CI_BUILDS_DIR/persist # The container mirror to use MIRROR_GHCR: ghcr.io - # Whether to run the SystemReady ACS tests - ACS_TEST: 0 # The list of extra Kas fragments to be used when building EXTRA_KAS_FILES: "" # The NVD API key to use when fetching CVEs @@ -135,19 +131,6 @@ update-repos: # SECUREDEBUG: [none, secure-debug] # VIRT: [none, xen] -arm-systemready-ir-acs: - extends: .build - timeout: 12h - parallel: - matrix: - # arm-systemready-ir-acs must be specified after fvp-base for ordering - # purposes for the jobs-to-kas output. It is not enough to just have it - # in the job name because fvp-base.yml overwrites the target. - - PLATFORM: [fvp-base, corstone1000-fvp] - ARM_SYSTEMREADY_IR_ACS: arm-systemready-ir-acs - tags: - - ${ACS_TAG} - # Validate layers are Yocto Project Compatible check-layers: extends: .setup @@ -166,7 +149,6 @@ corstone1000-fvp: TESTING: [testimage, tftf] - FIRMWARE: none TESTING: testimage - - SYSTEMREADY_FIRMWARE: arm-systemready-firmware corstone1000-mps3: extends: .build @@ -208,7 +190,6 @@ fvp-base: TESTING: testimage - FIRMWARE: [u-boot, edk2] TESTING: testimage - - SYSTEMREADY_FIRMWARE: arm-systemready-firmware - KERNEL: linux-yocto-dev LATEST: latest-revisions TESTING: testimage diff --git a/ci/arm-systemready-firmware.yml b/ci/arm-systemready-firmware.yml deleted file mode 100644 index 4b9753708f..0000000000 --- a/ci/arm-systemready-firmware.yml +++ /dev/null @@ -1,6 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json - -header: - version: 11 - includes: - - kas/arm-systemready-firmware.yml diff --git a/ci/arm-systemready-ir-acs.yml b/ci/arm-systemready-ir-acs.yml deleted file mode 100644 index e31a264b37..0000000000 --- a/ci/arm-systemready-ir-acs.yml +++ /dev/null @@ -1,19 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/siemens/kas/master/kas/schema-kas.json - -header: - version: 11 - includes: - - kas/arm-systemready-ir-acs.yml - -env: - ACS_TEST: "0" - -local_conf_header: - testimage: | - TESTIMAGE_AUTO = "${ACS_TEST}" - -target: - - arm-systemready-ir-acs - - arm-systemready-linux-distros-debian - - arm-systemready-linux-distros-opensuse - - arm-systemready-linux-distros-fedora diff --git a/ci/cve.yml b/ci/cve.yml index d060d299ea..5ac2e41241 100644 --- a/ci/cve.yml +++ b/ci/cve.yml @@ -15,7 +15,6 @@ local_conf_header: CVE_CHECK_SHOW_WARNINGS:layer-arm-toolchain = "1" CVE_CHECK_SHOW_WARNINGS:layer-meta-arm = "1" CVE_CHECK_SHOW_WARNINGS:layer-meta-arm-bsp = "1" - CVE_CHECK_SHOW_WARNINGS:layer-meta-arm-systemready = "1" # Ignore the kernel, we sometime carry kernels in meta-arm CVE_CHECK_SHOW_WARNINGS:pn-linux-yocto = "0" diff --git a/kas/arm-systemready-firmware.yml b/kas/arm-systemready-firmware.yml deleted file mode 100644 index 8b0b9fd597..0000000000 --- a/kas/arm-systemready-firmware.yml +++ /dev/null @@ -1,12 +0,0 @@ -header: - version: 13 - -repos: - meta-arm: - layers: - meta-arm-systemready: - -distro: nodistro - -target: - - arm-systemready-firmware diff --git a/kas/arm-systemready-ir-acs.yml b/kas/arm-systemready-ir-acs.yml deleted file mode 100644 index aef3e71221..0000000000 --- a/kas/arm-systemready-ir-acs.yml +++ /dev/null @@ -1,12 +0,0 @@ -header: - version: 13 - includes: - - kas/arm-systemready-firmware.yml - -env: - TESTIMAGE_AUTO: "1" - # The full testimage run typically takes around 12-24h on fvp-base. - TEST_OVERALL_TIMEOUT: "${@ 24*60*60}" - -target: - - arm-systemready-ir-acs diff --git a/kas/arm-systemready-linux-distros-debian.yml b/kas/arm-systemready-linux-distros-debian.yml deleted file mode 100644 index a876d671a1..0000000000 --- a/kas/arm-systemready-linux-distros-debian.yml +++ /dev/null @@ -1,8 +0,0 @@ -header: - version: 13 - includes: - - kas/arm-systemready-firmware.yml - - kas/arm-systemready-linux-distros-unattended-installation.yml - -target: - - arm-systemready-linux-distros-debian diff --git a/kas/arm-systemready-linux-distros-fedora.yml b/kas/arm-systemready-linux-distros-fedora.yml deleted file mode 100644 index 2faa19cbaa..0000000000 --- a/kas/arm-systemready-linux-distros-fedora.yml +++ /dev/null @@ -1,8 +0,0 @@ -header: - version: 16 - includes: - - kas/arm-systemready-firmware.yml - - kas/arm-systemready-linux-distros-unattended-installation.yml - -target: - - arm-systemready-linux-distros-fedora diff --git a/kas/arm-systemready-linux-distros-opensuse.yml b/kas/arm-systemready-linux-distros-opensuse.yml deleted file mode 100644 index d2d75fa225..0000000000 --- a/kas/arm-systemready-linux-distros-opensuse.yml +++ /dev/null @@ -1,8 +0,0 @@ -header: - version: 13 - includes: - - kas/arm-systemready-firmware.yml - - kas/arm-systemready-linux-distros-unattended-installation.yml - -target: - - arm-systemready-linux-distros-opensuse diff --git a/kas/arm-systemready-linux-distros-unattended-installation.yml b/kas/arm-systemready-linux-distros-unattended-installation.yml deleted file mode 100644 index 7976186f13..0000000000 --- a/kas/arm-systemready-linux-distros-unattended-installation.yml +++ /dev/null @@ -1,11 +0,0 @@ -header: - version: 16 - -env: - DISTRO_UNATTENDED_INST_TESTS: - # The full testimage run typically takes around 12-24h on fvp-base. - TEST_OVERALL_TIMEOUT: "${@ 24*60*60}" - -local_conf_header: - systemready-unattended-inst: | - TESTIMAGE_AUTO = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "1", "", d)}" diff --git a/meta-arm-bsp/conf/layer.conf b/meta-arm-bsp/conf/layer.conf index a06d27d9ae..a4b348df3d 100644 --- a/meta-arm-bsp/conf/layer.conf +++ b/meta-arm-bsp/conf/layer.conf @@ -21,11 +21,6 @@ LAYERDEPENDS_meta-arm-bsp:append:musca-s1 = " meta-python" # Additional license directories. LICENSE_PATH += "${LAYERDIR}/custom-licenses" -BBFILES_DYNAMIC += " \ - meta-arm-systemready:${LAYERDIR}/dynamic-layers/meta-arm-systemready/*/*/*.bb \ - meta-arm-systemready:${LAYERDIR}/dynamic-layers/meta-arm-systemready/*/*/*.bbappend \ -" - WARN_QA:append:layer-meta-arm-bsp = " patch-status" addpylib ${LAYERDIR}/lib oeqa diff --git a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs-fvp-base.inc b/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs-fvp-base.inc deleted file mode 100644 index 83208770ff..0000000000 --- a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs-fvp-base.inc +++ /dev/null @@ -1,2 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files/${MACHINE}:" -SRC_URI:append = " file://report.txt" diff --git a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bbappend b/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bbappend deleted file mode 100644 index 397342f439..0000000000 --- a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bbappend +++ /dev/null @@ -1 +0,0 @@ -include arm-systemready-ir-acs-${MACHINE}.inc diff --git a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts-native-fvp-base.inc b/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts-native-fvp-base.inc deleted file mode 100644 index dc01d0a2fc..0000000000 --- a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts-native-fvp-base.inc +++ /dev/null @@ -1,5 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/files/fvp-base:" - -SRC_URI:append = " \ - file://0001-check-sr-results-Change-the-expected-SR-result-confi.patch \ -" diff --git a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts-native.bbappend b/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts-native.bbappend deleted file mode 100644 index 49c01ee96e..0000000000 --- a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts-native.bbappend +++ /dev/null @@ -1 +0,0 @@ -include arm-systemready-scripts-native-${MACHINE}.inc diff --git a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/files/fvp-base/0001-check-sr-results-Change-the-expected-SR-result-confi.patch b/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/files/fvp-base/0001-check-sr-results-Change-the-expected-SR-result-confi.patch deleted file mode 100644 index d2226cb133..0000000000 --- a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/files/fvp-base/0001-check-sr-results-Change-the-expected-SR-result-confi.patch +++ /dev/null @@ -1,227 +0,0 @@ -From e3e0465a25f9b1607b2e5ed42afb7b556aa8b9bc Mon Sep 17 00:00:00 2001 -From: Debbie Martin -Date: Wed, 4 Oct 2023 18:40:18 +0100 -Subject: [PATCH] [PATCH] check-sr-results: Change the expected SR result - config - -Update the check-sr-results.yaml and format-sr-results.yaml files for the -Systemready IR suite. These changes are required because of the -following known differences of fvp-base outputs to those expected by the -SystemReady scripts. - -Changes to check-sr-results.yaml: - 1. acs-console.log: - a. must-have-esp: EFI partition/variable persistence not supported due to - FVP reset. - b. warn-once-if-contains "-dirty": BL1, BL2, and BL31 have dirty versions. - c. must-contain "efi: ESRT=0x" and "'esrt: Reserving ESRT space from 0x'": - Capsule updates are not supported. - d. error-if-contains: "No EFI system partition" and "Failed to persist - EFI variables": EFI partition/variable persistence not supported due to - FVP reset. - 2. acs_results/result.md: - a. must-contain "Failure: |0|": Capsule and EFI partition failures make - the total 20. - 3. acs_results/CapsuleApp_ESRT_table_info.log: - a. capsuleapp-esrt: Capsule updates are not supported. - b. must-contain "'EFI_SYSTEM_RESOURCE_TABLE:'" and - "EFI_SYSTEM_RESOURCE_ENTRY": EFI partition/variable persistence not - supported due to FVP reset. - c. must-contain "FwClass": Capsule updates are not supported. - d. error-if-contains "ESRT - Not Found": Capsule updates are not - supported. - 4. acs_results/CapsuleApp_FMP_protocol_info.log: - a. warn-if-contains "Aborted test": Capsule updates are not supported. - This patch also adds must-contain for the specific totals of the test - categories due to allowing the "Aborted test" string. - 5. acs_results/linux_dump/firmware/efi/esrt: - a. Remove whole directory because capsule updates are not supported. - 6. acs_results/uefi/temp: - a. Set min-entries to 0: this defaults to 1 despite the directory being - optional, so errors if a directory is empty. - 7. acs_results/uefi_dump: - a. min-entries is 13: change this to 11 due to smbiosview.log being - optional and the change to make map.log optional. - 8. acs_results/uefi_dump/dh.log: - a. must-contain "EFISystemPartition": EFI partition/variable persistence - not supported due to FVP reset. - b. must-contain "FirmwareManagement": Capsule updates are not supported. - 9. acs_results/uefi_dump/map.log: - a. Make optional because it isn't populated for IR. - 10. fw: - a. Make optional because capsule updates are not supported. - 11. os-logs: - a. Make optional because distro installation isn't done as part of ACS. - -Changes to format-sr-results.yaml: - 1. Remove the SIE section (not supported on fvp-base and, if present, causes - format-sr-results.py to error). - -Upstream-Status: Inappropriate -Signed-off-by: Debbie Martin ---- - check-sr-results.yaml | 34 ++++++++++++++-------------------- - format-sr-results.yaml | 15 --------------- - 2 files changed, 14 insertions(+), 35 deletions(-) - -diff --git a/check-sr-results.yaml b/check-sr-results.yaml -index a4235de..555fb71 100644 ---- a/check-sr-results.yaml -+++ b/check-sr-results.yaml -@@ -10,7 +10,6 @@ check-sr-results-configuration: - # The following tree applies to all ACS-IR 2.0 versions. - tree: - - file: acs-console.log -- must-have-esp: - must-contain: - - Booting `bbr/bsa' - - Press any key to stop the EFI SCT running -@@ -24,8 +23,6 @@ tree: - - 'EFI stub: Booting Linux Kernel...' - - 'EFI stub: Using DTB from configuration table' - - Linux version -- - 'efi: ESRT=0x' -- - 'esrt: Reserving ESRT space from 0x' - - systemd - - Executing FWTS for EBBR - - 'Test: UEFI' -@@ -36,13 +33,9 @@ tree: - - ACS run is completed - - Please press to continue ... - warn-once-if-contains: -- - -dirty - - 'EFI stub: ERROR:' - - 'FIRMWARE BUG:' - - OVERLAP DETECTED -- error-if-contains: -- - No EFI system partition -- - Failed to persist EFI variables - - dir: acs_results - min-entries: 8 # Allow missing result.md - max-entries: 9 -@@ -53,7 +46,7 @@ tree: - must-contain: - - SCT Summary - - Dropped:|0| -- - Failure:|0| -+ - Failure:|20| - - Warning:|0| - - Dropped by group - - Failure by group -@@ -64,16 +57,11 @@ tree: - max-entries: 2 - tree: - - file: CapsuleApp_ESRT_table_info.log -- capsuleapp-esrt: - must-contain: - - ESRT TABLE -- - 'EFI_SYSTEM_RESOURCE_TABLE:' -- - EFI_SYSTEM_RESOURCE_ENTRY -- - FwClass - error-if-contains: - - FwResourceCount - 0x0 - - FwResourceCountMax - 0x0 -- - ESRT - Not Found - - file: CapsuleApp_FMP_protocol_info.log - must-contain: - - FMP DATA -@@ -95,9 +83,14 @@ tree: - - 'Medium failures: NONE' - - 'Low failures: NONE' - - 'Other failures: NONE' -+ - 'dt_base | 3| | | | | |' -+ - 'esrt | | | 2| | | |' -+ - 'uefibootpath | | | | | | |' -+ - 'uefirtmisc | 1| | | | 8| |' -+ - 'uefirttime | 4| | | | 35| |' -+ - 'uefirtvariable | 2| | | | 10| |' -+ - 'uefivarinfo | | | | | 1| |' - - 'Total:' -- warn-if-contains: -- - Aborted test - error-if-contains: - - FAILED - - This is an invalid entry. -@@ -180,6 +173,7 @@ tree: - tree: - - file: OsIndicationsSupported-* - - dir: esrt -+ optional: - tree: - - dir: entries - tree: -@@ -314,8 +308,9 @@ tree: - - BSA tests complete. Reset the system. - - dir: temp # This sometimes remains; ignore it - optional: -+ min-entries: 0 - - dir: uefi_dump -- min-entries: 13 -+ min-entries: 11 - max-entries: 13 - tree: - - file: bcfg.log -@@ -331,8 +326,6 @@ tree: - must-contain: - - Handle dump - - DevicePath -- - EFISystemPartition -- - FirmwareManagement - - SimpleTextOut - - file: dmem.log - must-contain: -@@ -355,6 +348,7 @@ tree: - - DRIVER NAME - - file: ifconfig.log - - file: map.log -+ optional: - must-contain: - - Mapping table - - /HD(1,GPT, -@@ -392,7 +386,7 @@ tree: - - dir: docs - optional: - - dir: fw -- min-entries: 3 -+ optional: - tree: - - file: u-boot-sniff.log - must-contain: -@@ -500,7 +494,7 @@ tree: - - dir: manual-results - optional: - - dir: os-logs -- min-entries: 2 -+ optional: - tree: - - file: 'OS-image-download-links.txt' - optional: -diff --git a/format-sr-results.yaml b/format-sr-results.yaml -index dd34cd6..20b69de 100644 ---- a/format-sr-results.yaml -+++ b/format-sr-results.yaml -@@ -47,21 +47,6 @@ subs: - extract: - filename: "acs_results/linux_dump/firmware/devicetree/base/psci/\ - compatible" -- - heading: BBSR Compliance -- paragraph: TBD -- subs: -- - heading: SIE SCT -- extract: -- filename: acs_results/SIE/result.md -- find: '# SCT Summary' -- first-line: 4 -- last-line: -- paragraph: TBD -- - heading: SIE FWTS -- extract: -- filename: acs_results/SIE/fwts/FWTSResults.log -- find: Test Failure Summary -- paragraph: TBD - - heading: BSA Compliance (informative) - paragraph: TBD - subs: --- -2.25.1 - diff --git a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/files/fvp-base/report.txt b/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/files/fvp-base/report.txt deleted file mode 100644 index f4363b7092..0000000000 --- a/meta-arm-bsp/dynamic-layers/meta-arm-systemready/recipes-test/arm-systemready-acs/files/fvp-base/report.txt +++ /dev/null @@ -1,34 +0,0 @@ -General information -------------------- -- Arm SystemReady Band: IR -- System name: FVP Base A AEM -- Prepared by: -- E-mail: -- Date: - -System information ------------------- -- Company: Arm -- System: FVP Base A AEM -- SoC: -- FW version: -- Memory: -- Storage devices / disks: -- Network controllers: -- Other Hardware information: - -Test Logs and Results ---------------------- -- ACS version used: 2.0 -- ACS URL (if pre-built binary): https://github.com/ARM-software/arm-systemready/blob/v23.03_IR_2.0.0/IR/prebuilt_images/v23.03_2.0.0/ir-acs-live-image-generic-arm64.wic.xz -- Changes to ACS (if built from source): - -- Test Logs collected -[X] ACS - SCT -[X] ACS - BSA - UEFI -[X] ACS - BSA - Linux -[X] ACS - FWTS -[X] ACS - Linux boot log -[X] ACS - Linux dumps -[X] ACS - UEFI Shell dumps -[ ] ACS - Capsule Update diff --git a/meta-arm-systemready/README.md b/meta-arm-systemready/README.md deleted file mode 100644 index 73cd188dd6..0000000000 --- a/meta-arm-systemready/README.md +++ /dev/null @@ -1,148 +0,0 @@ -# meta-arm-systemready Yocto Layer - -This layer contains classes and recipes for building and running -[Arm SystemReady][] validation on the supported machines. - -Information regarding contributing, reporting bugs, etc can be found in the -top-level meta-arm [README.md](../README.md) file. - -## Introduction - -This layer provides support for the following on supported machines: - -* Building the firmware for the [Arm SystemReady][] certification program -* Running [Arm SystemReady ACS][] (Architecture Compliance Suite) tests -* Running Linux distributions installation tests - -This layer is designed to work alongside with a BSP layer. For example, the -[`meta-arm-bsp`][] layer in the top-level meta-arm defines the -[`fvp-base`][] machine, which can be used with the recipes provided by this -layer to build the firmware, run the [Arm SystemReady IR][] ACS tests, and -run Linux distributions installation. **Note** that users can use this layer -with their BSP layer to perform the same build and tests. - -### Firmware Build - -The `arm-systemready-firmware.bb` recipe is to build the firmware. It requires -the `ARM_SYSTEMREADY_FIRMWARE` variable set at the MACHINE configuration level -to list the build dependencies. - -### ACS Tests - -The recipe to run the ACS tests fetches and deploys the prebuilt ACS test suite -disk image, and generates the necessary metadata to support executing the test -suite using the bitbake `testimage` task. A test case `SystemReadyACSTest` is -introduced in `lib/oeqa/runtime/cases` to monitor the ACS tests output from the -bitbake `testimage` task. The `ARM_SYSTEMREADY_ACS_CONSOLE` variable must be set -at the MACHINE configuration level for this test case. - -There are two additional recipes for generating the Arm SystemReady ACS tests -report files through the use of the [EDK2 SCT Results Parser][] and the -[Arm SystemReady scripts][]. These packages are installed in the -`edk2-test-parser-native.bb` and `arm-systemready-scripts-native.bb` recipes -respectively. - -The class `arm-systemready-acs.bbclass` implements the common logic to deploy -the Arm SystemReady ACS prebuilt image and set up the `testimage` environment. -This class also contains a `testimage` `"postfunc"` called `acs_logs_handle` -which generates report files and analyzes the test results. - -The test result analysis is performed by first using the EDK2 SCT Results -Parser to create a results.md file, then running the Arm SystemReady result -check script to check the contents of the result partition as well as the -console log. The result check will fail if any of the expected files or -directories are missing, or if any file's contents do not pass its file-specific -checks. - -The ACS test results which are checked by the script can be viewed in -`${TMPDIR}/work/aarch64-oe-linux/arm-systemready-ir-acs/2.0.0-r0/testimage/`. If -the check fails, the bitbake `testimage` task will fail. - - -### Linux Distributions Installation - -Recipes for testing the installation of Linux distributions are provided under -`recipes-test/arm-systemready-linux-distros`. These recipes help to download the -installation CD for the Linux distribution and generate an empty disk as the -target disk for the installation. - -## Supported Band and Machine - -Arm SystemReady has four bands: -* [Arm SystemReady SR][] -* [Arm SystemReady ES][] -* [Arm SystemReady IR][] -* [Arm SystemReady LS][] - -Currently, this layer only supports -[Arm SystemReady IR ACS version v23.03_2.0.0][], which is verified on the -[`fvp-base`][] machine. - -## Build and Run - -To build the firmware for Arm SystemReady on the supported machines (take the -`fvp-base` machine as an example): - - ARM_FVP_EULA_ACCEPT=1 kas build kas/fvp-base.yml:kas/arm-systemready-firmware.yml - - -To run the Arm SystemReady ACS tests on the supported machines (take running -Arm SystemReady IR on the `fvp-base` machine as an example): - - ARM_FVP_EULA_ACCEPT=1 kas build kas/fvp-base.yml:kas/arm-systemready-ir-acs.yml - -To run the Linux distributions installation on the supported machines (take -installing openSUSE on the `fvp-base` machine as an example): - - ARM_FVP_EULA_ACCEPT=1 kas build kas/fvp-base.yml:kas/arm-systemready-linux-distros-opensuse.yml - - kas shell \ - kas/fvp-base.yml:kas/arm-systemready-linux-distros-opensuse.yml \ - -c "../scripts/runfvp --verbose --console" - -## Guidelines for Reusing and Extending - -Currently, this layer only supports the Arm SystemReady IR band running on the -`fvp-base` machine defined in the `meta-arm-bsp` layer. The supported Arm -SystemReady IR implementation can be reused on other machines. Furthermore, the -current implementation can be further extended to support SR, ES and LS bands. - -### Reuse - -To reuse the supported Arm SystemReady IR on other machines, you will need to: - -1. Set the `ARM_SYSTEMREADY_FIRMWARE` variable at the MACHINE configuration - level to list the build dependencies. The configuration file of the - [`fvp-base`][] machine can be used as a reference. -2. Set the `ARM_SYSTEMREADY_ACS_CONSOLE` variable at the MACHINE configuration - level for running the ACS tests in the bitbake `testimage` task. Also refer - to the configuration file of the [`fvp-base`][] machine. - -### Extend - -To extend support for other bands, you will need to: - -1. Add a new recipe to inherit `arm-systemready-acs.bbclass`. You can use - [`arm-systemready-ir-acs.bb`][] as a reference. -2. Add a new `testimage` test case for the newly added band. Refer to - [`arm_systemready_ir_acs.py`][]. -3. Set the necessary variables and prepare the ACS baseline files (as listed in - the above **Reuse** section) at the MACHINE configuration level from the BSP - layer for the machine to be supported. - -**Note**: When reusing and extending, the current classes and libs may need to -be modified or refactored as necessary. - -[Arm SystemReady]: https://www.arm.com/architecture/system-architectures/systemready-certification-program -[Arm SystemReady ACS]: https://github.com/ARM-software/arm-systemready -[Arm SystemReady SR]: https://www.arm.com/architecture/system-architectures/systemready-certification-program/sr -[Arm SystemReady ES]: https://www.arm.com/architecture/system-architectures/systemready-certification-program/es -[Arm SystemReady IR]: https://www.arm.com/architecture/system-architectures/systemready-certification-program/ir -[Arm SystemReady LS]: https://www.arm.com/architecture/system-architectures/systemready-certification-program/ls -[Arm SystemReady IR ACS version v23.03_2.0.0]: https://github.com/ARM-software/arm-systemready/tree/main/IR/prebuilt_images/v23.03_2.0.0 -[Arm SystemReady scripts]: https://gitlab.arm.com/systemready/systemready-scripts -[EDK2 SCT Results Parser]: https://gitlab.arm.com/systemready/edk2-test-parser -[`arm-systemready-ir-acs.bb`]: recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb -[`arm_systemready_ir_acs.py`]: lib/oeqa/runtime/cases/arm_systemready_ir_acs.py -[`meta-arm-bsp`]: ../meta-arm-bsp -[`fvp-base`]: ../meta-arm-bsp/conf/machine/fvp-base.conf diff --git a/meta-arm-systemready/classes/arm-systemready-acs.bbclass b/meta-arm-systemready/classes/arm-systemready-acs.bbclass deleted file mode 100644 index d817b69321..0000000000 --- a/meta-arm-systemready/classes/arm-systemready-acs.bbclass +++ /dev/null @@ -1,162 +0,0 @@ -# This class contains the common logic to deploy the SystemReady ACS pre-built -# image and set up the testimage environment. It is to be inherited by recipes -# which contains the URI to download the SystemReady ACS image. -# This class also contains a testimage "postfunc" called acs_logs_handle which -# performs the following functions after the tests have completed: -# * Extract the acs_results directory from the Wic image to -# ${WORKDIR}/testimage -# * Create a symlink to the acs_results in ${TMPDIR}/log/oeqa for ease of -# access -# * Run the test parser, format results, and check results routines - -INHIBIT_DEFAULT_DEPS = "1" -COMPATIBLE_HOST = "aarch64-*" -PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit nopackages deploy rootfs-postcommands ${IMAGE_CLASSES} python3native testimage - -do_configure[noexec] = "1" -do_compile[noexec] = "1" -do_install[noexec] = "1" - -# Deploy with this suffix so it is picked up in the machine configuration -IMAGE_DEPLOY_SUFFIX ?= ".wic" - -# Post-process commands may write to IMGDEPLOYDIR -IMGDEPLOYDIR = "${DEPLOYDIR}" -# Write the test data in IMAGE_POSTPROCESS_COMMAND -IMAGE_POSTPROCESS_COMMAND += "write_image_test_data; " - -python do_deploy() { - deploydir = d.getVar('DEPLOYDIR') - suffix = d.getVar('IMAGE_DEPLOY_SUFFIX') - imgfile = os.path.join(d.getVar('UNPACKDIR'), d.getVar('IMAGE_FILENAME')) - deployfile = os.path.join(deploydir, d.getVar('IMAGE_NAME') + suffix) - linkfile = os.path.join(deploydir, d.getVar('IMAGE_LINK_NAME') + suffix) - - # Install the image file in the deploy directory - import shutil - shutil.copyfile(imgfile, deployfile) - if os.path.lexists(linkfile): - os.remove(manifest_link) - os.symlink(os.path.basename(deployfile), linkfile) - - # Run the image post-process commands - from oe.utils import execute_pre_post_process - post_process_cmds = d.getVar("IMAGE_POSTPROCESS_COMMAND") - execute_pre_post_process(d, post_process_cmds) - - # Copy the report.txt to DEPLOYDIR - # The machine-specific implementation can optionally put the report file in - # ${UNPACKDIR}/report.txt. If there is no such file present, use the template. - unpackdir = d.getVar('UNPACKDIR') - report_file = os.path.join(unpackdir, "report.txt") - report_file_dest = os.path.join(deploydir, "report.txt") - if os.path.exists(report_file): - report_file_to_copy = report_file - else: - report_file_to_copy = os.path.join(unpackdir, "systemready-ir-template", - "report.txt") - shutil.copyfile(report_file_to_copy, report_file_dest) - - # Ensure an empty rootfs manifest exists (required by testimage) - fname = os.path.join(deploydir, d.getVar('IMAGE_LINK_NAME') + ".manifest") - open(fname, 'w').close() -} -addtask deploy after do_install before do_image_complete - -do_image_complete() { - true -} -addtask image_complete after do_deploy before do_build -do_image_complete[depends] += "arm-systemready-firmware:do_image_complete" - -ACS_LOG_NAME = "acs_results_${DATETIME}" -ACS_LOG_NAME[vardepsexclude] += "DATETIME" -ACS_LOG_DIR = "${TEST_LOG_DIR}/${ACS_LOG_NAME}" -ACS_LOG_LINK = "${TEST_LOG_DIR}/acs_results" -TEST_LOG_DIR = "${WORKDIR}/testimage" -RM_WORK_EXCLUDE_ITEMS += "${@ os.path.basename(d.getVar('TEST_LOG_DIR')) }" - -do_testimage[postfuncs] += "acs_logs_handle" -do_testimage[depends] += "edk2-test-parser-native:do_populate_sysroot \ - arm-systemready-scripts-native:do_populate_sysroot \ - mtools-native:do_populate_sysroot \ - parted-native:do_populate_sysroot" - -# Process the logs -python acs_logs_handle() { - import logging - from oeqa.utils import make_logger_bitbake_compatible, get_json_result_dir - import shutil - - deploy_dir_image = d.getVar('DEPLOY_DIR_IMAGE') - systemready_scripts_dir = os.path.join(d.getVar('STAGING_LIBDIR_NATIVE'), - "systemready_scripts") - edk2_test_parser_dir = os.path.join(d.getVar('STAGING_LIBDIR_NATIVE'), - "edk2_test_parser") - deployfile = os.path.join(deploy_dir_image, d.getVar('IMAGE_LINK_NAME') - + d.getVar('IMAGE_DEPLOY_SUFFIX')) - - testimage_dir = d.getVar('TEST_LOG_DIR') - logdir = d.getVar('ACS_LOG_DIR') - loglink = d.getVar('ACS_LOG_LINK') - - # Copy the report.txt file from DEPLOY_DIR_IMAGE - report_file = os.path.join(deploy_dir_image, "report.txt") - report_file_dest = os.path.join(testimage_dir, "report.txt") - shutil.copyfile(report_file, report_file_dest) - - # Extract the log files from the Wic image to the testimage logs directory - resultspath = deployfile + ':3/acs_results' - import subprocess - subprocess.run(['wic', 'cp', resultspath, logdir], check=True) - - # Create a symlink to the acs_results directory - if os.path.lexists(loglink): - os.remove(loglink) - os.symlink(os.path.basename(logdir), loglink) - - # Create a top-level symlink to the acs_results directory - top_logdir = os.path.join(get_json_result_dir(d), d.getVar("PN")) - log_name = d.getVar('ACS_LOG_NAME') - top_link = os.path.join(top_logdir, log_name) - log_target = os.path.relpath(logdir, top_logdir) - os.symlink(log_target, top_link) - - # Parse the logs and generate results file - logger = make_logger_bitbake_compatible(logging.getLogger("BitBake")) - - sct_log = os.path.join(logdir, 'sct_results', 'Overall', 'Summary.ekl') - sct_seq = os.path.join(logdir, 'sct_results', 'Sequence', 'EBBR.seq') - - parser_path = os.path.join(edk2_test_parser_dir, "parser.py") - # format-sr-results.py needs the output file to be called "result.md" - subprocess.run([parser_path, sct_log, sct_seq, "--md", - os.path.join(logdir, "result.md")], check=True) - - scripts_path = os.path.join(systemready_scripts_dir, - "format-sr-results.py") - summary_path = os.path.join(testimage_dir, "summary.md") - subprocess.run([scripts_path, "--dir", testimage_dir, "--md", summary_path], - check=True) - - # Symlink acs-console.log to default_log - subprocess.run(["ln", "-sf", os.path.join(testimage_dir, "default_log"), - os.path.join(testimage_dir, "acs-console.log")], check=True) - - # Run the check-sr-results.py systemready script to check the results - check_sr_results_log_path = os.path.join(testimage_dir, - "check_sr_results.log") - with open(check_sr_results_log_path, "w") as f: - check_sr_results_path = os.path.join(systemready_scripts_dir, - "check-sr-results.py") - try: - subprocess.run([check_sr_results_path, "--dir", testimage_dir, - "--print-meta", "--debug"], - stdout=f, stderr=f, text=True, check=True) - except subprocess.CalledProcessError: - logger.error(f"ACS run failed the check SystemReady results. See " - f"{summary_path} and {check_sr_results_log_path} for " - f"details of the error.") - raise bb.BBHandledException() -} diff --git a/meta-arm-systemready/classes/extra_imagedepends_only.bbclass b/meta-arm-systemready/classes/extra_imagedepends_only.bbclass deleted file mode 100644 index 224b724e72..0000000000 --- a/meta-arm-systemready/classes/extra_imagedepends_only.bbclass +++ /dev/null @@ -1,27 +0,0 @@ -# This class is to be inherited by recipes interested in only deploying what is -# listed in the EXTRA_IMAGEDEPENDS. -# It is inheriting the image.bbclass to make sure that the -# image_license.manifest is generated. - -IMAGE_FSTYPES = "" - -inherit image - -IMAGE_FEATURES = "" -EXTRA_IMAGE_FEATURES = "" - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "" -RDEPENDS = "" -RRECOMMENDS = "" - -deltask do_prepare_recipe_sysroot -deltask do_flush_pseudodb -deltask do_image_qa -do_rootfs[depends] = "" -do_rootfs[noexec] = "1" -do_image[noexec] = "1" -do_image_complete[noexec] = "1" -do_build[depends] = "" - -IMAGE_CLASSES:remove = "create-spdx-image-3.0" diff --git a/meta-arm-systemready/conf/layer.conf b/meta-arm-systemready/conf/layer.conf deleted file mode 100644 index 5616a3aaf7..0000000000 --- a/meta-arm-systemready/conf/layer.conf +++ /dev/null @@ -1,15 +0,0 @@ -# We have a conf and classes directory, add to BBPATH -BBPATH .= ":${LAYERDIR}" - -# We have recipes-* directories, add to BBFILES -BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ - ${LAYERDIR}/recipes-*/*/*.bbappend" - -BBFILE_COLLECTIONS += "meta-arm-systemready" -BBFILE_PATTERN_meta-arm-systemready = "^${LAYERDIR}/" - -LAYERSERIES_COMPAT_meta-arm-systemready = "walnascar whinlatter" - -LAYERDEPENDS_meta-arm-systemready = "core" - -addpylib ${LAYERDIR}/lib oeqa diff --git a/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_debian_unattended.py b/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_debian_unattended.py deleted file mode 100644 index 3c3a2a48db..0000000000 --- a/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_debian_unattended.py +++ /dev/null @@ -1,66 +0,0 @@ -from oeqa.runtime.case import OERuntimeTestCase - - -class SystemReadyDebianUnattendedTest(OERuntimeTestCase): - def setUp(self): - super().setUp() - self.console = self.target.DEFAULT_CONSOLE - - def test_debian_unattended(self): - # Turn on the FVP. - self.target.transition('on') - - # Timeout value = elapsed time * 2; where elapsed time was collected - # from the elapsed time in the log.do_testimage for each function after - # the build is finished on the development machine. - self.target.expect(self.console, - r'.*Scanning installation', - timeout=(20 * 60)) - bb.plain('Installation status: Scanning installation media...') - - self.target.expect(self.console, - r'.*Detecting network hardware', - timeout=(35 * 60)) - bb.plain('Installation status: Detecting network hardware...') - - self.target.expect(self.console, - r'.*Installing the base system', - timeout=(35 * 60)) - bb.plain('Installation status: Installing the base system...') - - self.target.expect(self.console, - r'.*Installing GRUB', - timeout=(7 * 60 * 60)) - bb.plain('Installation status: Installing GRUB...') - - # Waiting to respond to the boot loader prompt error message. - self.target.expect(self.console, - r'.*Press enter to continue', - timeout=(15 * 60)) - self.target.sendline(self.console, '') - - self.target.expect(self.console, - r'.*Press enter to continue', - timeout=(60)) - self.target.sendline(self.console, '') - - # Waiting to respond continue without bootloader to install - # bootloader with the late script in preseed.cfg at the end. - self.target.expect(self.console, - r'.*Continue without boot loader', - timeout=(2 * 60)) - self.target.sendline(self.console, '14') - - self.target.expect(self.console, - r'.*Press enter to continue', - timeout=(60)) - self.target.sendline(self.console, '') - - self.target.expect(self.console, - r'.*Finishing the installation', - timeout=(2 * 60)) - bb.plain('Installation status: Finishing the installation...') - - # Waiting till the installation is finished. - self.target.expect(self.console, r'.*login:', timeout=(40 * 60)) - bb.plain('Installation status: Debian installation finished successfully.') diff --git a/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_fedora_unattended.py b/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_fedora_unattended.py deleted file mode 100644 index f607fb1271..0000000000 --- a/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_fedora_unattended.py +++ /dev/null @@ -1,39 +0,0 @@ -from oeqa.runtime.case import OERuntimeTestCase - - -class SystemReadyFedoraUnattendedTest(OERuntimeTestCase): - def setUp(self): - super().setUp() - self.console = self.target.DEFAULT_CONSOLE - - def test_fedora_unattended(self): - # Turn on the FVP. - self.target.transition('on') - - # Timeout value = elapsed time * 2; where elapsed time was collected - # from the elapsed time in the log.do_testimage for each function after - # the build is finished on the development machine. - self.target.expect(self.console, - ' Booting `Install Fedora 39\'', - timeout=(2 * 60)) - bb.plain('Installation status: Loading the installer, kernel and initrd...') - - self.target.expect(self.console, - 'Setting up the installation environment', - timeout=(2 * 60 * 60)) - bb.plain('Installation status: Setting up the installation environment...') - - self.target.expect(self.console, - 'Installing the software', - timeout=(30 * 60)) - bb.plain('Installation status: Installing the software packages...') - - # Waiting to respond to the boot loader prompt error message. - self.target.expect(self.console, - 'Please respond \'yes\' or \'no\': ', - timeout=(16 * 60 * 60)) - self.target.sendline(self.console, 'yes') - - # Waiting till the installation is finished. - self.target.expect(self.console, r'.*login: ', timeout=(5 * 60 * 60)) - bb.plain('Installation status: Fedora installation finished successfully.') diff --git a/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_ir_acs.py b/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_ir_acs.py deleted file mode 100644 index 518d1aa269..0000000000 --- a/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_ir_acs.py +++ /dev/null @@ -1,37 +0,0 @@ -from oeqa.runtime.case import OERuntimeTestCase - - -class SystemReadyACSTest(OERuntimeTestCase): - def setUp(self): - self.console = self.td.get('ARM_SYSTEMREADY_ACS_CONSOLE') - self.assertNotEqual(self.console, '', - msg='ARM_SYSTEMREADY_ACS_CONSOLE is not set') - - def test_acs(self): - """ - The purpose of this test case is to detect any issues with the ACS - tests themselves. The intention is to fail only if there is an issue - running the tests, not if an ACS test fails - """ - self.target.transition('on') - # The tests finish on a root shell - test_patterns = [r'([a-zA-Z0-9_ ]+): \[([a-zA-Z_ ]+)\]', - 'ACS run is completed'] # Signifies successful completion - - while True: - match_id = self.target.expect(self.console, test_patterns, - timeout=10*60*60) - if match_id == 0: - # A test group's result has been printed - matches = self.target.match(self.console) - group_name = matches[1].decode().strip() - status = matches[2].decode().strip() - self.logger.info(f'Test Group ({group_name}): {status}') - elif match_id == 1: - break - - # Workaround to ensure the model syncs the log files to disk - self.target.sendline(self.console, r'sync /mnt') - self.target.expect(self.console, r'root@generic-arm64:~#') - - self.logger.info('Linux tests complete') diff --git a/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_opensuse_unattended.py b/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_opensuse_unattended.py deleted file mode 100644 index aea8df3e10..0000000000 --- a/meta-arm-systemready/lib/oeqa/runtime/cases/arm_systemready_opensuse_unattended.py +++ /dev/null @@ -1,42 +0,0 @@ -from oeqa.runtime.case import OERuntimeTestCase - -class SystemReadyOpenSUSEUnattendedTest(OERuntimeTestCase): - def setUp(self): - super().setUp() - self.console = self.target.DEFAULT_CONSOLE - - def test_opensuse_unattended(self): - # Turn on the FVP. - self.target.transition('on') - - # Timeout value = elapsed time * 2; where elapsed time was collected - # from the elapsed time in the log.do_testimage for each function after - # the build is finished on the development machine. - self.target.expect(self.console, - 'Booting `Installation\'', - timeout=(2 * 60)) - bb.plain('Installation status: Loading the kernel, initrd and basic drivers...') - - self.target.expect(self.console, - 'Starting hardware detection...', - timeout=(40 * 60)) - bb.plain('Installation status: Starting hardware detection...') - - self.target.expect(self.console, - 'Loading Installation System', - timeout=(60 * 60)) - bb.plain('Installation status: Loading Installation System...') - - self.target.expect(self.console, - 'Starting Installer', - timeout=(40 * 60)) - bb.plain('Installation status: Performing Installation...') - - self.target.expect(self.console, - 'Finishing Configuration', - timeout=(15 * 60 * 60)) - bb.plain('Installation status: Finishing Configuration...') - - # Waiting till the installation is finished. - self.target.expect(self.console, r'.*login: ', timeout=(6 * 60 * 60)) - bb.plain('Installation status: openSUSE installation finished successfully.') diff --git a/meta-arm-systemready/recipes-bsp/arm-systemready/arm-systemready-firmware.bb b/meta-arm-systemready/recipes-bsp/arm-systemready/arm-systemready-firmware.bb deleted file mode 100644 index 54ffc85936..0000000000 --- a/meta-arm-systemready/recipes-bsp/arm-systemready/arm-systemready-firmware.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "Arm SystemReady Firmware Image" -DESCRIPTION = "This recipe ensures that all packages listed in \ -ARM_SYSTEMREADY_FIRMWARE variable (set at machine conf) are deployed." - -EXTRA_IMAGEDEPENDS = "${ARM_SYSTEMREADY_FIRMWARE}" - -inherit extra_imagedepends_only - -python() { - if not d.getVar("ARM_SYSTEMREADY_FIRMWARE"): - raise bb.parse.SkipRecipe("ARM_SYSTEMREADY_FIRMWARE needs to be set") -} - -do_testimage[noexec] = "1" diff --git a/meta-arm-systemready/recipes-devtools/python/python3-construct-native_2.10.68.bb b/meta-arm-systemready/recipes-devtools/python/python3-construct-native_2.10.68.bb deleted file mode 100644 index 5e39ae72ed..0000000000 --- a/meta-arm-systemready/recipes-devtools/python/python3-construct-native_2.10.68.bb +++ /dev/null @@ -1,13 +0,0 @@ -SUMMARY = "A powerful declarative symmetric parser/builder for binary data" -HOMEPAGE = "https://github.com/construct/construct" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=202b39559c1c79fe4715ce81e9e0ac02" - -PYPI_PACKAGE = "construct" - -SRC_URI[sha256sum] = "7b2a3fd8e5f597a5aa1d614c3bd516fa065db01704c72a1efaaeec6ef23d8b45" - -inherit pypi -inherit setuptools3 -inherit native diff --git a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb b/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb deleted file mode 100644 index 7d6fd6ae71..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-ir-acs.bb +++ /dev/null @@ -1,63 +0,0 @@ -SUMMARY = "Arm SystemReady IR ACS" -DESCRIPTION = "Arm SystemReady IR Architecture Compliance Suite prebuilt image" - -LICENSE = "AFL-2.1 & Apache-2.0 & BSD-2-Clause & BSD-2-Clause-Patent \ - & BSD-3-Clause & BSD-4-Clause & bzip2-1.0.4 & bzip2-1.0.6 & CC-BY-SA-4.0 \ - & curl & GPL-2.0-only & GPL-2.0-or-later & GPL-3.0-only \ - & GPL-3.0-or-later & GPL-3.0-with-GCC-exception & ISC \ - & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only \ - & LGPL-2.1-or-later & LGPL-3.0-only & MIT & MPL-2.0 & PD & PSF-2.0 \ - & Python-2.0 & Unicode-DFS-2016 & Unicode-TOU & Zlib" -LIC_FILES_CHKSUM = "\ -file://${COMMON_LICENSE_DIR}/AFL-2.1;md5=e40039b90e182a056bcd9ad3e47ddd71 \ -file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ -file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ -file://${COMMON_LICENSE_DIR}/BSD-2-Clause-Patent;md5=0518d409dae93098cca8dfa932f3ab1b \ -file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ -file://${COMMON_LICENSE_DIR}/BSD-4-Clause;md5=624d9e67e8ac41a78f6b6c2c55a83a2b \ -file://${COMMON_LICENSE_DIR}/bzip2-1.0.4;md5=452e1b423688222dcfc3cb9462c92902 \ -file://${COMMON_LICENSE_DIR}/bzip2-1.0.6;md5=841c5495611ae95b13e80fa4a0627333 \ -file://${COMMON_LICENSE_DIR}/CC-BY-SA-4.0;md5=4084714af41157e38872e798eb3fe1b1 \ -file://${COMMON_LICENSE_DIR}/curl;md5=f7adb1397db248527ffed14d947e445c \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-only;md5=c79ff39f19dfec6d293b95dea7b07891 \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-or-later;md5=1c76c4cc354acaac30ed4d5eefea7245 \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-with-GCC-exception;md5=aef5f35c9272f508be848cd99e0151df \ -file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d \ -file://${COMMON_LICENSE_DIR}/LGPL-2.0-only;md5=9427b8ccf5cf3df47c29110424c9641a \ -file://${COMMON_LICENSE_DIR}/LGPL-2.0-or-later;md5=6d2d9952d88b50a51a5c73dc431d06c7 \ -file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780 \ -file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ -file://${COMMON_LICENSE_DIR}/LGPL-3.0-only;md5=bfccfe952269fff2b407dd11f2f3083b \ -file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ -file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad \ -file://${COMMON_LICENSE_DIR}/PD;md5=b3597d12946881e13cb3b548d1173851 \ -file://${COMMON_LICENSE_DIR}/PSF-2.0;md5=76c1502273262a5ebefb50dfb20d7c4f \ -file://${COMMON_LICENSE_DIR}/Python-2.0;md5=a5c8025e305fb49e6d405769358851f6 \ -file://${COMMON_LICENSE_DIR}/Unicode-DFS-2016;md5=907371994d651afe53e98adc27824669 \ -file://${COMMON_LICENSE_DIR}/Unicode-TOU;md5=666362dc5dba74f477af0f44fb85bd22 \ -file://${COMMON_LICENSE_DIR}/Zlib;md5=87f239f408daca8a157858e192597633 \ -" -IMAGE_CLASSES:remove = "license_image create-spdx-image-3.0" - -COMPATIBLE_MACHINE = "(fvp-.+|.+-fvp)" - -TEST_SUITES = "arm_systemready_ir_acs" - -PV = "2.0.0" -PV_DATE = "23.03" -FULL_PV = "v${PV_DATE}_${PV}" -ARM_SYSTEMREADY_IR_ACS_BRANCH ?= "legacy_systemready" -IMAGE_FILENAME = "ir-acs-live-image-generic-arm64-${PV}.wic" -SRC_URI = " \ - https://github.com/ARM-software/arm-systemready/raw/${ARM_SYSTEMREADY_IR_ACS_BRANCH}/IR/prebuilt_images/${FULL_PV}/ir-acs-live-image-generic-arm64.wic.xz;name=acs-img;downloadfilename=${IMAGE_FILENAME}.xz \ - git://git.gitlab.arm.com/systemready/systemready-ir-template.git;protocol=https;nobranch=1;destsuffix=systemready-ir-template;name=sr-ir-template \ -" -SRC_URI[acs-img.sha256sum] = "ea52f84dab44bde97de3e2d2224d883acaae35724dd8e2bdfb125de49040f9b3" -# Revision pointing to v2023.04 tag -SRCREV_sr-ir-template = "c714db178ddf72e5ae5017f15421095297d5bf0e" - -S = "${UNPACKDIR}" - -inherit arm-systemready-acs diff --git a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts-native.bb b/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts-native.bb deleted file mode 100644 index 42f2508f4c..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts-native.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "System Ready Scripts" -DESCRIPTION = "A collection of scripts to help with SystemReady compliance." -HOMEPAGE = "https://gitlab.arm.com/systemready/systemready-scripts" - -inherit native - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=85b7d439a311c22626c2e3f05daf628e" - -RDEPENDS:${PN} = "python3-packaging-native python3-pyyaml-native \ -python3-chardet-native python3-requests-native python3-construct-native \ -dtc-native python3-dtschema-wrapper-native" - -PV = "v2023.04" -SRC_URI = "\ - git://git.gitlab.arm.com/systemready/systemready-scripts.git;protocol=https;nobranch=1 \ - file://0001-check-sr-results-Return-non-zero-exit-code-on-failur.patch \ - file://0002-check-sr-results-Device-tree-improvements.patch \ -" - -# The SRCREV is at the v2023.04 tag -SRCREV = "f8244ab8da09f9e6005ceff81ebb234f35a2a698" - -do_install() { - install -d ${D}/${libdir}/systemready_scripts - cp -r ${S}/* ${D}/${libdir}/systemready_scripts -} - -do_configure[noexec] = "1" -do_compile[noexec] = "1" diff --git a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts/0001-check-sr-results-Return-non-zero-exit-code-on-failur.patch b/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts/0001-check-sr-results-Return-non-zero-exit-code-on-failur.patch deleted file mode 100644 index 6a95881d93..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts/0001-check-sr-results-Return-non-zero-exit-code-on-failur.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ad8f2826f6e2cefb630f7fc2c7c99857f224e109 Mon Sep 17 00:00:00 2001 -From: Debbie Martin -Date: Tue, 5 Sep 2023 21:37:46 +0100 -Subject: [PATCH] check-sr-results: Return non-zero exit code on failure - -Return a non-zero exit code if there are any warnings or errors found. - -Upstream-Status: Pending -Signed-off-by: Debbie Martin ---- - check-sr-results.py | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/check-sr-results.py b/check-sr-results.py -index 12b89cd..48658f0 100755 ---- a/check-sr-results.py -+++ b/check-sr-results.py -@@ -185,6 +185,9 @@ class Stats: - def inc_error(self): - self._inc('error') - -+ def has_warnings_or_errors(self): -+ return self.data['warning'] or self.data['error'] -+ - - # Download (possibly large) file from URL. - # We raise an exception in case of issue. -@@ -1519,3 +1522,6 @@ if __name__ == '__main__': - if args.print_meta: - print() - print_meta() -+ -+ if stats.has_warnings_or_errors(): -+ exit(1) --- -2.25.1 - diff --git a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts/0002-check-sr-results-Device-tree-improvements.patch b/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts/0002-check-sr-results-Device-tree-improvements.patch deleted file mode 100644 index f76a03ade8..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-acs/arm-systemready-scripts/0002-check-sr-results-Device-tree-improvements.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 53ceb2d4167b05374678b966031b3d52fc5080a2 Mon Sep 17 00:00:00 2001 -From: Debbie Martin -Date: Fri, 29 Sep 2023 15:22:17 +0100 -Subject: [PATCH] check-sr-results: Device tree improvements - -Make check-sr-results.py accept 'extra_compat' configuration for -devicetree files, and pass these in the compat list given to -dt-parser.py. - -Update dt-parser.py to parse the GCC version line in the dtb log. - -Upstream-Status: Pending -Signed-off-by: Debbie Martin ---- - check-sr-results.py | 12 ++++++++++-- - dt-parser.py | 8 ++++++++ - 2 files changed, 18 insertions(+), 2 deletions(-) - -diff --git a/check-sr-results.py b/check-sr-results.py -index 48658f0..a207a39 100755 ---- a/check-sr-results.py -+++ b/check-sr-results.py -@@ -598,7 +598,7 @@ def need_regen(filename, deps, margin=0): - # We run dtc and dt-validate to produce the log when needed. - # We add markers to the log, which will be ignored by dt-parser.py. - # We return a Stats object. --def check_devicetree(filename): -+def check_devicetree(filename, extra_compat=None): - logging.debug(f"Check Devicetree `{filename}'") - stats = Stats() - log = f"{filename}.log" -@@ -644,6 +644,9 @@ def check_devicetree(filename): - # We use the compatible strings extracted from Linux bindings to filter out - # more false positive. - compat = get_compat() -+ if extra_compat: -+ with open(compat, "a") as compat_file: -+ compat_file.write("\n".join(extra_compat)) - cp = run(f"{dt_parser} --compatibles '{compat}' '{log}'") - - if cp.returncode: -@@ -930,7 +933,12 @@ def check_file(conffile, filename): - stats.add(check_uefi_capsule(filename)) - - if 'devicetree' in conffile: -- stats.add(check_devicetree(filename)) -+ stats.add( -+ check_devicetree( -+ filename, -+ extra_compat=conffile.get("extra_compat") -+ ) -+ ) - - if 'uefi-sniff' in conffile: - stats.add(check_uefi_sniff(filename)) -diff --git a/dt-parser.py b/dt-parser.py -index 3eccd74..c1c0031 100755 ---- a/dt-parser.py -+++ b/dt-parser.py -@@ -181,6 +181,14 @@ def parse(filename): - } - continue - -+ # line [GCC ] -+ m = re.match(r'\[GCC [0-9\.]+\]', line) -+ if m: -+ logging.debug( -+ f"line {i}: GCC version (`{line}')" -+ ) -+ continue -+ - # If we could not parse the line we arrive here and complain. - logging.warning(f"Unparsed line {i}: `{line}'") - --- -2.25.1 - diff --git a/meta-arm-systemready/recipes-test/arm-systemready-acs/edk2-test-parser-native.bb b/meta-arm-systemready/recipes-test/arm-systemready-acs/edk2-test-parser-native.bb deleted file mode 100644 index ea7c070c26..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-acs/edk2-test-parser-native.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "EDK2 Test Parser" -DESCRIPTION = "EDK2 Test Parser for parsing the results of UEFI SCT tests" -HOMEPAGE = "https://gitlab.arm.com/systemready/edk2-test-parser" - -inherit native - -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=c0550be4b3b9c0223efd0eaa70dc9085" - -RDEPENDS:${PN} = "python3-packaging-native python3-pyyaml-native \ - python3-jsonschema-native" - -PV = "v2023.04" -SRC_URI = "git://git.gitlab.arm.com/systemready/edk2-test-parser.git;protocol=https;nobranch=1" - -# The SRCREV is at the v2023.04 tag -SRCREV = "e8cdb692592d2a152cb87cf4d9fbd7ba2ae8b405" - -do_install() { - install -d ${D}/${libdir}/edk2_test_parser - cp -r ${S}/* ${D}/${libdir}/edk2_test_parser -} - -do_configure[noexec] = "1" -do_compile[noexec] = "1" diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-debian.bb b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-debian.bb deleted file mode 100644 index cb23388f49..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-debian.bb +++ /dev/null @@ -1,132 +0,0 @@ -require arm-systemready-linux-distros.inc - -# The Debian project does not provide a license manifest for the distributed ISO images. -# The following list only contains the SPDX license identifiers found on the deb -# packages from the ISO image and is not exhaustive. -# For more information about Debian licenses, including the non-free ones, refer to -# https://www.debian.org/legal/licenses/. -LICENSE = "AFL-2.0 & AFL-2.1 \ - & GPL-1.0-only & GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & GPL-2.0-with-autoconf-exception \ - & GPL-2.0-with-OpenSSL-exception & GPL-3.0-only & GPL-3.0-or-later & GPL-3.0-with-autoconf-exception \ - & GPL-3-with-bison-exception & SMAIL-GPL & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only \ - & LGPL-2.1-or-later & LGPL-3.0-only & LGPL-3.0-or-later & BSD-2-Clause & BSD-3-Clause \ - & BSD-3-Clause-Clear & BSD-4-Clause & BSD-4-Clause-UC & TCP-wrappers & OLDAP-2.8 & PSF-2.0 & BSL-1.0 \ - & bzip2-1.0.6 & CC0-1.0 & Libpng & Latex2e & Unicode-TOU & Unicode-DFS-2016 & CC-BY-3.0 & CC-BY-SA-3.0 \ - & CC-BY-SA-4.0 & curl & MS-PL & NTP & FSFAP & FSFUL & FSFULLR & FSF-Unlimited & EDL-1.0 & Vim & FTL \ - & TCL & MPL-1.1 & MPL-2.0 & GFDL-1.1-or-later & GFDL-1.2-or-later & GFDL-1.3-no-invariants-or-later \ - & GFDL-1.3-no-invariants-only & Artistic-1.0 & Artistic-2.0 & Artistic-1.0-Perl & Apache-2.0 \ - & Apache-2.0-with-LLVM-exception & Zlib & Python-2.0 & OpenSSL & Sleepycat & Spencer-86 & MIT & MIT-CMU \ - & MIT-advertising & Beerware & Intel & X11 & ISC & IPL-1.0 & SSH-OpenSSH & SSH-short & RSA-MD & OPL-1.0 & PD" - -LIC_FILES_CHKSUM = "\ -file://${COMMON_LICENSE_DIR}/AFL-2.0;md5=f01c02e5eac69cff6b8c2cc474b8d468 \ -file://${COMMON_LICENSE_DIR}/AFL-2.1;md5=e40039b90e182a056bcd9ad3e47ddd71 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0-only;md5=e9e36a9de734199567a4d769498f743d \ -file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61 \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-with-autoconf-exception;md5=966c02a95037a9c7ad75a7597aea9c5f \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-with-OpenSSL-exception;md5=d9e4412f125e3e6f14efba8ce7b4604f \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-only;md5=c79ff39f19dfec6d293b95dea7b07891 \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-or-later;md5=1c76c4cc354acaac30ed4d5eefea7245 \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-with-autoconf-exception;md5=da26b415cb0faf9bfe6829f0ffa409ec \ -file://${COMMON_LICENSE_DIR}/GPL-3-with-bison-exception;md5=6e1bac3dc21fcc4fa049cf5c407eb7a2 \ -file://${COMMON_LICENSE_DIR}/SMAIL-GPL;md5=785f3688caca0adb413cd39878d0411f \ -file://${COMMON_LICENSE_DIR}/LGPL-2.0-only;md5=9427b8ccf5cf3df47c29110424c9641a \ -file://${COMMON_LICENSE_DIR}/LGPL-2.0-or-later;md5=6d2d9952d88b50a51a5c73dc431d06c7 \ -file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780 \ -file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ -file://${COMMON_LICENSE_DIR}/LGPL-3.0-only;md5=bfccfe952269fff2b407dd11f2f3083b \ -file://${COMMON_LICENSE_DIR}/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ -file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ -file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ -file://${COMMON_LICENSE_DIR}/BSD-3-Clause-Clear;md5=7a434440b651f4a472ca93716d01033a \ -file://${COMMON_LICENSE_DIR}/BSD-4-Clause;md5=624d9e67e8ac41a78f6b6c2c55a83a2b \ -file://${COMMON_LICENSE_DIR}/BSD-4-Clause-UC;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \ -file://${COMMON_LICENSE_DIR}/TCP-wrappers;md5=83b1f59c3c52689f5652193e0cd5b1cf \ -file://${COMMON_LICENSE_DIR}/OLDAP-2.8;md5=bb28ada4fbb5c3f52c233899b2e410a5 \ -file://${COMMON_LICENSE_DIR}/PSF-2.0;md5=76c1502273262a5ebefb50dfb20d7c4f \ -file://${COMMON_LICENSE_DIR}/BSL-1.0;md5=65a7df9ad57aacf825fd252c4c33288c \ -file://${COMMON_LICENSE_DIR}/bzip2-1.0.6;md5=841c5495611ae95b13e80fa4a0627333 \ -file://${COMMON_LICENSE_DIR}/CC0-1.0;md5=0ceb3372c9595f0a8067e55da801e4a1 \ -file://${COMMON_LICENSE_DIR}/Libpng;md5=12b4ec50384c800bc568f519671b120c \ -file://${COMMON_LICENSE_DIR}/Latex2e;md5=ef91d258f6a8d4d7f4db4d30adf38598 \ -file://${COMMON_LICENSE_DIR}/Unicode-TOU;md5=666362dc5dba74f477af0f44fb85bd22 \ -file://${COMMON_LICENSE_DIR}/Unicode-DFS-2016;md5=907371994d651afe53e98adc27824669 \ -file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7 \ -file://${COMMON_LICENSE_DIR}/CC-BY-SA-3.0;md5=3248afbd148270ac7337a6f3e2558be5 \ -file://${COMMON_LICENSE_DIR}/CC-BY-SA-4.0;md5=4084714af41157e38872e798eb3fe1b1 \ -file://${COMMON_LICENSE_DIR}/curl;md5=f7adb1397db248527ffed14d947e445c \ -file://${COMMON_LICENSE_DIR}/MS-PL;md5=b9cbca4f1a399b0c17b3521736e67848 \ -file://${COMMON_LICENSE_DIR}/NTP;md5=0926fd147301b2a65e45e21adb3a6f14 \ -file://${COMMON_LICENSE_DIR}/FSFAP;md5=232368338ef6dc99de71c2e05ff12176 \ -file://${COMMON_LICENSE_DIR}/FSFUL;md5=dc74327e8d4dca295527a090d2af4ba4 \ -file://${COMMON_LICENSE_DIR}/FSFULLR;md5=f0aa4b452548cc5d53a7772a9a90b3c0 \ -file://${COMMON_LICENSE_DIR}/FSF-Unlimited;md5=06fadd9ae6adbcd5d8d545dac90b15f6 \ -file://${COMMON_LICENSE_DIR}/EDL-1.0;md5=e06be17b8577bf6e2277a5c3c71b2d05 \ -file://${COMMON_LICENSE_DIR}/Vim;md5=676d28582e2dca824e7e309a9865eeb1 \ -file://${COMMON_LICENSE_DIR}/FTL;md5=f0bf6b09ee8b02121ed10709d9e49d8b \ -file://${COMMON_LICENSE_DIR}/TCL;md5=5f7b23ac10d8f7cde16737bc896bb6fb \ -file://${COMMON_LICENSE_DIR}/MPL-1.1;md5=1d38e87ed8d522c49f04e1efe0fab3ab \ -file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad \ -file://${COMMON_LICENSE_DIR}/GFDL-1.1-or-later;md5=03322744a1a73f36ebf29f98cced39a4 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.2-or-later;md5=9f58808219e9a42ff1228309d6f83dc6 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.3-no-invariants-or-later;md5=e0771ae6a62dc8a2e50b1d450fea66b7 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.3-no-invariants-only;md5=e0771ae6a62dc8a2e50b1d450fea66b7 \ -file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/Artistic-2.0;md5=8bbc66f0ba93cec26ef526117e280266 \ -file://${COMMON_LICENSE_DIR}/Artistic-1.0-Perl;md5=8feedd169dbd5738981843bd7d931f9f \ -file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ -file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab \ -file://${COMMON_LICENSE_DIR}/Zlib;md5=87f239f408daca8a157858e192597633 \ -file://${COMMON_LICENSE_DIR}/Python-2.0;md5=a5c8025e305fb49e6d405769358851f6 \ -file://${COMMON_LICENSE_DIR}/OpenSSL;md5=4eb1764f3e65fafa1a25057f9082f2ae \ -file://${COMMON_LICENSE_DIR}/Sleepycat;md5=1cbb64231c94198653282f3ccab88ffb \ -file://${COMMON_LICENSE_DIR}/Spencer-86;md5=97ba797de74f88a17676473fab224843 \ -file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ -file://${COMMON_LICENSE_DIR}/MIT-CMU;md5=91b70218e0db8e063ed88cd532cb801d \ -file://${COMMON_LICENSE_DIR}/MIT-advertising;md5=0f358dd6677661d482934070c7eeaeec \ -file://${COMMON_LICENSE_DIR}/Beerware;md5=8db32780d0d8bbbdce0fa415e514cb89 \ -file://${COMMON_LICENSE_DIR}/Intel;md5=ced5efc26449ecac834b4b71625a3410 \ -file://${COMMON_LICENSE_DIR}/X11;md5=87f08485cf6ba3c63a00eda8ecba7f1d \ -file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d \ -file://${COMMON_LICENSE_DIR}/IPL-1.0;md5=be739b8845e6e98f99e206221fe9293b \ -file://${COMMON_LICENSE_DIR}/SSH-OpenSSH;md5=3af632aae8cf01feb6ce2ed44bb7ed2e \ -file://${COMMON_LICENSE_DIR}/SSH-short;md5=b73783010a430cadaabdc8ec0c0748f8 \ -file://${COMMON_LICENSE_DIR}/RSA-MD;md5=9342e66a3fb8ddeebe449a85366f4acc \ -file://${COMMON_LICENSE_DIR}/OPL-1.0;md5=acdf1e4398bd93dc137e271c50316324 \ -file://${COMMON_LICENSE_DIR}/PD;md5=b3597d12946881e13cb3b548d1173851 \ -" - -PV = "12.8.0" -SRC_URI = "\ - https://cdimage.debian.org/mirror/cdimage/archive/12.8.0/arm64/iso-dvd/debian-12.8.0-arm64-DVD-1.iso;unpack=0;downloadfilename=${ISO_IMAGE_NAME}.iso;name=debian_iso_image \ - file://unattended-boot-conf/Debian/preseed.cfg \ - " -SRC_URI[debian_iso_image.sha256sum] = "8891fe48bb5a58ae54176eaa6440059bf852044d6b9ae77219e78f9ef8d65149" - -TEST_SUITES = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "arm_systemready_debian_unattended", "", d)}" - -ISO_LABEL = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "debian-12.8.0-arm64-1", "", d)}" -BOOT_CATALOG = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "boot.catalog", "", d)}" -BOOT_IMAGE = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "EFI/boot/bootaa64.efi", "", d)}" -EFI_IMAGE = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "boot/grub/efi.img", "", d)}" - -modifyiso() { - UNATTENDED_CONF_DIR="${UNPACKDIR}/unattended-boot-conf/Debian" - - # Append the preseed.cfg file to the initrd - gunzip ${EXTRACTED_ISO_TEMP_DIR}/install.a64/initrd.gz - (cd ${UNATTENDED_CONF_DIR} && echo preseed.cfg | cpio -H newc -o -A -F ${EXTRACTED_ISO_TEMP_DIR}/install.a64/initrd) - gzip ${EXTRACTED_ISO_TEMP_DIR}/install.a64/initrd - - #GRUB - # Disable timeout - sed -i '/^insmod gzio/ a set timeout=0' ${EXTRACTED_ISO_TEMP_DIR}/boot/grub/grub.cfg - - # Update default menu entry to select automated install - sed -i '/^set timeout/ a set default="2>5"' ${EXTRACTED_ISO_TEMP_DIR}/boot/grub/grub.cfg - - # Update kernel boot parameters to enable more text based console output - sed -i 's|linux /install.a64/vmlinuz auto=true priority=critical --- quiet|linux /install.a64/vmlinuz auto=true priority=critical DEBIAN_FRONTEND=text --- nomodeset|g' ${EXTRACTED_ISO_TEMP_DIR}/boot/grub/grub.cfg -} diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-fedora.bb b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-fedora.bb deleted file mode 100644 index df2043b59f..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-fedora.bb +++ /dev/null @@ -1,122 +0,0 @@ -require arm-systemready-linux-distros.inc - -# The Fedora project does not provide a license manifest for the distributed ISO images. -# The following list only contains the SPDX license identifiers found on the rpm -# packages from the ISO image and is not exhaustive. -# For more information about Fedora licenses, including the non-free ones, refer to -# https://docs.fedoraproject.org/en-US/legal/fedora-linux-license/. -LICENSE = "GPL-1.0-only & GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later & GPL-2.0-with-font-exception \ - & GPL-2.0-with-GCC-exception & GPL-3.0-only & GPL-3.0-or-later & GPL-3-with-bison-exception \ - & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only & LGPL-2.1-or-later & LGPL-3.0-only & LGPL-3.0-or-later \ - & 0BSD & BSD-2-Clause & BSD-3-Clause & BSD-3-Clause-Modification & BSD-4-Clause & BSD-4-Clause-UC \ - & ClArtistic & Artistic-2.0 & Artistic-1.0-Perl & Apache-2.0 & Apache-2.0-with-LLVM-exception & Zlib \ - & zlib-acknowledgement & Sleepycat & MIT & MIT-open-group & MIT-Modern-Variant & Unlicense & ISC \ - & AFL-2.1 & AGPL-3.0-only & AGPL-3.0-or-later & FSFAP & MPL-1.1 & MPL-2.0 & CC-BY-3.0 & CC-BY-4.0 \ - & CC-BY-SA-4.0 & CC0-1.0 & NCSA & APSL-2.0 & IJG & psutils & Sendmail & blessing & NTP & BSL-1.0 \ - & GFDL-1.1-or-later & GFDL-1.2-or-later & GFDL-1.3 & GFDL-1.3-or-later & GFDL-1.3-no-invariants-or-later \ - & NPL-1.1 & libtiff & Vim & curl & EUPL-1.1 & OFL-1.1 & OFL-1.1-RFN & FTL & Info-ZIP & Interbase-1.0 \ - & Unicode-DFS-2016 & SISSL & LPPL-1.3a & SGI-B-2.0 & PSF-2.0 & X11 & OLDAP-2.8 & PostgreSQL & OPUBL-1.0" - -LIC_FILES_CHKSUM = "\ -file://${COMMON_LICENSE_DIR}/GPL-1.0-only;md5=e9e36a9de734199567a4d769498f743d \ -file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61 \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-with-font-exception;md5=bf93e21a513f6f923474e62fb920434d \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-with-GCC-exception;md5=14c42911132e8c9008911385aede6449 \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-only;md5=c79ff39f19dfec6d293b95dea7b07891 \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-or-later;md5=1c76c4cc354acaac30ed4d5eefea7245 \ -file://${COMMON_LICENSE_DIR}/GPL-3-with-bison-exception;md5=6e1bac3dc21fcc4fa049cf5c407eb7a2 \ -file://${COMMON_LICENSE_DIR}/LGPL-2.0-only;md5=9427b8ccf5cf3df47c29110424c9641a \ -file://${COMMON_LICENSE_DIR}/LGPL-2.0-or-later;md5=6d2d9952d88b50a51a5c73dc431d06c7 \ -file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780 \ -file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ -file://${COMMON_LICENSE_DIR}/LGPL-3.0-only;md5=bfccfe952269fff2b407dd11f2f3083b \ -file://${COMMON_LICENSE_DIR}/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ -file://${COMMON_LICENSE_DIR}/0BSD;md5=f667a3c3830a55a17ec3067709f4526c \ -file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ -file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ -file://${COMMON_LICENSE_DIR}/BSD-3-Clause-Modification;md5=27b46022df7bdef61a1e404fc3573f83 \ -file://${COMMON_LICENSE_DIR}/BSD-4-Clause;md5=624d9e67e8ac41a78f6b6c2c55a83a2b \ -file://${COMMON_LICENSE_DIR}/BSD-4-Clause-UC;md5=1da3cf8ad50cd8d5d1de3cfc53196d01 \ -file://${COMMON_LICENSE_DIR}/ClArtistic;md5=f633bbf0697ec33066b83adfa9ebe51d \ -file://${COMMON_LICENSE_DIR}/Artistic-2.0;md5=8bbc66f0ba93cec26ef526117e280266 \ -file://${COMMON_LICENSE_DIR}/Artistic-1.0-Perl;md5=8feedd169dbd5738981843bd7d931f9f \ -file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ -file://${COMMON_LICENSE_DIR}/Apache-2.0-with-LLVM-exception;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab \ -file://${COMMON_LICENSE_DIR}/Zlib;md5=87f239f408daca8a157858e192597633 \ -file://${COMMON_LICENSE_DIR}/zlib-acknowledgement;md5=c76c64e2cf99efcfb5e2b26aa86b12e6 \ -file://${COMMON_LICENSE_DIR}/Sleepycat;md5=1cbb64231c94198653282f3ccab88ffb \ -file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ -file://${COMMON_LICENSE_DIR}/MIT-open-group;md5=a7c50bba311e4b09d48a526eedcef837 \ -file://${COMMON_LICENSE_DIR}/MIT-Modern-Variant;md5=272dea2b67586002978254bc04648ab2 \ -file://${COMMON_LICENSE_DIR}/Unlicense;md5=7246f848faa4e9c9fc0ea91122d6e680 \ -file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d \ -file://${COMMON_LICENSE_DIR}/AFL-2.1;md5=e40039b90e182a056bcd9ad3e47ddd71 \ -file://${COMMON_LICENSE_DIR}/AGPL-3.0-only;md5=73f1eb20517c55bf9493b7dd6e480788 \ -file://${COMMON_LICENSE_DIR}/AGPL-3.0-or-later;md5=a4af3f9f0c0fc9de318e4df46665906e \ -file://${COMMON_LICENSE_DIR}/FSFAP;md5=232368338ef6dc99de71c2e05ff12176 \ -file://${COMMON_LICENSE_DIR}/MPL-1.1;md5=1d38e87ed8d522c49f04e1efe0fab3ab \ -file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad \ -file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7 \ -file://${COMMON_LICENSE_DIR}/CC-BY-4.0;md5=9b33bbd06fb58995fb0e299cd38d1838 \ -file://${COMMON_LICENSE_DIR}/CC-BY-SA-4.0;md5=4084714af41157e38872e798eb3fe1b1 \ -file://${COMMON_LICENSE_DIR}/CC0-1.0;md5=0ceb3372c9595f0a8067e55da801e4a1 \ -file://${COMMON_LICENSE_DIR}/NCSA;md5=1b5fdec70ee13ad8a91667f16c1959d7 \ -file://${COMMON_LICENSE_DIR}/APSL-2.0;md5=f9e4701d9a216a87ba145bbe25f54c58 \ -file://${COMMON_LICENSE_DIR}/IJG;md5=d9fc5ebaa95c14466091d25e0d34e688 \ -file://${COMMON_LICENSE_DIR}/psutils;md5=29046009c1f269661e7b74196fb8f6a0 \ -file://${COMMON_LICENSE_DIR}/Sendmail;md5=8037c42e05a5d4bfce06a44729fb6f1a \ -file://${COMMON_LICENSE_DIR}/blessing;md5=d5407b61870d6dc19d0bdc04ae4cc654 \ -file://${COMMON_LICENSE_DIR}/NTP;md5=0926fd147301b2a65e45e21adb3a6f14 \ -file://${COMMON_LICENSE_DIR}/BSL-1.0;md5=65a7df9ad57aacf825fd252c4c33288c \ -file://${COMMON_LICENSE_DIR}/GFDL-1.1-or-later;md5=03322744a1a73f36ebf29f98cced39a4 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.2-or-later;md5=9f58808219e9a42ff1228309d6f83dc6 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.3;md5=1083add59b39991c748ea70a92166959 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.3-or-later;md5=e0771ae6a62dc8a2e50b1d450fea66b7 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.3-no-invariants-or-later;md5=e0771ae6a62dc8a2e50b1d450fea66b7 \ -file://${COMMON_LICENSE_DIR}/NPL-1.1;md5=f9c017c062c1b02462efb915d9f2cb63 \ -file://${COMMON_LICENSE_DIR}/libtiff;md5=b99383975855adc28712577c9cd56485 \ -file://${COMMON_LICENSE_DIR}/Vim;md5=676d28582e2dca824e7e309a9865eeb1 \ -file://${COMMON_LICENSE_DIR}/curl;md5=f7adb1397db248527ffed14d947e445c \ -file://${COMMON_LICENSE_DIR}/EUPL-1.1;md5=3f12b8134016fd7ba5a010afd690abaa \ -file://${COMMON_LICENSE_DIR}/OFL-1.1;md5=fac3a519e5e9eb96316656e0ca4f2b90 \ -file://${COMMON_LICENSE_DIR}/OFL-1.1-RFN;md5=2680fce30f17e5fed9bcebd9336e5b78 \ -file://${COMMON_LICENSE_DIR}/FTL;md5=f0bf6b09ee8b02121ed10709d9e49d8b \ -file://${COMMON_LICENSE_DIR}/Info-ZIP;md5=83a1c8ea099b3b58beb6e55dcbe4c15f \ -file://${COMMON_LICENSE_DIR}/Interbase-1.0;md5=f65304bc0e87e6700fe1e4ab5affdc6f \ -file://${COMMON_LICENSE_DIR}/Unicode-DFS-2016;md5=907371994d651afe53e98adc27824669 \ -file://${COMMON_LICENSE_DIR}/SISSL;md5=fded06bff75eb4a2899bd051e2e128f5 \ -file://${COMMON_LICENSE_DIR}/LPPL-1.3a;md5=8e2e8e1428b39cd78927c2ad28734ff7 \ -file://${COMMON_LICENSE_DIR}/SGI-B-2.0;md5=5f5dd7bd973dff1594131b1e9c7981f1 \ -file://${COMMON_LICENSE_DIR}/PSF-2.0;md5=76c1502273262a5ebefb50dfb20d7c4f \ -file://${COMMON_LICENSE_DIR}/X11;md5=87f08485cf6ba3c63a00eda8ecba7f1d \ -file://${COMMON_LICENSE_DIR}/OLDAP-2.8;md5=bb28ada4fbb5c3f52c233899b2e410a5 \ -file://${COMMON_LICENSE_DIR}/PostgreSQL;md5=a9c78964f52e27f4c01140a1a16da8e2 \ -file://${COMMON_LICENSE_DIR}/OPUBL-1.0;md5=99367d4750dbf0ae6cc74209ddd52f6d \ -" - -ARM_SYSTEMREADY_LINUX_DISTRO_INSTALL_SIZE = "6144" - -TEST_SUITES = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "arm_systemready_fedora_unattended", "", d)}" - -ISO_LABEL = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "Fedora-S-dvd-aarch64-39", "", d)}" -BOOT_CATALOG = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "boot.catalog", "", d)}" -BOOT_IMAGE = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "EFI/BOOT/BOOTAA64.EFI", "", d)}" -EFI_IMAGE = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "images/efiboot.img", "", d)}" - -PV = "39.1.5" -SRC_URI = "\ - https://download.fedoraproject.org/pub/archive/fedora/linux/releases/39/Server/aarch64/iso/Fedora-Server-dvd-aarch64-39-1.5.iso;unpack=0;downloadfilename=${ISO_IMAGE_NAME}.iso;name=fedora_iso_image \ - file://unattended-boot-conf/Fedora/ks.cfg\ - " -SRC_URI[fedora_iso_image.sha256sum] = "d19dc2a39758155fa53e6fd555d0d173ccc8175b55dea48002d499f39cb30ce0" - -modifyiso() { - UNATTENDED_CONF_DIR="${UNPACKDIR}/unattended-boot-conf/Fedora" - - cp "${UNATTENDED_CONF_DIR}/ks.cfg" ${EXTRACTED_ISO_TEMP_DIR} - sed -i 's/set default="1"/set default="0"/g' "${EXTRACTED_ISO_TEMP_DIR}/EFI/BOOT/grub.cfg" - sed -i 's/set timeout=60/set timeout=0/g' "${EXTRACTED_ISO_TEMP_DIR}/EFI/BOOT/grub.cfg" - sed -i '0,/vmlinuz/s/vmlinuz/& inst.ks=hd:LABEL=Fedora-S-dvd-aarch64-39:\/ks.cfg/' "${EXTRACTED_ISO_TEMP_DIR}/EFI/BOOT/grub.cfg" -} diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-opensuse.bb b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-opensuse.bb deleted file mode 100644 index ad69c779c5..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-opensuse.bb +++ /dev/null @@ -1,92 +0,0 @@ -require arm-systemready-linux-distros.inc - -LICENSE = "AGPL-3.0-only & Apache-1.1 & Apache-2.0 & Artistic-1.0 & Artistic-2.0 \ - & BSD-2-Clause-Patent & BSD-2-Clause & BSD-3-Clause & BSD-4-Clause \ - & BSL-1.0 & CC-BY-3.0 & CC-BY-4.0 & CC-BY-SA-1.0 & CC-BY-SA-3.0 \ - & CC-BY-SA-4.0 & CC0-1.0 & CDDL-1.0 & GFDL-1.1-only \ - & GFDL-1.2-only & GFDL-1.3-only & GFDL-1.3-or-later \ - & GPL-1.0-or-later & GPL-2.0-only & GPL-2.0-or-later \ - & GPL-3.0-only & GPL-3.0-or-later & HPND & ICU & IPL-1.0 & IPA \ - & ISC & LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-only \ - & LGPL-2.1-or-later & LGPL-3.0-only & LGPL-3.0-or-later \ - & LPPL-1.3c & MIT & MPL-1.1 & MPL-2.0 & OFL-1.1 & OLDAP-2.8 \ - & OpenSSL & Python-2.0 & Sleepycat & Vim & W3C & Zlib" - -LIC_FILES_CHKSUM = "\ -file://${COMMON_LICENSE_DIR}/AGPL-3.0-only;md5=73f1eb20517c55bf9493b7dd6e480788 \ -file://${COMMON_LICENSE_DIR}/Apache-1.1;md5=61cc638ff95ff4f38f243855bcec4317 \ -file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10 \ -file://${COMMON_LICENSE_DIR}/Artistic-1.0;md5=cda03bbdc3c1951996392b872397b798 \ -file://${COMMON_LICENSE_DIR}/Artistic-2.0;md5=8bbc66f0ba93cec26ef526117e280266 \ -file://${COMMON_LICENSE_DIR}/BSD-2-Clause-Patent;md5=0518d409dae93098cca8dfa932f3ab1b \ -file://${COMMON_LICENSE_DIR}/BSD-2-Clause;md5=cb641bc04cda31daea161b1bc15da69f \ -file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ -file://${COMMON_LICENSE_DIR}/BSD-4-Clause;md5=624d9e67e8ac41a78f6b6c2c55a83a2b \ -file://${COMMON_LICENSE_DIR}/BSL-1.0;md5=65a7df9ad57aacf825fd252c4c33288c \ -file://${COMMON_LICENSE_DIR}/CC-BY-3.0;md5=dfa02b5755629022e267f10b9c0a2ab7 \ -file://${COMMON_LICENSE_DIR}/CC-BY-4.0;md5=9b33bbd06fb58995fb0e299cd38d1838 \ -file://${COMMON_LICENSE_DIR}/CC-BY-SA-1.0;md5=681ffad43a0addd90f1bebf45675104e \ -file://${COMMON_LICENSE_DIR}/CC-BY-SA-3.0;md5=3248afbd148270ac7337a6f3e2558be5 \ -file://${COMMON_LICENSE_DIR}/CC-BY-SA-4.0;md5=4084714af41157e38872e798eb3fe1b1 \ -file://${COMMON_LICENSE_DIR}/CC0-1.0;md5=0ceb3372c9595f0a8067e55da801e4a1 \ -file://${COMMON_LICENSE_DIR}/CDDL-1.0;md5=d63dcc9297f2efd6c18d1e560b807bc6 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.1-only;md5=03322744a1a73f36ebf29f98cced39a4 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.2-only;md5=9f58808219e9a42ff1228309d6f83dc6 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.3-only;md5=e0771ae6a62dc8a2e50b1d450fea66b7 \ -file://${COMMON_LICENSE_DIR}/GFDL-1.3-or-later;md5=e0771ae6a62dc8a2e50b1d450fea66b7 \ -file://${COMMON_LICENSE_DIR}/GPL-1.0-or-later;md5=30c0b8a5048cc2f4be5ff15ef0d8cf61 \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ -file://${COMMON_LICENSE_DIR}/GPL-2.0-or-later;md5=fed54355545ffd980b814dab4a3b312c \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-only;md5=c79ff39f19dfec6d293b95dea7b07891 \ -file://${COMMON_LICENSE_DIR}/GPL-3.0-or-later;md5=1c76c4cc354acaac30ed4d5eefea7245 \ -file://${COMMON_LICENSE_DIR}/HPND;md5=faa364b3e3c6db0f74cc0e704ddf6b9c \ -file://${COMMON_LICENSE_DIR}/ICU;md5=4d85ad1f393add71dc66bcf78e3ee584 \ -file://${COMMON_LICENSE_DIR}/IPA;md5=17b18da2d8b2c43c598aa7583229ef1b \ -file://${COMMON_LICENSE_DIR}/IPL-1.0;md5=be739b8845e6e98f99e206221fe9293b \ -file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d \ -file://${COMMON_LICENSE_DIR}/LGPL-2.0-only;md5=9427b8ccf5cf3df47c29110424c9641a \ -file://${COMMON_LICENSE_DIR}/LGPL-2.0-or-later;md5=6d2d9952d88b50a51a5c73dc431d06c7 \ -file://${COMMON_LICENSE_DIR}/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780 \ -file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \ -file://${COMMON_LICENSE_DIR}/LGPL-3.0-only;md5=bfccfe952269fff2b407dd11f2f3083b \ -file://${COMMON_LICENSE_DIR}/LGPL-3.0-or-later;md5=c51d3eef3be114124d11349ca0d7e117 \ -file://${COMMON_LICENSE_DIR}/LPPL-1.3c;md5=ba2fa6fe055623756de43a298d88a8b3 \ -file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ -file://${COMMON_LICENSE_DIR}/MPL-1.1;md5=1d38e87ed8d522c49f04e1efe0fab3ab \ -file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad \ -file://${COMMON_LICENSE_DIR}/OFL-1.1;md5=fac3a519e5e9eb96316656e0ca4f2b90 \ -file://${COMMON_LICENSE_DIR}/OLDAP-2.8;md5=bb28ada4fbb5c3f52c233899b2e410a5 \ -file://${COMMON_LICENSE_DIR}/OpenSSL;md5=4eb1764f3e65fafa1a25057f9082f2ae \ -file://${COMMON_LICENSE_DIR}/Python-2.0;md5=a5c8025e305fb49e6d405769358851f6 \ -file://${COMMON_LICENSE_DIR}/Sleepycat;md5=1cbb64231c94198653282f3ccab88ffb \ -file://${COMMON_LICENSE_DIR}/Vim;md5=676d28582e2dca824e7e309a9865eeb1 \ -file://${COMMON_LICENSE_DIR}/W3C;md5=4b1d0384b406508a63e51f7c69687700 \ -file://${COMMON_LICENSE_DIR}/Zlib;md5=87f239f408daca8a157858e192597633 \ -" - -ARM_SYSTEMREADY_LINUX_DISTRO_INSTALL_SIZE = "6144" - -PV = "15.5" -# possible value of ISO_TYPE: NET, DVD -ISO_TYPE = "DVD" -BUILD_NO = "491.1" -SRC_URI = "\ - https://download.opensuse.org/distribution/leap/${PV}/iso/openSUSE-Leap-${PV}-${ISO_TYPE}-aarch64-Build${BUILD_NO}-Media.iso;unpack=0;downloadfilename=${ISO_IMAGE_NAME}.iso;name=opensuse_iso_image \ - file://unattended-boot-conf/openSUSE/autoinst.xml \ - " -SRC_URI[opensuse_iso_image.sha256sum] = "456cc4f99b044429d8a89bd302c06e9e382d6ac4dc590139a7096ebb54f5357b" - -TEST_SUITES = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "arm_systemready_opensuse_unattended", "", d)}" - -ISO_LABEL = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "OEMDRV", "", d)}" -BOOT_CATALOG = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "boot.catalog", "", d)}" -BOOT_IMAGE = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "EFI/BOOT/bootaa64.efi", "", d)}" -EFI_IMAGE = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "boot/aarch64/efi", "", d)}" - -modifyiso() { - UNATTENDED_CONF_DIR="${UNPACKDIR}/unattended-boot-conf/openSUSE" - - #create installation configuration files, remove grub timeout, setup network - cp "${UNATTENDED_CONF_DIR}/autoinst.xml" ${EXTRACTED_ISO_TEMP_DIR} - sed -i 's/timeout=60/timeout=0/g' "${EXTRACTED_ISO_TEMP_DIR}/EFI/BOOT/grub.cfg" -} \ No newline at end of file diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-unattended.inc b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-unattended.inc deleted file mode 100644 index 75951b0e84..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros-unattended.inc +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Arm SystemReady Linux distros unattended requirements" -DESCRIPTION = "Arm SystemReady Linux distro unattended configurations \ - and ISO image modification" - -EXTRACTED_ISO_TEMP_DIR = "${WORKDIR}/extracted_iso_temp_dir" -NEW_ISO_TEMP_DIR = "${WORKDIR}/new_iso_temp_dir" - -# oeqa test case must be added to TEST_SUITES to acknowledge that the unattended -# installation was successful. -inherit testimage - -python () { - unattended_required_vars = ['ISO_LABEL', 'BOOT_CATALOG', 'BOOT_IMAGE', 'EFI_IMAGE'] - - for var in unattended_required_vars: - if not d.getVar(var): - raise bb.parse.SkipRecipe(f'{var} variable is not set') -} - -unpackiso() { - # Unpack the ISO image - bsdtar -xf ${UNPACKDIR}/${ISO_IMAGE_NAME}.iso -C ${EXTRACTED_ISO_TEMP_DIR} - chmod -R u+rw ${EXTRACTED_ISO_TEMP_DIR} -} - -modifyiso() { - -} - -repackiso() { - # Repack the ISO image - mkisofs -o ${NEW_ISO_TEMP_DIR}/${ISO_IMAGE_NAME}.iso -U -r -v -T -J -joliet-long -V ${ISO_LABEL} \ - -volset ${ISO_LABEL} -A ${ISO_LABEL} -b ${BOOT_IMAGE} -c ${BOOT_CATALOG} -no-emul-boot \ - -boot-load-size 4 -boot-info-table -J -R -V ${ISO_LABEL} -eltorito-alt-boot \ - -eltorito-boot ${EFI_IMAGE} -no-emul-boot ${EXTRACTED_ISO_TEMP_DIR} - - mv -f ${NEW_ISO_TEMP_DIR}/${ISO_IMAGE_NAME}.iso ${UNPACKDIR} -} - -# Write the test data in IMAGE_POSTPROCESS_COMMAND -IMAGE_POSTPROCESS_COMMAND += "write_image_test_data; " - -do_unpack[depends] += "cdrtools-native:do_populate_sysroot libarchive-native:do_populate_sysroot" -do_unpack[postfuncs] += "unpackiso modifyiso repackiso" -do_unpack[cleandirs] += "${EXTRACTED_ISO_TEMP_DIR} ${NEW_ISO_TEMP_DIR}" \ No newline at end of file diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros.inc b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros.inc deleted file mode 100644 index 74aa937e2f..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/arm-systemready-linux-distros.inc +++ /dev/null @@ -1,64 +0,0 @@ -SUMMARY = "Arm SystemReady Linux distros installation" -DESCRIPTION = "Arm SystemReady Linux distro CD/DVD images and installation \ - target disk image" - -DISTRO_UNATTENDED_INST_TESTS ?= "0" - -require ${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "arm-systemready-linux-distros-unattended.inc", "", d)} - -IMAGE_CLASSES:remove = "license_image create-spdx-image-3.0" -IMAGE_CLASSES:remove = "${@oe.utils.vartrue("DISTRO_UNATTENDED_INST_TESTS", "", "testimage", d)}" -BUILDHISTORY_FEATURES:remove = "image" - -INHIBIT_DEFAULT_DEPS = "1" -COMPATIBLE_HOST = "aarch64-*" -PACKAGE_ARCH = "${TARGET_ARCH}" - -inherit nopackages deploy rootfs-postcommands ${IMAGE_CLASSES} - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -ISO_IMAGE_NAME = "${PN}-${PV}" -IMAGE_LINK_NAME = "${PN}-${MACHINE}" - -ARM_SYSTEMREADY_LINUX_DISTRO_ISO_IMAGE = \ - "${DEPLOY_DIR_IMAGE}/${ISO_IMAGE_NAME}.iso" -# Size of installation disk in MB -ARM_SYSTEMREADY_LINUX_DISTRO_INSTALL_SIZE ?= "4096" - -S = "${UNPACKDIR}" - -do_image() { - dd if=/dev/zero of=${WORKDIR}/${IMAGE_LINK_NAME}.wic \ - bs=1M count=${ARM_SYSTEMREADY_LINUX_DISTRO_INSTALL_SIZE} status=none -} - -do_deploy() { - # Deploy the iso and installation target disk image to the deploy folder - install -m 644 ${UNPACKDIR}/${ISO_IMAGE_NAME}.iso ${DEPLOYDIR} - install -m 644 ${WORKDIR}/${IMAGE_LINK_NAME}.wic ${DEPLOYDIR} -} - -addtask image before do_install -addtask deploy after do_install before do_image_complete - -# Post-process commands may write to IMGDEPLOYDIR -IMGDEPLOYDIR = "${DEPLOY_DIR_IMAGE}" - -python do_image_complete() { - # Run the image post-process commands - from oe.utils import execute_pre_post_process - post_process_cmds = d.getVar("IMAGE_POSTPROCESS_COMMAND") - execute_pre_post_process(d, post_process_cmds) - - if d.getVar('DISTRO_UNATTENDED_INST_TESTS') == "1": - # Ensure an empty rootfs manifest exists (required by testimage) - fname = os.path.join(d.getVar('IMGDEPLOYDIR'), d.getVar('IMAGE_LINK_NAME') + ".manifest") - open(fname, 'w').close() -} - -do_image_complete[nostamp] = "1" -addtask image_complete after do_deploy before do_build - -do_install[depends] += "arm-systemready-firmware:do_image_complete" diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/files/unattended-boot-conf/Debian/preseed.cfg b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/files/unattended-boot-conf/Debian/preseed.cfg deleted file mode 100755 index 47a38c2bb3..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/files/unattended-boot-conf/Debian/preseed.cfg +++ /dev/null @@ -1,75 +0,0 @@ -# Preconfiguration file for Debian unattended installation - -# Enable auto mode -d-i auto-install/enable boolean true -d-i debconf/priority select critical - -# Set language, country and locale -d-i debian-installer/language string en -d-i debian-installer/country string GB -d-i debian-installer/locale string en_GB.UTF-8 -d-i keyboard-configuration/xkb-keymap select us - -# Set clock and timezone -d-i clock-setup/utc boolean true -d-i time/zone select Europe/London - -# Skip installing recommended packages -d-i base-installer/install-recommends boolean false - -# Set user and password -d-i passwd/root-login boolean false -d-i passwd/user-fullname string user -d-i passwd/username string user -d-i passwd/user-password password unsafe -d-i passwd/user-password-again password unsafe - -# Disable CD-ROM and set mirror -d-i apt-setup/cdrom/set-first boolean false -d-i mirror/country string manual NO -d-i mirror/http/proxy string - -# Disable mirror selection -d-i apt-setup/no_mirror boolean true -d-i popularity-contest/participate boolean false - -# Skip package selection and upgrades -d-i pkgsel/run_tasksel boolean false -d-i pkgsel/upgrade select none - -# Ensure the 'dbus' package is installed -d-i pkgsel/include string dbus - -# Set host and domain names -d-i netcfg/get_hostname string debtest -d-i netcfg/get_domain string unassigned-domain - -# Partitioning -d-i partman-auto/disk string /dev/vda -d-i partman-auto/init_automatically_partition select Guided - use entire disk -d-i partman-auto/choose_recipe select All files in one partition (recommended for new users) -d-i partman-auto/method string regular -d-i partman/confirm_write_new_label boolean true -d-i partman/choose_partition select finish -d-i partman/confirm boolean true -d-i partman/confirm_nooverwrite boolean true - -# Install GRUB bootloader -d-i grub-installer/only_debian boolean true -d-i grub-installer/bootdev string /dev/vda -d-i grub-installer/bootloader-id string debian -d-i grub-installer/efi-directory string /boot/efi - -# Handle errors automatically -d-i debian-installer/exit-on-error boolean true - -# Late command to install GRUB and finalize boot setup -d-i preseed/late_command string \ - mount /dev/vda1 /target/boot/efi || true; \ - in-target mkdir -p /boot/efi/EFI/boot || true; \ - in-target grub-install --target=arm64-efi --efi-directory=/boot/efi --bootloader-id=debian --removable || true; \ - in-target update-grub || true; \ - umount /target/boot/efi || true - -# Reboot after installation -d-i finish-install/reboot_in_progress note diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/files/unattended-boot-conf/Fedora/ks.cfg b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/files/unattended-boot-conf/Fedora/ks.cfg deleted file mode 100644 index f8ea3bc678..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/files/unattended-boot-conf/Fedora/ks.cfg +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Anaconda 39.32.6 -# Generated by pykickstart v3.48 -#version=DEVEL -# Use text mode install -text - -# Keyboard layouts -keyboard --vckeymap=us --xlayouts='us' -# System language -lang en_GB.UTF-8 - -# Use CDROM installation media -cdrom - -%packages --excludedocs --ignoremissing -@core --nodefaults - -%end - -# Run the Setup Agent on first boot -firstboot --enable -# Do not configure the X Window System -skipx - -# System bootloader configuration -bootloader --location=mbr --boot-drive=vda -autopart -# Partition clearing information -clearpart --all --initlabel --drives=vda - -# System timezone -timezone Europe/London --utc - -# Root password -rootpw --lock -user --groups=wheel --name=user --password=unsafe --gecos="usr1" - -# Reboot after installation with an attempt to eject the installation media -reboot --eject diff --git a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/files/unattended-boot-conf/openSUSE/autoinst.xml b/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/files/unattended-boot-conf/openSUSE/autoinst.xml deleted file mode 100755 index 8da6e1cbad..0000000000 --- a/meta-arm-systemready/recipes-test/arm-systemready-linux-distros/files/unattended-boot-conf/openSUSE/autoinst.xml +++ /dev/null @@ -1,935 +0,0 @@ - - - - - - splash=silent preempt=full mitigations=auto quiet security=apparmor - auto - auto - false - true - true - gfxterm - 8 - true - - grub2-efi - - - public - true - off - true - - - Unsolicited incoming network packets are rejected. Incoming packets that are related to outgoing network connections are accepted. Outgoing network connections are allowed. - - false - block - - - - Block - %%REJECT%% - - - For computers in your demilitarized zone that are publicly-accessible with limited access to your internal network. Only selected incoming connections are accepted. - - false - dmz - - - - ssh - - DMZ - default - - - All network connections are accepted. - - docker0 - - false - docker - - - - docker - ACCEPT - - - Unsolicited incoming network packets are dropped. Incoming packets that are related to outgoing network connections are accepted. Outgoing network connections are allowed. - - false - drop - - - - Drop - DROP - - - For use on external networks. You do not trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted. - - true - external - - - - ssh - - External - default - - - For use in home areas. You mostly trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted. - - false - home - - - - dhcpv6-client - mdns - samba-client - ssh - - Home - default - - - For use on internal networks. You mostly trust the other computers on the networks to not harm your computer. Only selected incoming connections are accepted. - - false - internal - - - - dhcpv6-client - mdns - samba-client - ssh - - Internal - default - - - For use in public areas. You do not trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted. - - eth0 - - false - public - - - - dhcpv6-client - ssh - - Public - default - - - All network connections are accepted. - - false - trusted - - - - Trusted - ACCEPT - - - For use in work areas. You mostly trust the other computers on networks to not harm your computer. Only selected incoming connections are accepted. - - false - work - - - - dhcpv6-client - ssh - - Work - default - - - - - - false - - - - - 100 - users - - - - 499 - messagebus - - - - 1 - bin - daemon - - - 488 - input - - - - 495 - kmem - - - - 493 - utmp - - - - 62 - man - - - - 477 - polkitd - - - - 479 - systemd-timesync - - - - 2 - daemon - - - - 480 - systemd-network - - - - 71 - ntadmin - - - - 490 - dialout - - - - 59 - maildrop - postfix - - - 478 - nscd - - - - 51 - postfix - - - - 485 - tape - - - - 487 - render - - - - 476 - sshd - - - - 491 - cdrom - - - - 486 - sgx - - - - 0 - root - - - - 489 - disk - - - - 15 - shadow - - - - 484 - video - - - - 496 - wheel - - - - 483 - audit - - - - 498 - mail - postfix - - - 5 - tty - - - - 65533 - nogroup - - - - 65534 - nobody - - - - 497 - lp - - - - 482 - chrony - - - - 492 - audio - - - - 494 - lock - - - - 36 - kvm - - - - 42 - trusted - - - - 481 - systemd-journal - - - - - - - 127.0.0.1 - - localhost - - - - ::1 - - localhost ipv6-localhost ipv6-loopback - - - - fe00::0 - - ipv6-localnet - - - - ff00::0 - - ipv6-mcastprefix - - - - ff02::1 - - ipv6-allnodes - - - - ff02::2 - - ipv6-allrouters - - - - ff02::3 - - ipv6-allhosts - - - - - - en_GB - en_GB - - - - - AUTO - - - true - localhost - auto - - - - dhcp - eth0 - auto - public - - - true - true - false - - false - false - - - - auto - - systemd - - - - /dev/vda - gpt - false - - - true - vfat - true - utf8 - /boot/efi - uuid - 259 - 1 - false - 134217728 - - - true - true - btrfs - true - / - uuid - 131 - 2 - false - false - 6307167744 - - - false - var - - - true - usr/local - - - true - tmp - - - true - srv - - - true - root - - - true - opt - - - true - home - - - true - boot/grub2/arm64-efi - - - @ - - - CT_DISK - all - - - - false - - - multi-user - - - YaST2-Firstboot - YaST2-Second-Stage - apparmor - auditd - klog - chronyd - cron - cups - firewalld - wickedd-auto4 - wickedd-dhcp4 - wickedd-dhcp6 - wickedd-nanny - irqbalance - issue-generator - kbdsettings - wicked - nscd - postfix - purge-kernels - rsyslog - smartd - sshd - systemd-pstore - systemd-remount-fs - - - - - true - - - wicked - shim - os-prober - openssh - openSUSE-release - mokutil - kexec-tools - grub2-arm64-efi - glibc - firewalld - e2fsprogs - dosfstools - chrony - btrfsprogs - autoyast2 - - - apparmor - base - documentation - enhanced_base - minimal_base - sw_management - yast2_basis - - - Leap - - - - false - false - - - - 100 - /home - -1 - /bin/bash - 022 - - - - - true - user - 100 - /home/user - false - - - - - 99999 - 0 - 7 - - /bin/bash - 1000 - $6$WV8CB/c6j0zhAi5S$4euhbt4alH7WNfaatS9IJgPiiKDJ48d5Ru1zCZCA0N9GiyOPuefN2PAUWlyYeTgqAInpyvPh1frdp4fFVjvEn0 - user - - - true - User for nscd - 478 - /run/nscd - false - - - - - - - - - /sbin/nologin - 478 - ! - nscd - - - true - systemd Network Management - 480 - / - false - - - - - - - - - /usr/sbin/nologin - 480 - !* - systemd-network - - - true - Daemon - 2 - /sbin - false - - - - - - - - - /usr/sbin/nologin - 2 - ! - daemon - - - true - systemd Time Synchronization - 479 - / - false - - - - - - - - - /usr/sbin/nologin - 479 - !* - systemd-timesync - - - true - user for rpcbind - 65534 - /var/lib/empty - false - - - - - - - - - /sbin/nologin - 475 - ! - rpc - - - true - SSH daemon - 476 - /var/lib/sshd - false - - - - - - - - - /usr/sbin/nologin - 476 - ! - sshd - - - true - Postfix Daemon - 51 - /var/spool/postfix - false - - - - - - - - - /usr/sbin/nologin - 51 - ! - postfix - - - true - NFS statd daemon - 65533 - /var/lib/nfs - false - - - - - - - - - /sbin/nologin - 474 - ! - statd - - - true - bin - 1 - /bin - false - - - - - - - - - /usr/sbin/nologin - 1 - ! - bin - - - - true - root - 0 - /root - false - - - - - - - - - /bin/bash - 0 - $6$zAe5W7gw/kja9aKy$mM.BWtNyjalXrDNig4CUfN3bgfmehUIs8.zvBwWn1XroK104G.rY3lyup3OH8TujieUmgO4J74Df.LktV4A1K1 - root - - - true - User for D-Bus - 499 - /run/dbus - false - - - - - - - - - /usr/bin/false - 499 - ! - messagebus - - - true - Manual pages viewer - 62 - /var/lib/empty - false - - - - - - - - - /usr/sbin/nologin - 13 - ! - man - - - true - Printing daemon - 497 - /var/spool/lpd - false - - - - - - - - - /usr/sbin/nologin - 497 - ! - lp - - - true - User for polkitd - 477 - /var/lib/polkit - false - - - - - - - - - /usr/sbin/nologin - 477 - ! - polkitd - - - true - Chrony Daemon - 482 - /var/lib/chrony - false - - - - - - - - - /usr/sbin/nologin - 496 - ! - chrony - - - true - nobody - 65534 - /var/lib/nobody - false - - - - - - - - - /bin/bash - 65534 - ! - nobody - - - true - Mailer daemon - 498 - /var/spool/clientmqueue - false - - - - - - - - - /usr/sbin/nologin - 498 - ! - mail - - -