[rpms/lorax-templates-rhel] eln: Add subpackage for 64k flavor aarch64 kernel

[rpms/lorax-templates-rhel] eln: Add subpackage for 64k flavor aarch64 kernel

[Brian C. Lane]

            A new commit has been pushed.

            Repo   : rpms/lorax-templates-rhel
            Branch : eln
            Commit : ba6245f3d83b29ba7a4cc6cd9acf991b6ff67d68
            Author : Brian C. Lane <bcl@redhat.com>
            Date   : 2026-06-26T12:54:51-04:00
            Stats  : +27/-11 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/lorax-templates-rhel/c/ba6245f3d83b29ba7a4cc6cd9acf991b6ff67d68?branch=eln

            Log:
            Add subpackage for 64k flavor aarch64 kernel

This adds a new subpackage, lorax-templates-rhel-64k, that includes a
separate template tree used to install the 64k kernel on aarch64.
Currently the only difference from the 80-rhel templates is
in runtime-install.tmpl

The new templates, when installed, take precedence over the generic
templates and the rhel templates by installing them into the
/usr/share/lorax/templates.d/70-64k/ directory.

The new subpackage package will only be installed when explicitly
requested, it does not provide 'lorax-templates' in order to prevent
accidentally installing it.

Resolves: RHEL-163726

---
diff --git a/Makefile b/Makefile
index efccaf1..fa198dd 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,8 @@ TARBALL=${NAME}-${RHELVER}-${SERIAL}.tar.gz
 
 tar: ${TARBALL}
 
-${TARBALL}: 80-rhel
-	git archive --prefix='${NAME}-${RHELVER}/' HEAD $</ | gzip -c9 > $@
+${TARBALL}: 80-rhel 70-64k
+	git archive --prefix='${NAME}-${RHELVER}/' HEAD 80-rhel/ 70-64k/ | gzip -c9 > $@
 
 bump: bump-serial
 

diff --git a/README b/README
index 4cd5580..3da10e3 100644
--- a/README
+++ b/README
@@ -1,14 +1,16 @@
 Hi there! If you're trying to fix something here, do the following:
 
-1. Make whatever edits you need to in 80-rhel/
-2. `git commit` the changes with the relevant 'Resolves/Related' bug reference
-3. `make release`
+1. Make whatever edits you need to in 80-rhel/ and 70-64k/
+2  Make sure the only difference between them is the the aarch64 kernel-64k block:
+   diff -r ./80-rhel/ ./70-64k/
+3. `git commit` the changes with the relevant 'Resolves/Related' bug reference
+4. `make release`
    This will bump the release, update the spec with changes in this branch,
    create a new tarball, upload it, and commit the changes.
    NOTE: If there are commits on c10s since the last build you need to set PREV=<HASH>
    so that the changelog will be correct. eg. PREV=ACTUALHASH make release
-4. Examine the changes with 'git show' and make sure they look ok.
-5. Push the changes to your fork of the project with:
+5. Examine the changes with 'git show' and make sure they look ok.
+6. Push the changes to your fork of the project with:
    'git push REMOTE BRANCHNAME' and follow the instructions to
    create a merge request in gitlab.
 

diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index dc349d1..143b5e1 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -22,11 +22,11 @@ Requires:       lorax >= 34.9.1
 Provides: lorax-templates = %{version}-%{release}
 
 # Where are these supposed to end up?
-%define templatedir %{_datadir}/lorax/templates.d/80-rhel
+%define templatedir %{_datadir}/lorax/templates.d/
 
 %description
 RHEL-specific Lorax templates for creating the boot.iso and live isos are
-placed in %{templatedir}
+placed in %{templatedir}/80-rhel
 
 %prep
 %setup
@@ -37,11 +37,25 @@ placed in %{templatedir}
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{templatedir}
-cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
+cp -a 80-rhel $RPM_BUILD_ROOT/%{templatedir}
+cp -a 70-64k $RPM_BUILD_ROOT/%{templatedir}
 
 %files
 %dir %{templatedir}
-%{templatedir}/*
+%{templatedir}/80-rhel/*
+
+%package 64k
+Summary:        RHEL build templates for lorax and livemedia-creator using the aarch64 64k kernel
+# lorax version with 64k kernel flavor support
+Requires:       lorax >= 40.5.16
+
+%description 64k
+Lorax templates that install kernel-64k on aarch64. All other arches are identical to
+lorax-templates-rhel. Templates are placed in %{templatedir}/70-64k
+
+%files 64k
+%dir %{templatedir}
+%{templatedir}/70-64k/*
 
 %changelog
 * Mon Feb 23 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 11.0-16