From 36af9617fa5ab49a0041ce7218104fa68c539030 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 28 2020 08:48:45 +0000 Subject: import lorax-templates-rhel-8.2-6.el8 --- diff --git a/.gitignore b/.gitignore index bf2830d..52ff98d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lorax-templates-rhel-8.1-3.tar.gz +SOURCES/lorax-templates-rhel-8.2-6.tar.gz diff --git a/.lorax-templates-rhel.metadata b/.lorax-templates-rhel.metadata index 9ddd2cf..6fdb812 100644 --- a/.lorax-templates-rhel.metadata +++ b/.lorax-templates-rhel.metadata @@ -1 +1 @@ -864e0b9c878348e2d5961f959de3be0de6f866b3 SOURCES/lorax-templates-rhel-8.1-3.tar.gz +b6159cef838ad655575679ae4eea5e71d7242605 SOURCES/lorax-templates-rhel-8.2-6.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 ed8ed31..f69c26c 100644 --- a/SPECS/lorax-templates-rhel.spec +++ b/SPECS/lorax-templates-rhel.spec @@ -1,14 +1,12 @@ Name: lorax-templates-rhel -Version: 8.1 -Release: 3%{?dist}.0.1 +Version: 8.2 +Release: 6%{?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.1-3.tar.gz - -Patch1: CENTOS-add-armhfp-pkgs.patch +Source0: lorax-templates-rhel-8.2-6.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,8 +31,36 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog -* Tue Dec 31 2019 bstinson@centosproject.org - 8.1-3.0.1 -- Add runtime-install packages for armhfp in CentOS +* Thu Feb 27 2020 Brian C. Lane - 8.2-6 +- Restore the 98dracut-systemd service files to the install.img (bcl) + Related: rhbz#1805405 +- Add eject back into the boot.iso (bcl) + Resolves: rhbz#1805405 + +* Fri Jan 10 2020 Brian C. Lane - 8.2-5 +- Install rdma-core and libmlx4 packages + Resolves: rhbz#1762662 + +* Wed Dec 11 2019 Brian C. Lane - 8.2-4 +- Use mkisofs for the s390 live-iso template + Resolves: rhbz#1746424 + +* Tue Nov 12 2019 Brian C. Lane - 8.2-3 +- Add dmidecode on supported architectures + Resolves: rhbz#1714793 + +* Fri Nov 08 2019 Brian C. Lane - 8.2-2 +- Update ppc64le isolabel to match x86_64 logic (bcl) + Resolves: rhbz#1757338 +- set inst.stage2 for ppc64le image (bcl) + Resolves: rhbz#1757338 + +* Thu Oct 31 2019 Brian C. Lane - 8.2-1 +- Update package version for 8.2 release +- Drop unneeded uboot-tools, and remove iso-graft from the aarch64.tmpl + Resolves: rhbz#1763922 +- Add live iso support to s390 + Resolves: rhbz#1746424 * Tue Sep 03 2019 Brian C. Lane - 8.1-3 - Fix path to generic.prm (bcl)