From e49374824fe4ff6ab3a7ea929e3daf7a73414988 Mon Sep 17 00:00:00 2001 From: Robert Church Date: Mon, 7 Apr 2025 20:38:54 -0500 Subject: [PATCH] Move packages into compliant distro/codename hierarchy This is a few tests of using the new distro/codename packaging hierarchy. Changes include: - Move base/base-passwd/debian to base/base-passwd/debian/bullseye as this patched package is specific to bullseye. Also add 'revision.stx_patch: 9' to meta_data.yaml so that the .stx package version remains consistent. - Move base/systemd-presets/debian to base/systemd-presets/debian/all as this packages should be the same for all flavors of debian. - Move security/efitools/debian to security/efitools/debian/bullseye as this patched package is specific to bullseye. This also tests a package with src_files in the meta_data.yaml and requires an update once the package is relocated. Test Plan: - PASS: stx-init-env --rebuild, downloader, build-pkgs -a, build-image Prototype: Concurrent Builds in master Change-Id: Id64f3619f2d52fb4ab4d1a9238ffe80808807d13 Depends-On: https://review.opendev.org/c/starlingx/root/+/946812 Story: NNNNNNN Task: NNNNN Signed-off-by: Robert Church Signed-off-by: Scott Little --- base/base-passwd/debian/{ => bullseye}/meta_data.yaml | 1 + .../{ => bullseye}/patches/0001-Change-group-passwd.patch | 0 ...2-update-passwd.c-set-walk-to-walk-next-before-removin.patch | 0 base/base-passwd/debian/{ => bullseye}/patches/series | 0 base/systemd-presets/debian/{ => all}/deb_folder/changelog | 0 base/systemd-presets/debian/{ => all}/deb_folder/control | 0 base/systemd-presets/debian/{ => all}/deb_folder/copyright | 0 base/systemd-presets/debian/{ => all}/deb_folder/rules | 0 .../debian/{ => all}/deb_folder/systemd-presets.install | 0 base/systemd-presets/debian/{ => all}/meta_data.yaml | 0 .../{ => bullseye}/deb_patches/0001-efitools-prepare-keys.patch | 0 ...002-efitools-append-Microsoft-KEK-DB-to-built-in-certs.patch | 0 security/efitools/debian/{ => bullseye}/deb_patches/series | 0 security/efitools/debian/{ => bullseye}/meta_data.yaml | 2 +- .../patches/0001-LockDown-add-system-warm-reset.patch | 0 ...002-LockDown-show-the-error-message-with-3-sec-timeout.patch | 0 .../patches/0003-Makefile-do-not-build-signed-efi-image.patch | 0 .../0004-LockDown-disable-the-entrance-into-BIOS-setup.patch | 0 .../patches/0005-do-not-remove-ms-uefi.esl-ms-kek.esl.patch | 0 security/efitools/debian/{ => bullseye}/patches/series | 0 security/efitools/debian/{ => bullseye}/uefi_sb_keys/DB.crt | 0 security/efitools/debian/{ => bullseye}/uefi_sb_keys/DB.key | 0 security/efitools/debian/{ => bullseye}/uefi_sb_keys/KEK.crt | 0 security/efitools/debian/{ => bullseye}/uefi_sb_keys/KEK.key | 0 security/efitools/debian/{ => bullseye}/uefi_sb_keys/PK.crt | 0 security/efitools/debian/{ => bullseye}/uefi_sb_keys/PK.key | 0 security/efitools/debian/{ => bullseye}/uefi_sb_keys/ms-DB.crt | 0 security/efitools/debian/{ => bullseye}/uefi_sb_keys/ms-KEK.crt | 0 28 files changed, 2 insertions(+), 1 deletion(-) rename base/base-passwd/debian/{ => bullseye}/meta_data.yaml (96%) rename base/base-passwd/debian/{ => bullseye}/patches/0001-Change-group-passwd.patch (100%) rename base/base-passwd/debian/{ => bullseye}/patches/0002-update-passwd.c-set-walk-to-walk-next-before-removin.patch (100%) rename base/base-passwd/debian/{ => bullseye}/patches/series (100%) rename base/systemd-presets/debian/{ => all}/deb_folder/changelog (100%) rename base/systemd-presets/debian/{ => all}/deb_folder/control (100%) rename base/systemd-presets/debian/{ => all}/deb_folder/copyright (100%) rename base/systemd-presets/debian/{ => all}/deb_folder/rules (100%) rename base/systemd-presets/debian/{ => all}/deb_folder/systemd-presets.install (100%) rename base/systemd-presets/debian/{ => all}/meta_data.yaml (100%) rename security/efitools/debian/{ => bullseye}/deb_patches/0001-efitools-prepare-keys.patch (100%) rename security/efitools/debian/{ => bullseye}/deb_patches/0002-efitools-append-Microsoft-KEK-DB-to-built-in-certs.patch (100%) rename security/efitools/debian/{ => bullseye}/deb_patches/series (100%) rename security/efitools/debian/{ => bullseye}/meta_data.yaml (92%) rename security/efitools/debian/{ => bullseye}/patches/0001-LockDown-add-system-warm-reset.patch (100%) rename security/efitools/debian/{ => bullseye}/patches/0002-LockDown-show-the-error-message-with-3-sec-timeout.patch (100%) rename security/efitools/debian/{ => bullseye}/patches/0003-Makefile-do-not-build-signed-efi-image.patch (100%) rename security/efitools/debian/{ => bullseye}/patches/0004-LockDown-disable-the-entrance-into-BIOS-setup.patch (100%) rename security/efitools/debian/{ => bullseye}/patches/0005-do-not-remove-ms-uefi.esl-ms-kek.esl.patch (100%) rename security/efitools/debian/{ => bullseye}/patches/series (100%) rename security/efitools/debian/{ => bullseye}/uefi_sb_keys/DB.crt (100%) rename security/efitools/debian/{ => bullseye}/uefi_sb_keys/DB.key (100%) rename security/efitools/debian/{ => bullseye}/uefi_sb_keys/KEK.crt (100%) rename security/efitools/debian/{ => bullseye}/uefi_sb_keys/KEK.key (100%) rename security/efitools/debian/{ => bullseye}/uefi_sb_keys/PK.crt (100%) rename security/efitools/debian/{ => bullseye}/uefi_sb_keys/PK.key (100%) rename security/efitools/debian/{ => bullseye}/uefi_sb_keys/ms-DB.crt (100%) rename security/efitools/debian/{ => bullseye}/uefi_sb_keys/ms-KEK.crt (100%) diff --git a/base/base-passwd/debian/meta_data.yaml b/base/base-passwd/debian/bullseye/meta_data.yaml similarity index 96% rename from base/base-passwd/debian/meta_data.yaml rename to base/base-passwd/debian/bullseye/meta_data.yaml index 8f69e11c7..4cae83106 100644 --- a/base/base-passwd/debian/meta_data.yaml +++ b/base/base-passwd/debian/bullseye/meta_data.yaml @@ -7,5 +7,6 @@ dl_path: sha256sum: 7dda1771ce9107290fea9fca0c11e69334385d614a7c21cbeb50ce9437dd561f revision: dist: $STX_DIST + stx_patch: 9 GITREVCOUNT: BASE_SRCREV: 9b545c5e197a424d08ed062ca6f11efe7bc824b4 diff --git a/base/base-passwd/debian/patches/0001-Change-group-passwd.patch b/base/base-passwd/debian/bullseye/patches/0001-Change-group-passwd.patch similarity index 100% rename from base/base-passwd/debian/patches/0001-Change-group-passwd.patch rename to base/base-passwd/debian/bullseye/patches/0001-Change-group-passwd.patch diff --git a/base/base-passwd/debian/patches/0002-update-passwd.c-set-walk-to-walk-next-before-removin.patch b/base/base-passwd/debian/bullseye/patches/0002-update-passwd.c-set-walk-to-walk-next-before-removin.patch similarity index 100% rename from base/base-passwd/debian/patches/0002-update-passwd.c-set-walk-to-walk-next-before-removin.patch rename to base/base-passwd/debian/bullseye/patches/0002-update-passwd.c-set-walk-to-walk-next-before-removin.patch diff --git a/base/base-passwd/debian/patches/series b/base/base-passwd/debian/bullseye/patches/series similarity index 100% rename from base/base-passwd/debian/patches/series rename to base/base-passwd/debian/bullseye/patches/series diff --git a/base/systemd-presets/debian/deb_folder/changelog b/base/systemd-presets/debian/all/deb_folder/changelog similarity index 100% rename from base/systemd-presets/debian/deb_folder/changelog rename to base/systemd-presets/debian/all/deb_folder/changelog diff --git a/base/systemd-presets/debian/deb_folder/control b/base/systemd-presets/debian/all/deb_folder/control similarity index 100% rename from base/systemd-presets/debian/deb_folder/control rename to base/systemd-presets/debian/all/deb_folder/control diff --git a/base/systemd-presets/debian/deb_folder/copyright b/base/systemd-presets/debian/all/deb_folder/copyright similarity index 100% rename from base/systemd-presets/debian/deb_folder/copyright rename to base/systemd-presets/debian/all/deb_folder/copyright diff --git a/base/systemd-presets/debian/deb_folder/rules b/base/systemd-presets/debian/all/deb_folder/rules similarity index 100% rename from base/systemd-presets/debian/deb_folder/rules rename to base/systemd-presets/debian/all/deb_folder/rules diff --git a/base/systemd-presets/debian/deb_folder/systemd-presets.install b/base/systemd-presets/debian/all/deb_folder/systemd-presets.install similarity index 100% rename from base/systemd-presets/debian/deb_folder/systemd-presets.install rename to base/systemd-presets/debian/all/deb_folder/systemd-presets.install diff --git a/base/systemd-presets/debian/meta_data.yaml b/base/systemd-presets/debian/all/meta_data.yaml similarity index 100% rename from base/systemd-presets/debian/meta_data.yaml rename to base/systemd-presets/debian/all/meta_data.yaml diff --git a/security/efitools/debian/deb_patches/0001-efitools-prepare-keys.patch b/security/efitools/debian/bullseye/deb_patches/0001-efitools-prepare-keys.patch similarity index 100% rename from security/efitools/debian/deb_patches/0001-efitools-prepare-keys.patch rename to security/efitools/debian/bullseye/deb_patches/0001-efitools-prepare-keys.patch diff --git a/security/efitools/debian/deb_patches/0002-efitools-append-Microsoft-KEK-DB-to-built-in-certs.patch b/security/efitools/debian/bullseye/deb_patches/0002-efitools-append-Microsoft-KEK-DB-to-built-in-certs.patch similarity index 100% rename from security/efitools/debian/deb_patches/0002-efitools-append-Microsoft-KEK-DB-to-built-in-certs.patch rename to security/efitools/debian/bullseye/deb_patches/0002-efitools-append-Microsoft-KEK-DB-to-built-in-certs.patch diff --git a/security/efitools/debian/deb_patches/series b/security/efitools/debian/bullseye/deb_patches/series similarity index 100% rename from security/efitools/debian/deb_patches/series rename to security/efitools/debian/bullseye/deb_patches/series diff --git a/security/efitools/debian/meta_data.yaml b/security/efitools/debian/bullseye/meta_data.yaml similarity index 92% rename from security/efitools/debian/meta_data.yaml rename to security/efitools/debian/bullseye/meta_data.yaml index d3b810744..d793863a2 100644 --- a/security/efitools/debian/meta_data.yaml +++ b/security/efitools/debian/bullseye/meta_data.yaml @@ -8,7 +8,7 @@ dl_path: md5sum: e81aa4822cfcbca81074c9cb07951e75 sha256sum: 69f02c5b588b666075ed4d390655cf3bfe7f7e2daae643423cd052e081e1368a src_files: - - debian/uefi_sb_keys + - debian/bullseye/uefi_sb_keys - ${MY_REPO}/public-keys/tis-boot.crt revision: dist: $STX_DIST diff --git a/security/efitools/debian/patches/0001-LockDown-add-system-warm-reset.patch b/security/efitools/debian/bullseye/patches/0001-LockDown-add-system-warm-reset.patch similarity index 100% rename from security/efitools/debian/patches/0001-LockDown-add-system-warm-reset.patch rename to security/efitools/debian/bullseye/patches/0001-LockDown-add-system-warm-reset.patch diff --git a/security/efitools/debian/patches/0002-LockDown-show-the-error-message-with-3-sec-timeout.patch b/security/efitools/debian/bullseye/patches/0002-LockDown-show-the-error-message-with-3-sec-timeout.patch similarity index 100% rename from security/efitools/debian/patches/0002-LockDown-show-the-error-message-with-3-sec-timeout.patch rename to security/efitools/debian/bullseye/patches/0002-LockDown-show-the-error-message-with-3-sec-timeout.patch diff --git a/security/efitools/debian/patches/0003-Makefile-do-not-build-signed-efi-image.patch b/security/efitools/debian/bullseye/patches/0003-Makefile-do-not-build-signed-efi-image.patch similarity index 100% rename from security/efitools/debian/patches/0003-Makefile-do-not-build-signed-efi-image.patch rename to security/efitools/debian/bullseye/patches/0003-Makefile-do-not-build-signed-efi-image.patch diff --git a/security/efitools/debian/patches/0004-LockDown-disable-the-entrance-into-BIOS-setup.patch b/security/efitools/debian/bullseye/patches/0004-LockDown-disable-the-entrance-into-BIOS-setup.patch similarity index 100% rename from security/efitools/debian/patches/0004-LockDown-disable-the-entrance-into-BIOS-setup.patch rename to security/efitools/debian/bullseye/patches/0004-LockDown-disable-the-entrance-into-BIOS-setup.patch diff --git a/security/efitools/debian/patches/0005-do-not-remove-ms-uefi.esl-ms-kek.esl.patch b/security/efitools/debian/bullseye/patches/0005-do-not-remove-ms-uefi.esl-ms-kek.esl.patch similarity index 100% rename from security/efitools/debian/patches/0005-do-not-remove-ms-uefi.esl-ms-kek.esl.patch rename to security/efitools/debian/bullseye/patches/0005-do-not-remove-ms-uefi.esl-ms-kek.esl.patch diff --git a/security/efitools/debian/patches/series b/security/efitools/debian/bullseye/patches/series similarity index 100% rename from security/efitools/debian/patches/series rename to security/efitools/debian/bullseye/patches/series diff --git a/security/efitools/debian/uefi_sb_keys/DB.crt b/security/efitools/debian/bullseye/uefi_sb_keys/DB.crt similarity index 100% rename from security/efitools/debian/uefi_sb_keys/DB.crt rename to security/efitools/debian/bullseye/uefi_sb_keys/DB.crt diff --git a/security/efitools/debian/uefi_sb_keys/DB.key b/security/efitools/debian/bullseye/uefi_sb_keys/DB.key similarity index 100% rename from security/efitools/debian/uefi_sb_keys/DB.key rename to security/efitools/debian/bullseye/uefi_sb_keys/DB.key diff --git a/security/efitools/debian/uefi_sb_keys/KEK.crt b/security/efitools/debian/bullseye/uefi_sb_keys/KEK.crt similarity index 100% rename from security/efitools/debian/uefi_sb_keys/KEK.crt rename to security/efitools/debian/bullseye/uefi_sb_keys/KEK.crt diff --git a/security/efitools/debian/uefi_sb_keys/KEK.key b/security/efitools/debian/bullseye/uefi_sb_keys/KEK.key similarity index 100% rename from security/efitools/debian/uefi_sb_keys/KEK.key rename to security/efitools/debian/bullseye/uefi_sb_keys/KEK.key diff --git a/security/efitools/debian/uefi_sb_keys/PK.crt b/security/efitools/debian/bullseye/uefi_sb_keys/PK.crt similarity index 100% rename from security/efitools/debian/uefi_sb_keys/PK.crt rename to security/efitools/debian/bullseye/uefi_sb_keys/PK.crt diff --git a/security/efitools/debian/uefi_sb_keys/PK.key b/security/efitools/debian/bullseye/uefi_sb_keys/PK.key similarity index 100% rename from security/efitools/debian/uefi_sb_keys/PK.key rename to security/efitools/debian/bullseye/uefi_sb_keys/PK.key diff --git a/security/efitools/debian/uefi_sb_keys/ms-DB.crt b/security/efitools/debian/bullseye/uefi_sb_keys/ms-DB.crt similarity index 100% rename from security/efitools/debian/uefi_sb_keys/ms-DB.crt rename to security/efitools/debian/bullseye/uefi_sb_keys/ms-DB.crt diff --git a/security/efitools/debian/uefi_sb_keys/ms-KEK.crt b/security/efitools/debian/bullseye/uefi_sb_keys/ms-KEK.crt similarity index 100% rename from security/efitools/debian/uefi_sb_keys/ms-KEK.crt rename to security/efitools/debian/bullseye/uefi_sb_keys/ms-KEK.crt