Backport PR #1338 to cut qcom firmwares and save space

0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch

@@ -0,0 +1,47 @@
+From ecd5934d942b36733c9dcc44d5ba98aba2a1a526 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 11 Aug 2023 09:39:20 -0700
+Subject: [PATCH] runtime-install: only pull in qcom-firmware on aarch64
+
+See https://bugzilla.redhat.com/show_bug.cgi?id=2178852 . This
+should save a chunk of space on the installer images for x86_64.
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ share/templates.d/99-generic/runtime-install.tmpl | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl
+index 0ae8bb53..93b76fb4 100644
+--- a/share/templates.d/99-generic/runtime-install.tmpl
++++ b/share/templates.d/99-generic/runtime-install.tmpl
+@@ -28,6 +28,8 @@ installpkg grubby
+     ## https://bugzilla.redhat.com/show_bug.cgi?id=2011615
+     ## bfa-firmware contains only obsolete files - see
+     ## https://bugzilla.redhat.com/show_bug.cgi?id=2152202
++    ## qcom-firmware we pull in again lower down but *only* on aarch64, it is
++    ## no use on other arches - https://bugzilla.redhat.com/show_bug.cgi?id=2178852
+     ## various iwl package names were changed in linux-firmware-20230625-151
+     ## so need to be excluded or else dnf gets sad - see
+     ## https://pagure.io/releng/issue/11511 . These exclusions can
+@@ -53,7 +55,8 @@ installpkg grubby
+                            --except iwlax2xx-firmware \
+                            --except libertas-sd8686-firmware --except libertas-sd8787-firmware \
+                            --except libertas-usb8388-firmware \
+-                           --except libertas-usb8388-olpc-firmware
++                           --except libertas-usb8388-olpc-firmware \
++                           --except qcom-firmware
+     installpkg b43-openfwwf
+ %endif
+ 
+@@ -67,6 +70,7 @@ installpkg glibc-all-langpacks
+     installpkg grub2-tools>=${GRUB2VER}
+     installpkg shim-aa64
+     installpkg uboot-tools
++    installpkg qcom-firmware
+ %endif
+ %if basearch == "x86_64":
+     installpkg grub2-tools-efi>=${GRUB2VER}
+-- 
+2.41.0
+

lorax.spec

@@ -4,7 +4,7 @@
 
 Name:           lorax
 Version:        39.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 License:        GPL-2.0-or-later
@@ -14,6 +14,10 @@ URL:            https://github.com/weldr/lorax
 # git checkout -b archive-branch lorax-%%{version}-%%{release}
 # tito build --tgz
 Source0:        %{name}-%{version}.tar.gz
+# https://github.com/weldr/lorax/pull/1338
+# https://bugzilla.redhat.com/show_bug.cgi?id=2231605
+# cut qcom firmwares from x86_64 installer images to save space
+Patch0:         0001-runtime-install-only-pull-in-qcom-firmware-on-aarch6.patch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
@@ -168,6 +172,9 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_datadir}/lorax/templates.d/*
 
 %changelog
+* Mon Aug 28 2023 Adam Williamson <awilliam@redhat.com> - 39.4-2
+- Backport PR #1338 to cut qcom firmwares and save space
+
 * Wed Aug 09 2023 Brian C. Lane <bcl@redhat.com> 39.4-1
 - Exclude more obsoleted libertas firmware packages (awilliam@redhat.com)
 - Revert "test_minimizer: dnf5 wants --use-host-config" (bcl@redhat.com)