Move grub2-rpm-macros to azurelinux-rpm-macros package (#10132)

Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>

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

@@ -12,7 +12,7 @@
 Summary:        Signed GRand Unified Bootloader for %{buildarch} systems
 Name:           grub2-efi-binary-signed-%{buildarch}
 Version:        2.06
-Release:        19%{?dist}
+Release:        20%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -79,6 +79,9 @@ cp %{SOURCE3} %{buildroot}/boot/efi/EFI/BOOT/%{grubpxeefiname}
 /boot/efi/EFI/BOOT/%{grubpxeefiname}
 
 %changelog
+* Tue Aug 13 2024 Daniel McIlvaney <damcilva@microsoft.com> - 2.06-20
+- Move grub2-rpm-macros to the azurelinux-rpm-macros package
+
 * Wed Jun 12 2024 George Mileka <gmileka@microsoft.com> - 2.06-19
 - disable code optimization for ip checksum calculation
 

SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.signatures.json

@@ -18,6 +18,7 @@
   "macros.check": "79367176c3c7d10c0158b6e5d881e0fc3c8fd50c5957dad2f097c2d4a37833e7",
   "macros.fonts": "f52edc646414c5dd0f5f4cdd570f2f9dbe6fb97d4f0db360908deb56d96492f8",
   "macros.forge": "52cdffd48217cafe33afe47c625cd6aac6460848cd76de66fe61031c26beeaf4",
+  "macros.grub2": "b03f6f713601214406971de53538dfc25136bf836f09a663eaffc4332a72c38b",
   "macros.mono-srpm": "a9201ae36fc482e966134e38f42412378e955faf296b214cb6dd63981af8bc49",
   "macros.nodejs-srpm": "b2515cc7fad3f14849cff8593b10543a3f73edccff4c3c6d0d2764dae19c38e8",
   "macros.ocaml-srpm": "c35c6db7ede8ea534212329d010920646f80368e1fbd0b9025e48ed0a85a09ce",
@@ -34,4 +35,4 @@
   "rpmrc": "c197369d806430f581de9d5f0e89384d231745712f394ce39497ada47d1f4efe",
   "verify-package-notes.sh": "121715379dcfda33f4e66b3eb5520c80c55c1b0d88348f8895d45d3b89dfe965"
  }
-}
+}

SPECS/azurelinux-rpm-macros/azurelinux-rpm-macros.spec

@@ -7,7 +7,7 @@
 Summary:        Azure Linux specific rpm macro files
 Name:           azurelinux-rpm-macros
 Version:        %{azl}.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPL+ AND MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -47,6 +47,7 @@ Source28:       https://src.fedoraproject.org/rpms/python-rpm-macros/blob/f40/f/
 Source29:       https://src.fedoraproject.org/rpms/python-rpm-macros/blob/f40/f/brp-fix-pyc-reproducibility
 Source30:       https://src.fedoraproject.org/rpms/python-rpm-macros/blob/f40/f/brp-python-hardlink
 Source31:       https://src.fedoraproject.org/rpms/python-rpm-macros/blob/f40/f/import_all_modules.py
+Source32:       macros.grub2
 ###
 Provides:       redhat-rpm-config
 Provides:       openblas-srpm-macros
@@ -59,6 +60,9 @@ Provides:       rust-srpm-macros
 Obsoletes:      mariner-rpm-macros <= 2.0-25
 Provides:       mariner-rpm-macros = %{version}-%{release}
 
+Obsoletes:      grub2-rpm-macros <= 2.06-19%{?dist}
+Provides:       grub2-rpm-macros = %{version}-%{release}
+
 BuildArch:      noarch
 
 %description
@@ -124,6 +128,7 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm python.lua
 %{_rpmconfigdir}/macros.d/macros.rust-srpm
 %{_rpmconfigdir}/macros.d/macros.fonts
 %{_rpmconfigdir}/macros.d/macros.forge
+%{_rpmconfigdir}/macros.d/macros.grub2
 %{_rpmconfigdir}/macros.d/macros.suse
 
 %dir %{rcluadir}
@@ -138,6 +143,9 @@ install -p -m 644 -t %{buildroot}%{rcluadir}/srpm python.lua
 %{_rpmconfigdir}/macros.d/macros.check
 
 %changelog
+* Tue Aug 13 2024 Daniel McIlvaney <damcilva@microsoft.com> - 3.0-6
+- Move grub2-rpm-macros to the azurelinux-rpm-macros package
+
 * Tue May 21 2024 Mykhailo Bykhovtsev <mbykhovtsev@microsoft.com> - 3.0-5
 - Moved ocaml-srpm-macros into its own package.
 

