From b2c3aae6474c91a695a063f971397ccde6ac44dd Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 16 Jun 2022 17:33:46 -0400 Subject: [PATCH] Pull in the latest changes from Fedora Use grub2 instead of syslinux for all x86 systems --- .gitignore | 1 + SERIAL | 2 +- lorax-templates-rhel.spec | 8 ++++++-- sources | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3a1872e..4410e19 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /lorax-templates-rhel-10.0-12.tar.gz /lorax-templates-rhel-10.0-13.tar.gz /lorax-templates-rhel-10.0-14.tar.gz +/lorax-templates-rhel-10.0-15.tar.gz diff --git a/SERIAL b/SERIAL index 8351c19..60d3b2f 100644 --- a/SERIAL +++ b/SERIAL @@ -1 +1 @@ -14 +15 diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec index 0078380..d05baec 100644 --- a/lorax-templates-rhel.spec +++ b/lorax-templates-rhel.spec @@ -1,6 +1,6 @@ Name: lorax-templates-rhel Version: 10.0 -Release: 14%{?dist} +Release: 15%{?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-14.tar.gz +Source0: lorax-templates-rhel-10.0-15.tar.gz # Required for the template branding support Requires: lorax >= 34.9.1 @@ -38,6 +38,10 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Thu Jun 16 2022 Stephen Gallagher - 10.0-15 +- Pull in the latest changes from Fedora +- Use grub2 instead of syslinux for all x86 systems + * Thu Jun 16 2022 Stephen Gallagher - 10.0-14 - Exclude python-virt-firmware from pkginstall diff --git a/sources b/sources index 27e5391..aacdf7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-templates-rhel-10.0-14.tar.gz) = 64ba93ecfa879653c4aa59c1dd38c1024f6db2baf52e1b8f76d038641315f8cd4f36e273c31c966e18a35a5ca5a887da786c77d4662e26f29b4ebc476ff4536f +SHA512 (lorax-templates-rhel-10.0-15.tar.gz) = a909aea9fe373ae6e291bd4c2cef43e2bac5ab582b3273b354b01d2992f896c66ff8f0bb02bc5207c1804c0a67647bc850c2a1b5b96ac9090d392b529e43c861