Merge remote-tracking branch 'cs/c9s' into eln

.gitignore

@@ -5,3 +5,4 @@
 /lorax-templates-rhel-10.0-5.tar.gz
 /lorax-templates-rhel-10.0-6.tar.gz
 /lorax-templates-rhel-10.0-7.tar.gz
+/lorax-templates-rhel-10.0-8.tar.gz

80-rhel/runtime-cleanup.tmpl

@@ -101,7 +101,7 @@ removekmod sound drivers/media drivers/hwmon \
 ## Also keep virtio-rng so that the installer can get sufficient randomness for
 ## LUKS setup.
 removekmod drivers/char --allbut virtio_console hw_random \
-                                  virtio-rng ipmi hmcdrv
+                                  virtio-rng ipmi hmcdrv nvram
 removekmod drivers/hid --allbut hid-logitech-dj hid-logitech-hidpp hid-multitouch
 removekmod drivers/video --allbut hyperv_fb syscopyarea sysfillrect sysimgblt fb_sys_fops
 remove lib/modules/*/{build,source,*.map}

README

@@ -1,3 +1,17 @@
+# To rebase from RHEL:
+1. Add "cs" remote: `git remote add cs https://gitlab.com/redhat/centos-stream/rpms/lorax-templates-rhel.git`
+2. `git merge -X ours cs/c9s`
+3. `make bump` to bump SERIAL
+4. `make tar` to make a new tarball
+5. `make update-spec` to update specfile
+6. Add changelog entry to .spec
+7. `fedpkg new-sources` the new tarball
+8. `git add lorax-templates-rhel.spec SERIAL`
+9. `git commit --amend`
+
+
+# To make ELN-specific changes:
+
 Hi there! If you're trying to fix something here, do the following:
 
 1. Make whatever edits you need to in 80-rhel/
@@ -8,9 +22,6 @@ Hi there! If you're trying to fix something here, do the following:
 6. Add changelog entry to .spec
 7. `fedpkg new-sources` the new tarball
 8. `git add lorax-templates-rhel.spec SERIAL`
-9. `git commit`
-
-Steps 8 and 9 can be combined as:
-     `fedpkg commit -c`
+9. `git commit --amend`
 
 You're now ready to do a new build. Isn't spec wonderful?

SERIAL

@@ -1 +1 @@
-7
+8

lorax-templates-rhel.spec

@@ -1,6 +1,6 @@
 Name:           lorax-templates-rhel
 Version:        10.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        RHEL build templates for lorax and livemedia-creator
 
 License:        GPLv2+
@@ -10,7 +10,7 @@ BuildArch:      noarch
 # This tarball is generated from the contents of this dist-git repository
 # by running the command `make tar`.
 # See README for full details of how to update this package
-Source0:        lorax-templates-rhel-10.0-7.tar.gz
+Source0:        lorax-templates-rhel-10.0-8.tar.gz
 
 # Required for the template branding support
 Requires:       lorax >= 34.9.1
@@ -38,6 +38,9 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Mon Feb 07 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-8
+- Re-sync from CentOS Stream 9
+
 * Wed Jan 26 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-7
 - Re-sync from CentOS Stream 9
 

sources

@@ -1 +1 @@
-SHA512 (lorax-templates-rhel-10.0-7.tar.gz) = b420f79b6cc5f2ab8dcbee24393d397105e6b6d420cf6046beecc5b907bb1c1f6c2eeca5a09746f43c07dfcea7eae80659dcfa31c24212f442b3e6fb65074393
+SHA512 (lorax-templates-rhel-10.0-8.tar.gz) = 7f34db1b5966be65fad3b939e98044e5556be2545fa89317070cbc07084053e5a54cbc2f861da96e52776195f9df673233510587eda59e6234e8e9c97a46a794