Skip to content

Commit 48187e0

Browse files
chetan-rathorechetan-rathore
authored
Merge pull request #54 from chetan-rathore/LatestRel2
Updates for SystemReady v23.01_SR_REL2.0.0_BETA-0_ES_REL_1.2.0 release
2 parents e6bd424 + 03115a5 commit 48187e0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1144
-293
lines changed

‎ES/README.md‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ SystemReady Embedded Server (ES) is a band of system certification in the Arm Sy
66

77
SystemReady ES-certified platforms implement a minimum set of hardware and firmware features that an operating system can depend on to deploy the operating system image. Compliant systems must conform to the:
88
* [Base System Architecture (BSA) specification](https://developer.arm.com/documentation/den0094/latest)
9-
* SBBR recipe of the [Base Boot Requirements (BBR) specification](https://developer.arm.com/documentation/den0044/latest)
9+
* SBBR recipe of the [Base Boot Requirements (BBR) specification](https://developer.arm.com/documentation/den0044/f/?lang=en)
1010
* The SystemReady ES certification and testing requirements are specified in the [Arm SystemReady Requirements Specification (SRS)](https://developer.arm.com/documentation/den0109/latest)
1111

1212
This section contains the build scripts and the live-images for the SystemReady ES Band.
1313

1414
## Release details
15-
- Code Quality: v1.1.0
16-
- **The latest pre-built release of ACS is available for download here: [v22.10_1.1.0](prebuilt_images/v22.10_1.1.0)**
15+
- Code Quality: v1.2.0
16+
- **The latest pre-built release of ACS is available for download here: [v23.01_1.2.0](prebuilt_images/v23.01_1.2.0)**
1717
- The BSA tests are written for version 1.0 of the BSA specification.
1818
- The BBR tests are written for version 1.0 of the BBR specification.
1919
- The compliance suite is not a substitute for design verification.
@@ -34,7 +34,7 @@ This section contains the build scripts and the live-images for the SystemReady
3434
- The prebuilt images are archived after compression to the .xz format. On Linux, use the xz utility to uncompress the image `xz -d es_acs_live_image.img.xz`. On Windows, use the 7zip or a similar utility.
3535
- If you choose to use the prebuilt image, skip the build steps, and navigate to the "Verification" section below.
3636

37-
Note: The latest pre-built image contains Linux kernel version 5.13. To build a image with a different Linux kernel version, update the `LINUX_KERNEL_VERSION` in the configuration file `<path to arm-systemready>/common/config/common_config.cfg` before the build (after step 3 below). To see the list of kernel versions for which Linux BSA patches are available, see the [folder](https://gitlab.arm.com/linux-arm/linux-acs/-/tree/master/kernel/src)
37+
Note: The latest pre-built image contains Linux kernel version 6.0. To build a image with a different Linux kernel version, update the `LINUX_KERNEL_VERSION` in the configuration file `<path to arm-systemready>/common/config/common_config.cfg` before the build (after step 3 below). To see the list of kernel versions for which Linux BSA patches are available, see the [folder](https://gitlab.arm.com/linux-arm/linux-acs/-/tree/master/kernel/src)
3838

3939
### Prerequisites
4040
Before starting the ACS build, ensure that the following requirements are met:
@@ -60,7 +60,7 @@ Before starting the ACS build, ensure that the following requirements are met:
6060
5. If all the above steps are successful, then the bootable image will be available at **/path-to-arm-systemready/ES/scripts/output/es_acs_live_image.img.xz**
6161

6262
Note: The image is generated in a compressed (.xz) format. The image must be uncompressed before it is used.<br />
63-
Note: For the build instructions of the Security Interface Extension ACS, refer to the [SIE README](./../SIE//README.md) for further details.<br />
63+
6464

6565
## Build output
6666
This image comprises of two FAT file system partitions recognized by UEFI: <br />
@@ -127,19 +127,24 @@ The live image boots to UEFI Shell. The different test applications can be run i
127127
1. [SCT tests](https://github.com/ARM-software/bbr-acs/blob/main/README.md) for BBR compliance.
128128
2. [UEFI Shell application](https://github.com/ARM-software/bsa-acs/blob/main/README.md) for BSA compliance.
129129
3. [FWTS tests](https://github.com/ARM-software/bbr-acs/blob/main/README.md) for BBR compliance.
130-
4. [OS tests](https://github.com/ARM-software/bsa-acs/blob/main/README.md) for Linux BSA compliance. <br />
131-
Note: To skip FWTS and OS tests for debugging, append "noacs" to the Linux command by editing the "Linux Boot" option in the grub menu during image boot.<br />
132-
To start an extended run of UEFI-SCT append "-nostartup startup.nsh sct_extd" to the shell.efi command by editing the "bbr/bsa" option in the grub menu during image boot.<br />
130+
4. [OS tests](https://github.com/ARM-software/bsa-acs/blob/main/README.md) for Linux BSA compliance.
131+
Note: To skip FWTS and OS tests for debugging, append "noacs" to the Linux command by editing the "Linux Boot" option in the grub menu during image boot.
132+
To start an extended run of UEFI-SCT append "-nostartup startup.nsh sct_extd" to the shell.efi command by editing the "bbr/bsa" option in the grub menu during image boot.
133+
134+
### Running Security interface extension (SIE) ACS components.
135+
Now SIE ACS is integrated with ES ACS image, which can be accessed through GRUB options.
136+
137+
For the verification steps of SIE ACS on QEMU with TPM support, refer to the [SIE ACS Verification](../common/docs/SIE_ACS_Verification.md).
133138

134139
## Baselines for Open Source Software in this release:
135140

136-
- [Firmware Test Suite (FWTS)](http://kernel.ubuntu.com/git/hwe/fwts.git) TAG: v22.09.00
141+
- [Firmware Test Suite (FWTS)](http://kernel.ubuntu.com/git/hwe/fwts.git) TAG: v22.11.00
137142

138-
- [Base System Architecture (BSA)](https://github.com/ARM-software/bsa-acs) TAG: v22.10_REL1.0.2
143+
- [Base System Architecture (BSA)](https://github.com/ARM-software/bsa-acs) TAG: v23.01_REL1.0.3
139144

140-
- [Base Boot Requirements (BBR)](https://github.com/ARM-software/bbr-acs) TAG: : v22.10_REL1.1.0
145+
- [Base Boot Requirements (BBR)](https://github.com/ARM-software/bbr-acs) TAG: : v23.01_SR_REL2.0.0_BETA-0_ES_REL_1.2.0
141146

142-
- [UEFI Self Certification Tests (UEFI-SCT)](https://github.com/tianocore/edk2-test) TAG: f628bec2193da1f9402ef749fbca50f61c812d6f
147+
- [UEFI Self Certification Tests (UEFI-SCT)](https://github.com/tianocore/edk2-test) TAG: 06f84debb796b2f6ac893b130e90ab5599195b29
143148

144149

145150

@@ -158,5 +163,5 @@ System Ready ACS is distributed under Apache v2.0 License.
158163

159164
--------------
160165

161-
*Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.*
166+
*Copyright (c) 2021-2023, Arm Limited and Contributors. All rights reserved.*
162167

‎ES/scripts/build-scripts/build-es-live-image.sh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright (c) 2021, ARM Limited and Contributors. All rights reserved.
3+
# Copyright (c) 2021-2023, ARM Limited and Contributors. All rights reserved.
44
#
55
# Redistribution and use in source and binary forms, with or without
66
# modification, are permitted provided that the following conditions are met:
@@ -38,13 +38,15 @@ create_scripts_link()
3838
ln -s $TOP_DIR/../../common/scripts/build-linux.sh $TOP_DIR/build-scripts/build-linux.sh
3939
ln -s $TOP_DIR/../../common/scripts/build-linux-bsa.sh $TOP_DIR/build-scripts/build-linux-bsa.sh
4040
ln -s $TOP_DIR/../../common/scripts/build-grub.sh $TOP_DIR/build-scripts/build-grub.sh
41-
ln -s $TOP_DIR/../../common/scripts/build-busybox.sh $TOP_DIR/build-scripts/build-busybox.sh
41+
ln -s $TOP_DIR/../../common/scripts/build-buildroot.sh $TOP_DIR/build-scripts/build-buildroot.sh
4242
ln -s $TOP_DIR/../../common/scripts/framework.sh $TOP_DIR/build-scripts/framework.sh
4343
ln -s $TOP_DIR/../../common/scripts/parse_params.sh $TOP_DIR/build-scripts/parse_params.sh
4444
ln -s $TOP_DIR/../../common/scripts/make_image.sh $TOP_DIR/build-scripts/make_image.sh
4545
ln -s $TOP_DIR/bbr-acs/common/scripts/build-sct.sh $TOP_DIR/build-scripts/build-sct.sh
46-
ln -s $TOP_DIR/bbr-acs/common/scripts/build-fwts.sh $TOP_DIR/build-scripts/build-fwts.sh
46+
4747
ln -s $TOP_DIR/bbr-acs/common/scripts/build-uefi-apps.sh $TOP_DIR/build-scripts/build-uefi-apps.sh
48+
ln -s $TOP_DIR/../../common/scripts/build-efitools.sh $TOP_DIR/build-scripts/build-efitools.sh
49+
ln -s $TOP_DIR/../../common/scripts/build-sie-keys.sh $TOP_DIR/build-scripts/build-sie-keys.sh
4850
}
4951

5052
init_dir()
@@ -53,6 +55,7 @@ init_dir()
5355
rm -rf $TOP_DIR/build-scripts/config
5456
cp -r $TOP_DIR/../../common/ramdisk $TOP_DIR
5557
cp -r $TOP_DIR/../../common/config $TOP_DIR/build-scripts
58+
mkdir -p $TOP_DIR/output
5659
}
5760

5861
create_scripts_link

‎IR/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,5 @@ System Ready ACS is distributed under Apache v2.0 License.
142142

143143
--------------
144144

145-
*Copyright (c) 2021-2022, Arm Limited and Contributors. All rights reserved.*
145+
*Copyright (c) 2021-2023, Arm Limited and Contributors. All rights reserved.*
146146

‎IR/Yocto/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ The live image boots to UEFI Shell. The different test applications can be run i
116116
2. [UEFI Shell application](https://github.com/ARM-software/bsa-acs/blob/main/README.md) for BSA compliance.
117117
3. [FWTS tests](https://github.com/ARM-software/bbr-acs/blob/main/README.md) for BBR compliance.
118118

119-
For the verification steps of SIE ACS on QEMU with TPM support, refer to the [SIE ACS Verification](SIE_ACS_Verification.md).
119+
### Running Security interface extension (SIE) ACS.
120+
121+
For the verification steps of SIE ACS on QEMU with TPM support, refer to the [SIE ACS Verification](../../common/docs/SIE_ACS_Verification.md).
120122

121123
## Baselines for Open Source Software in this release:
122124

@@ -145,5 +147,5 @@ System Ready ACS is distributed under Apache v2.0 License.
145147

146148
--------------
147149

148-
*Copyright (c) 2022, Arm Limited and Contributors. All rights reserved.*
150+
*Copyright (c) 2022-2023, Arm Limited and Contributors. All rights reserved.*
149151

‎IR/Yocto/build-scripts/get_source.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright (c) 2022, ARM Limited and Contributors. All rights reserved.
3+
# Copyright (c) 2022-2023, ARM Limited and Contributors. All rights reserved.
44
#
55
# Redistribution and use in source and binary forms, with or without
66
# modification, are permitted provided that the following conditions are met:
@@ -48,7 +48,8 @@ export GIT_SSL_NO_VERIFY=1
4848
sudo apt install git curl mtools gdisk gcc liblz4-tool zstd \
4949
openssl automake autotools-dev libtool bison flex \
5050
bc uuid-dev python3 libglib2.0-dev libssl-dev autopoint \
51-
make gcc g++ python gnu-efi libfile-slurp-perl help2man
51+
make gcc g++ python gnu-efi libfile-slurp-perl help2man \
52+
python3-pip chrpath diffstat -y
5253

5354
sudo pip3 install kas
5455

‎IR/Yocto/meta-woden/recipes-acs/ebbr-sct/ebbr-sct.bb‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@ do_configure() {
4040
cp -r ${SBBR_TEST_DIR}/SbbrBootServices uefi-sct/SctPkg/TestCase/UEFI/EFI/BootServices/
4141
cp -r ${SBBR_TEST_DIR}/SbbrEfiSpecVerLvl ${SBBR_TEST_DIR}/SbbrRequiredUefiProtocols ${SBBR_TEST_DIR}/SbbrSmbios ${SBBR_TEST_DIR}/SbbrSysEnvConfig uefi-sct/SctPkg/TestCase/UEFI/EFI/Generic/
4242
cp -r ${SBBR_TEST_DIR}/SBBRRuntimeServices uefi-sct/SctPkg/TestCase/UEFI/EFI/RuntimeServices/
43-
# This code shall be updated to the commented code when SIE ACS is integrated to SR and ES images
44-
#cp ${SBBR_TEST_DIR}/BBR_SCT.dsc uefi-sct/SctPkg/UEFI/
45-
cp ${S}/BBR_SCT.dsc uefi-sct/SctPkg/UEFI/
43+
cp ${SBBR_TEST_DIR}/BBR_SCT.dsc uefi-sct/SctPkg/UEFI/
4644
cp ${SBBR_TEST_DIR}/build_bbr.sh uefi-sct/SctPkg/
4745
cp ${S}/bbr-acs/ebbr/config/EfiCompliant_EBBR.ini uefi-sct/SctPkg/UEFI/
4846

‎IR/Yocto/meta-woden/recipes-acs/install-files/files/init.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
# Copyright (c) 2022, ARM Limited and Contributors. All rights reserved.
3+
# Copyright (c) 2022-2023, ARM Limited and Contributors. All rights reserved.
44
#
55
# Redistribution and use in source and binary forms, with or without
66
# modification, are permitted provided that the following conditions are met:
@@ -135,7 +135,7 @@ if [ -f /sys/firmware/fdt ]; then
135135

136136
sed -i '1s/^/DeviceTree bindings of Linux kernel version: 5.19.10 \ndtschema version: 2022.9 \n\n/' /mnt/acs_results/linux_tools/dt-validate.log
137137
if [ ! -s /mnt/acs_results/linux_tools/dt-validate.log ]; then
138-
echo $'The FDT is compliant according to schema ' >> /mnt/acs_results/linux_tools/dt-validate.log
138+
echo $'The FDT is compliant according to schema ' >> /mnt/acs_results/linux_tools/dt-validate.log
139139
fi
140140
else
141141
echo $'Error: The FDT devicetree file ,fdt , does not exist at /sys/firmware/fdt. Cannot run dt-schema tool ' | tee /mnt/acs_results/linux_tools/dt-validate.log

‎IR/scripts/build-scripts/build-ir-live-image.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright (c) 2021, ARM Limited and Contributors. All rights reserved.
3+
# Copyright (c) 2021-2023, ARM Limited and Contributors. All rights reserved.
44
#
55
# Redistribution and use in source and binary forms, with or without
66
# modification, are permitted provided that the following conditions are met:
@@ -45,14 +45,17 @@ create_scripts_link()
4545
ln -s $TOP_DIR/bbr-acs/common/scripts/build-sct.sh $TOP_DIR/build-scripts/build-sct.sh
4646
ln -s $TOP_DIR/bbr-acs/common/scripts/build-fwts.sh $TOP_DIR/build-scripts/build-fwts.sh
4747
ln -s $TOP_DIR/bbr-acs/common/scripts/build-uefi-apps.sh $TOP_DIR/build-scripts/build-uefi-apps.sh
48+
ln -s $TOP_DIR/../../common/scripts/build-efitools.sh $TOP_DIR/build-scripts/build-efitools.sh
49+
ln -s $TOP_DIR/../../common/scripts/build-sie-keys.sh $TOP_DIR/build-scripts/build-sie-keys.sh
4850
}
4951

5052
init_dir()
5153
{
5254
rm -rf $TOP_DIR/ramdisk
5355
rm -rf $TOP_DIR/build-scripts/config
5456
cp -r $TOP_DIR/../../common/ramdisk $TOP_DIR
55-
cp -r $TOP_DIR/../../common/config $TOP_DIR/build-scripts
57+
cp -r $TOP_DIR/../../common/config $TOP_DIR/build-scripts
58+
mkdir -p $TOP_DIR/output
5659
}
5760

5861
create_scripts_link

‎SIE/scripts/build-scripts/build-security-extension-live-image.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
# Copyright (c) 2021, ARM Limited and Contributors. All rights reserved.
3+
# Copyright (c) 2021-2023, ARM Limited and Contributors. All rights reserved.
44
#
55
# Redistribution and use in source and binary forms, with or without
66
# modification, are permitted provided that the following conditions are met:
@@ -39,7 +39,7 @@ create_scripts_link()
3939
ln -s $TOP_DIR/../../common/scripts/framework.sh $TOP_DIR/build-scripts/framework.sh
4040
ln -s $TOP_DIR/../../common/scripts/parse_params.sh $TOP_DIR/build-scripts/parse_params.sh
4141
ln -s $TOP_DIR/../../common/scripts/make_image_sie.sh $TOP_DIR/build-scripts/make_image_sie.sh
42-
ln -s $TOP_DIR/../../common/scripts/build-buildroot.sh $TOP_DIR/build-scripts/build-buildroot.sh
42+
ln -s $TOP_DIR/../../common/scripts/build-buildroot-sie.sh $TOP_DIR/build-scripts/build-buildroot-sie.sh
4343
ln -s $TOP_DIR/../../common/scripts/build-sie-keys.sh $TOP_DIR/build-scripts/build-sie-keys.sh
4444
ln -s $TOP_DIR/bbr-acs/common/scripts/build-sct.sh $TOP_DIR/build-scripts/build-sct.sh
4545
ln -s $TOP_DIR/bbr-acs/common/scripts/build-uefi-apps.sh $TOP_DIR/build-scripts/build-uefi-apps.sh

‎SIE/scripts/build-scripts/config/grub-initial.cfg‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Enforce that all loaded files must have a valid signature.
2-
set check_signatures=enforce
3-
export check_signatures
41

52
# set $root to the filesystem labeled "BOOT"
63
search --label --set=root BOOT

0 commit comments

Comments
 (0)