SPECS/grub2/grub2.signatures.json

@@ -2,7 +2,6 @@
  "Signatures": {
   "gnulib-d271f868a8df9bbec29049d01e056481b7a1a263.tar.gz": "4e23415ae2977ffca15e07419ceff3e9334d0369eafc9e7ae2578f8dd9a4839c",
   "grub-2.06.tar.gz": "660eaa2355a4045d8d0cdb5765169d1cad9912ec07873b86c9c6d55dbaa9dfca",
-  "macros.grub2": "b03f6f713601214406971de53538dfc25136bf836f09a663eaffc4332a72c38b",
   "sbat.csv.in": "040bcd900845b53ef9124f70f8b40fbd169740681fdd519a688663a59a958cf1"
  }
 }

SPECS/grub2/grub2.spec

@@ -6,7 +6,7 @@
 Summary:        GRand Unified Bootloader
 Name:           grub2
 Version:        2.06
-Release:        19%{?dist}
+Release:        20%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -15,7 +15,6 @@ URL:            https://www.gnu.org/software/grub
 Source0:        https://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-%{version}.tar.gz
 Source1:        https://git.savannah.gnu.org/cgit/gnulib.git/snapshot/gnulib-%{gnulibversion}.tar.gz
 Source2:        sbat.csv.in
-Source3:        macros.grub2
 # Incorporate relevant patches from Fedora 34
 # EFI Secure Boot / Handover Protocol patches
 Patch0001:      0001-Add-support-for-Linux-EFI-stub-loading.patch
@@ -48,7 +47,7 @@ Patch0157:      0157-linuxefi-fail-kernel-validation-without-shim-protoco.patch
 # Fix to prevent user from overwriting signed grub binary using grub2-install
 Patch0166:      0166-grub-install-disable-support-for-EFI-platforms.patch
 # CVE-2021-3981
-Patch0167:      0167-restore-umask-for-grub-config.patch 
+Patch0167:      0167-restore-umask-for-grub-config.patch
 # Fix to reset the global errno to success upon success.
 Patch0170:      0170-fix-memory-alloc-errno-reset.patch
 Patch0171:      CVE-2022-2601.patch
@@ -193,14 +192,6 @@ Requires:       %{name}-tools-minimal = %{version}-%{release}
 %description efi-binary-noprefix
 GRUB UEFI bootloader binaries with no prefix directory set
 
-%package rpm-macros
-Summary:        GRUB RPM Macros
-Group:          System Environment/Base
-
-%description rpm-macros
-GRUB RPM Macros for enabling package updates supporting
-the grub2-mkconfig flow on AzureLinux
-
 %package configuration
 Summary:        Location for local grub configurations
 Group:          System Environment/Base
@@ -335,10 +326,6 @@ GRUB_MODULE_SOURCE=
 
 install -d $EFI_BOOT_DIR
 
-# Install grub2 macros
-mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
-install -m 644 %{SOURCE3} %{buildroot}/%{_rpmconfigdir}/macros.d
-
 %ifarch x86_64
 GRUB_MODULE_NAME=grubx64.efi
 GRUB_PXE_MODULE_NAME=grubx64-noprefix.efi
