Merge pull request #903 from microsoft/joslobo/merge-for-april-update

Joslobo/merge for april update

.github/workflows/check-license-map.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Run license map checking script
         run: |
-          python3 ./SPECS/LICENSES-AND-NOTICES/data/license_map.py \
+          python3 ./toolkit/scripts/licenses/license_map.py \
           ./SPECS/LICENSES-AND-NOTICES/data/licenses.json \
           ./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md \
           ./SPECS \

.github/workflows/check_entangled_specs.py

@@ -9,14 +9,12 @@
 
 version_release_matching_groups = [
     frozenset([
-        "SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec",
-        "SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec",
+        "SPECS-SIGNED/kernel-signed/kernel-signed.spec",
         "SPECS/kernel/kernel.spec",
         "SPECS/kernel-headers/kernel-headers.spec"
     ]),
     frozenset([
-        "SPECS-SIGNED/grub2-efi-binary-signed-x64/grub2-efi-binary-signed-x64.spec",
-        "SPECS-SIGNED/grub2-efi-binary-signed-aarch64/grub2-efi-binary-signed-aarch64.spec",
+        "SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec",
         "SPECS/grub2/grub2.spec"
     ]),
     frozenset([

.github/workflows/validate-cg-manifest.sh

@@ -17,6 +17,7 @@ ignore_list=" \
   kf5 \
   mariner-repos \
   mariner-rpm-macros \
+  shim \
   moby-buildx \
   moby-containerd \
   python-markupsafe \
@@ -25,10 +26,11 @@ ignore_list=" \
   qt5-rpm-macros \
   runc \
   grub2-efi-binary-signed-aarch64 \
-  grub2-efi-binary-signed-x64 \
+  grub2-efi-binary-signed-x86_64 \
   kernel-signed-aarch64 \
-  kernel-signed-x64 \
-  verity-read-only-root"
+  kernel-signed-x86_64 \
+  verity-read-only-root \
+  installkernel"
 
 rm -f bad_registrations.txt
 rm -rf ./cgmanifest_test_dir/

SPECS-SIGNED/grub2-efi-binary-signed-aarch64/grub2-efi-binary-signed-aarch64.spec → SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec

@@ -1,8 +1,16 @@
 %global debug_package %{nil}
-Summary:        Signed GRand Unified Bootloader for aarch64 systems
-Name:           grub2-efi-binary-signed-aarch64
+%ifarch x86_64
+%global buildarch x86_64
+%global grubefiname grubx64.efi
+%endif
+%ifarch aarch64
+%global buildarch aarch64
+%global grubefiname grubaa64.efi
+%endif
+Summary:        Signed GRand Unified Bootloader for %{buildarch} systems
+Name:           grub2-efi-binary-signed-%{buildarch}
 Version:        2.06~rc1
-Release:        1%{?dist}
+Release:        4%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -19,27 +27,43 @@ URL:            https://www.gnu.org/software/grub
 #   2. Sign the desired binary
 #   3. Place the unsigned package and signed binary in this spec's folder
 #   4. Build this spec
-Source0:        grub2-efi-unsigned-%{version}-%{release}.aarch64.rpm
-Source1:        grubaa64.efi
-Conflicts:      grub2-efi-binary
-ExclusiveArch:  aarch64
+Source0:        grub2-efi-binary-%{version}-%{release}.%{buildarch}.rpm
+Source1:        %{grubefiname}
 
 %description
 This package contains the GRUB EFI image signed for secure boot. The package is
-specifically created for installing on aarch64 systems
+specifically created for installing on %{buildarch} systems
+
+%package -n     grub2-efi-binary
+Summary:        GRand Unified Bootloader
+Group:          Applications/System
+
+%description -n grub2-efi-binary
+This package contains the GRUB EFI image signed for secure boot. The package is
+specifically created for installing on %{buildarch} systems
 
 %prep
 
 %build
 
 %install
 mkdir -p %{buildroot}/boot/efi/EFI/BOOT
-cp %{SOURCE1} %{buildroot}/boot/efi/EFI/BOOT/grubaa64.efi
+cp %{SOURCE1} %{buildroot}/boot/efi/EFI/BOOT/%{grubefiname}
 
-%files
-/boot/efi/EFI/BOOT/grubaa64.efi
+%files -n grub2-efi-binary
+/boot/efi/EFI/BOOT/%{grubefiname}
 
 %changelog
+* Fri Apr 16 2021 Chris Co <[email protected]> - 2.06~rc1-4
+- Commonize to one spec instead of having a spec per arch
+- Define a new grub2-efi-binary subpackage which contains the signed collateral
+
+* Fri Apr 02 2021 Rachel Menge <[email protected]> - 2.06~rc1-3
+- Update release to be aligned with unsigned version
+
+* Fri Mar 26 2021 Chris Co <[email protected]> - 2.06~rc1-2
+- Update release to be aligned with unsigned version
+
 * Wed Mar 10 2021 Chris Co <[email protected]> - 2.06~rc1-1
 - Update to 2.06-rc1
 - Incorporate SBAT data