| Message ID | 20240829163209.47945-3-javier.tia@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | qemuarm64-secureboot: Add UEFI Secure Boot | expand |
On Thu, Aug 29, 2024 at 10:31:58AM -0600, Javier Tia wrote: > - Use efi-disk-no-swap.wks.in disk definition to add expected UEFI disk > partitions configuration. > > Signed-off-by: Javier Tia <javier.tia@linaro.org> > --- > ci/qemuarm64-secureboot.yml | 6 +++--- > .../images/core-image-minimal-uefi-secureboot.inc | 1 + > meta-arm/recipes-core/images/core-image-minimal.bbappend | 1 + > 3 files changed, 5 insertions(+), 3 deletions(-) > create mode 100644 meta-arm/recipes-core/images/core-image-minimal-uefi-secureboot.inc > create mode 100644 meta-arm/recipes-core/images/core-image-minimal.bbappend > > diff --git a/ci/qemuarm64-secureboot.yml b/ci/qemuarm64-secureboot.yml > index b26941e0..fdde1e79 100644 > --- a/ci/qemuarm64-secureboot.yml > +++ b/ci/qemuarm64-secureboot.yml > @@ -7,10 +7,10 @@ header: > > machine: qemuarm64-secureboot > > -target: > - - core-image-base > - > local_conf_header: > optee: | > IMAGE_INSTALL:append = " optee-test optee-client optee-os-ta" > TEST_SUITES:append = " optee ftpm" > + > +target: > + - core-image-minimal > diff --git a/meta-arm/recipes-core/images/core-image-minimal-uefi-secureboot.inc b/meta-arm/recipes-core/images/core-image-minimal-uefi-secureboot.inc > new file mode 100644 > index 00000000..351e9030 > --- /dev/null > +++ b/meta-arm/recipes-core/images/core-image-minimal-uefi-secureboot.inc > @@ -0,0 +1 @@ > +WKS_FILE = "efi-disk-no-swap.wks.in" > diff --git a/meta-arm/recipes-core/images/core-image-minimal.bbappend b/meta-arm/recipes-core/images/core-image-minimal.bbappend > new file mode 100644 > index 00000000..46c00f00 > --- /dev/null > +++ b/meta-arm/recipes-core/images/core-image-minimal.bbappend > @@ -0,0 +1 @@ > +require ${@bb.utils.contains('MACHINE_FEATURES', 'uefi-secureboot', 'core-image-minimal-uefi-secureboot.inc', '', d)} I don't think we want to do this. This will only work with minimal images (so no sato/graphics). We're losing some of the package testing we get on this unique machine because we're now minimal image. This seems like it is just adding the WKS file, which should be part of the machine config. Thanks, Jon > \ No newline at end of file > -- > 2.46.0 > >
diff --git a/ci/qemuarm64-secureboot.yml b/ci/qemuarm64-secureboot.yml index b26941e0..fdde1e79 100644 --- a/ci/qemuarm64-secureboot.yml +++ b/ci/qemuarm64-secureboot.yml @@ -7,10 +7,10 @@ header: machine: qemuarm64-secureboot -target: - - core-image-base - local_conf_header: optee: | IMAGE_INSTALL:append = " optee-test optee-client optee-os-ta" TEST_SUITES:append = " optee ftpm" + +target: + - core-image-minimal diff --git a/meta-arm/recipes-core/images/core-image-minimal-uefi-secureboot.inc b/meta-arm/recipes-core/images/core-image-minimal-uefi-secureboot.inc new file mode 100644 index 00000000..351e9030 --- /dev/null +++ b/meta-arm/recipes-core/images/core-image-minimal-uefi-secureboot.inc @@ -0,0 +1 @@ +WKS_FILE = "efi-disk-no-swap.wks.in" diff --git a/meta-arm/recipes-core/images/core-image-minimal.bbappend b/meta-arm/recipes-core/images/core-image-minimal.bbappend new file mode 100644 index 00000000..46c00f00 --- /dev/null +++ b/meta-arm/recipes-core/images/core-image-minimal.bbappend @@ -0,0 +1 @@ +require ${@bb.utils.contains('MACHINE_FEATURES', 'uefi-secureboot', 'core-image-minimal-uefi-secureboot.inc', '', d)} \ No newline at end of file
- Use efi-disk-no-swap.wks.in disk definition to add expected UEFI disk partitions configuration. Signed-off-by: Javier Tia <javier.tia@linaro.org> --- ci/qemuarm64-secureboot.yml | 6 +++--- .../images/core-image-minimal-uefi-secureboot.inc | 1 + meta-arm/recipes-core/images/core-image-minimal.bbappend | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 meta-arm/recipes-core/images/core-image-minimal-uefi-secureboot.inc create mode 100644 meta-arm/recipes-core/images/core-image-minimal.bbappend