From d22690147a440d6af367ee01d971653558178fac Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 8 Mar 2022 15:02:55 -0500
Subject: [PATCH] Don't install RHEL packages missing from ELN

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
 .gitignore                   | 1 +
 80-rhel/runtime-install.tmpl | 6 ++++--
 SERIAL                       | 2 +-
 lorax-templates-rhel.spec    | 9 +++++++--
 sources                      | 2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 59bfbae..f05bda1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /lorax-templates-rhel-10.0-9.tar.gz
 /lorax-templates-rhel-10.0-10.tar.gz
 /lorax-templates-rhel-10.0-11.tar.gz
+/lorax-templates-rhel-10.0-12.tar.gz
diff --git a/80-rhel/runtime-install.tmpl b/80-rhel/runtime-install.tmpl
index 9ef131e..66b8dbb 100644
--- a/80-rhel/runtime-install.tmpl
+++ b/80-rhel/runtime-install.tmpl
@@ -4,7 +4,8 @@
 ## anaconda package
 installpkg anaconda anaconda-widgets kexec-tools-anaconda-addon anaconda-install-img-deps
 installpkg oscap-anaconda-addon
-installpkg redhat-release-eula
+# Not available in ELN, must be uncommented for RHEL
+#installpkg redhat-release-eula
 
 ## FIXME Pull in device-mapper-multipath
 ## This *should* be pulled in by libblockdev-plugins-all and libblockdev-mpath but it is not
@@ -163,7 +164,8 @@ installpkg google-noto-sans-cjk-ttc-fonts
 ## debugging/bug reporting tools
 installpkg gdb-gdbserver
 installpkg libreport-plugin-bugzilla libreport-plugin-reportuploader
-installpkg libreport-rhel-anaconda-bugzilla
+# Not available in ELN, must be enabled in RHEL
+#installpkg libreport-rhel-anaconda-bugzilla
 installpkg python3-pyatspi
 
 ## extra tools not required by anaconda
diff --git a/SERIAL b/SERIAL
index b4de394..48082f7 100644
--- a/SERIAL
+++ b/SERIAL
@@ -1 +1 @@
-11
+12
diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec
index d5410b5..4e9b35f 100644
--- a/lorax-templates-rhel.spec
+++ b/lorax-templates-rhel.spec
@@ -1,6 +1,6 @@
 Name:           lorax-templates-rhel
 Version:        10.0
-Release:        11%{?dist}
+Release:        12%{?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-11.tar.gz
+Source0:        lorax-templates-rhel-10.0-12.tar.gz
 
 # Required for the template branding support
 Requires:       lorax >= 34.9.1
@@ -38,6 +38,11 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
 %{templatedir}/*
 
 %changelog
+* Tue Mar 08 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-12
+- Don't try to install packages that don't exist in ELN
+  - redhat-release-eula
+  - libreport-rhel-anaconda-bugzilla
+
 * Tue Mar 08 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-11
 - Don't move the restart-anaconda file
 
diff --git a/sources b/sources
index a5146a6..a8027f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lorax-templates-rhel-10.0-11.tar.gz) = ce7fa8a414aac7caaf9fa69b35affdbd73b960610d18e73e2c471aa355608ada938eeb0d4f1cb55b126b415c5eb7e1d0857f621d9d03cf84c0e40888369bb907
+SHA512 (lorax-templates-rhel-10.0-12.tar.gz) = cb6ed24e25c3b495e99052bdcfa47c60f9d818e1680e1fbf2235789f995dda87e5e0826e7bf37b74444ebba6b39a6a4cabb09b17fa494beafcc4693083be83a3