diff --git a/.gitignore b/.gitignore index 8ed8ac1..c05b23c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lorax-templates-rhel-8.3-2.tar.gz +SOURCES/lorax-templates-rhel-8.3-4.tar.gz diff --git a/.lorax-templates-rhel.metadata b/.lorax-templates-rhel.metadata index 341eb55..0347fa0 100644 --- a/.lorax-templates-rhel.metadata +++ b/.lorax-templates-rhel.metadata @@ -1 +1 @@ -eef013b2ade037e32e017b7b4614c8ed67075ae4 SOURCES/lorax-templates-rhel-8.3-2.tar.gz +595819f55d98cdc77d72ab279e1d5b9b597f064f SOURCES/lorax-templates-rhel-8.3-4.tar.gz diff --git a/SOURCES/CENTOS-add-armhfp-pkgs.patch b/SOURCES/CENTOS-add-armhfp-pkgs.patch deleted file mode 100644 index f701ee5..0000000 --- a/SOURCES/CENTOS-add-armhfp-pkgs.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -uNr lorax-templates-rhel-8.1.orig/80-rhel/runtime-install.tmpl lorax-templates-rhel-8.1/80-rhel/runtime-install.tmpl ---- lorax-templates-rhel-8.1.orig/80-rhel/runtime-install.tmpl 2019-09-03 12:46:28.000000000 -0500 -+++ lorax-templates-rhel-8.1/80-rhel/runtime-install.tmpl 2019-12-31 12:06:13.556087038 -0600 -@@ -34,6 +34,13 @@ - %if basearch == "aarch64": - installpkg efibootmgr grub2-efi-aa64-cdboot grubby shim-aa64 - %endif -+%if basearch in ("arm", "armhfp"): -+ installpkg efibootmgr -+ installpkg grub2-efi-arm-cdboot -+ installpkg grubby-deprecated -+ installpkg kernel-lpae -+ installpkg uboot-tools -+%endif - %if basearch == "x86_64": - installpkg grub2-tools-efi - installpkg efibootmgr diff --git a/SPECS/lorax-templates-rhel.spec b/SPECS/lorax-templates-rhel.spec index cc52860..5379e3f 100644 --- a/SPECS/lorax-templates-rhel.spec +++ b/SPECS/lorax-templates-rhel.spec @@ -1,14 +1,12 @@ Name: lorax-templates-rhel Version: 8.3 -Release: 2%{?dist} +Release: 4%{?dist} Summary: RHEL8 build templates for lorax and livemedia-creator License: GPLv2+ URL: https://github.com/weldr/lorax BuildArch: noarch -Source0: lorax-templates-rhel-8.3-2.tar.gz - -Patch1: CENTOS-add-armhfp-pkgs.patch +Source0: lorax-templates-rhel-8.3-4.tar.gz # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-rhel @@ -19,7 +17,6 @@ placed in %{templatedir} %prep %setup -%patch1 -p1 %build # nothing to build @@ -34,6 +31,14 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Tue Jul 07 2020 Brian C. Lane - 8.3-4 +- rsyslog: Disable journal ratelimits during install + Related: rhbz#1752754 + +* Thu Jun 25 2020 Brian C. Lane - 8.3-3 +- include generic.ins for s390 boot iso (dan) + Resolves: rhbz#1844517 + * Wed Jun 03 2020 Brian C. Lane - 8.3-2 - Keep /etc/default/useradd in install.img Resolves: rhbz#1843609