@@ -426,9 +413,6 @@ cp $GRUB_PXE_MODULE_SOURCE $EFI_BOOT_DIR/$GRUB_PXE_MODULE_NAME
 %{_libdir}/grub/*
 %endif
 
-%files rpm-macros
-%{_rpmconfigdir}/macros.d/macros.grub2
-
 %files configuration
 %dir %{_sysconfdir}/grub.d
 %dir %{_sysconfdir}/default/grub.d
@@ -444,6 +428,9 @@ cp $GRUB_PXE_MODULE_SOURCE $EFI_BOOT_DIR/$GRUB_PXE_MODULE_NAME
 %config(noreplace) %{_sysconfdir}/grub.d/41_custom
 
 %changelog
+* Tue Aug 13 2024 Daniel McIlvaney <damcilva@microsoft.com> - 2.06-20
+- Move grub2-rpm-macros to the azurelinux-rpm-macros package
+
 * Wed Jun 12 2024 George Mileka <gmileka@microsoft.com> - 2.06-19
 - disable code optimization for ip checksum calculation
 
@@ -473,7 +460,7 @@ cp $GRUB_PXE_MODULE_SOURCE $EFI_BOOT_DIR/$GRUB_PXE_MODULE_NAME
 - Enable support for grub2-mkconfig grub.cfg generation
 - Introduce rpm-macros, configuration subpackage
 - The Mariner /etc/default/grub now sources files from /etc/default/grub.d
-    before the remainder of grub2-mkconfig runs. This allows RPM to 
+    before the remainder of grub2-mkconfig runs. This allows RPM to
     install package-specific configurations that the users can safely
     override.
 

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -209,8 +209,8 @@ libltdl-2.4.7-1.azl3.aarch64.rpm
 libltdl-devel-2.4.7-1.azl3.aarch64.rpm
 lua-5.4.6-1.azl3.aarch64.rpm
 lua-libs-5.4.6-1.azl3.aarch64.rpm
-azurelinux-rpm-macros-3.0-5.azl3.noarch.rpm
-azurelinux-check-macros-3.0-5.azl3.noarch.rpm
+azurelinux-rpm-macros-3.0-6.azl3.noarch.rpm
+azurelinux-check-macros-3.0-6.azl3.noarch.rpm
 tdnf-3.5.6-1.azl3.aarch64.rpm
 tdnf-cli-libs-3.5.6-1.azl3.aarch64.rpm
 tdnf-devel-3.5.6-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -209,8 +209,8 @@ libltdl-2.4.7-1.azl3.x86_64.rpm
 libltdl-devel-2.4.7-1.azl3.x86_64.rpm
 lua-5.4.6-1.azl3.x86_64.rpm
 lua-libs-5.4.6-1.azl3.x86_64.rpm
-azurelinux-rpm-macros-3.0-5.azl3.noarch.rpm
-azurelinux-check-macros-3.0-5.azl3.noarch.rpm
+azurelinux-rpm-macros-3.0-6.azl3.noarch.rpm
+azurelinux-check-macros-3.0-6.azl3.noarch.rpm
 tdnf-3.5.6-1.azl3.x86_64.rpm
 tdnf-cli-libs-3.5.6-1.azl3.x86_64.rpm
 tdnf-devel-3.5.6-1.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -9,7 +9,7 @@ audit-devel-3.1.2-1.azl3.aarch64.rpm
 audit-libs-3.1.2-1.azl3.aarch64.rpm
 autoconf-2.72-2.azl3.noarch.rpm
 automake-1.16.5-2.azl3.noarch.rpm
-azurelinux-check-macros-3.0-5.azl3.noarch.rpm
+azurelinux-check-macros-3.0-6.azl3.noarch.rpm
 azurelinux-repos-3.0-3.azl3.noarch.rpm
 azurelinux-repos-debug-3.0-3.azl3.noarch.rpm
 azurelinux-repos-debug-preview-3.0-3.azl3.noarch.rpm
@@ -23,7 +23,7 @@ azurelinux-repos-ms-oss-3.0-3.azl3.noarch.rpm
 azurelinux-repos-ms-oss-preview-3.0-3.azl3.noarch.rpm
 azurelinux-repos-preview-3.0-3.azl3.noarch.rpm
 azurelinux-repos-shared-3.0-3.azl3.noarch.rpm
-azurelinux-rpm-macros-3.0-5.azl3.noarch.rpm
+azurelinux-rpm-macros-3.0-6.azl3.noarch.rpm
 bash-5.2.15-2.azl3.aarch64.rpm
 bash-debuginfo-5.2.15-2.azl3.aarch64.rpm
 bash-devel-5.2.15-2.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -9,7 +9,7 @@ audit-devel-3.1.2-1.azl3.x86_64.rpm
 audit-libs-3.1.2-1.azl3.x86_64.rpm
 autoconf-2.72-2.azl3.noarch.rpm
 automake-1.16.5-2.azl3.noarch.rpm
-azurelinux-check-macros-3.0-5.azl3.noarch.rpm
+azurelinux-check-macros-3.0-6.azl3.noarch.rpm
 azurelinux-repos-3.0-3.azl3.noarch.rpm
 azurelinux-repos-debug-3.0-3.azl3.noarch.rpm
 azurelinux-repos-debug-preview-3.0-3.azl3.noarch.rpm
@@ -23,7 +23,7 @@ azurelinux-repos-ms-oss-3.0-3.azl3.noarch.rpm
 azurelinux-repos-ms-oss-preview-3.0-3.azl3.noarch.rpm
 azurelinux-repos-preview-3.0-3.azl3.noarch.rpm
 azurelinux-repos-shared-3.0-3.azl3.noarch.rpm
-azurelinux-rpm-macros-3.0-5.azl3.noarch.rpm
+azurelinux-rpm-macros-3.0-6.azl3.noarch.rpm
 bash-5.2.15-2.azl3.x86_64.rpm
 bash-debuginfo-5.2.15-2.azl3.x86_64.rpm
 bash-devel-5.2.15-2.azl3.x86_64.rpm