From 178823039e4433fd2cbc9dea7d38dca8ed6129cb Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 3 Dec 2020 08:24:29 -0800 Subject: [PATCH] - Switch to using upstream mk-s390image for s390 cdboot.img creation Resolves: rhbz#1903923 --- .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 e8fd8d8..83d892c 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /lorax-templates-rhel-9.0-4.tar.gz /lorax-templates-rhel-9.0-5.tar.gz /lorax-templates-rhel-9.0-6.tar.gz +/lorax-templates-rhel-9.0-7.tar.gz diff --git a/SERIAL b/SERIAL index 1e8b314..7f8f011 100644 --- a/SERIAL +++ b/SERIAL @@ -1 +1 @@ -6 +7 diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec index 0c6186a..7170943 100644 --- a/lorax-templates-rhel.spec +++ b/lorax-templates-rhel.spec @@ -1,12 +1,12 @@ Name: lorax-templates-rhel Version: 9.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: RHEL8 build templates for lorax and livemedia-creator License: GPLv2+ URL: https://github.com/weldr/lorax BuildArch: noarch -Source0: lorax-templates-rhel-9.0-6.tar.gz +Source0: lorax-templates-rhel-9.0-7.tar.gz # Where are these supposed to end up? %define templatedir %{_datadir}/lorax/templates.d/80-rhel @@ -31,6 +31,10 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Thu Dec 03 2020 Brian C. Lane - 9.0-7 +- Switch to using upstream mk-s390image for s390 cdboot.img creation + Resolves: rhbz#1903923 + * Tue Dec 01 2020 Brian C. Lane - 9.0-6 - Don't remove libldap_r libraries during runtime-cleanup.tmpl diff --git a/sources b/sources index 3b169eb..f2ee390 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-templates-rhel-9.0-6.tar.gz) = 5cbacc9e66357f5f851b546bdff4ca0508ac035a3936ed72b537f96442831cab7a13314af51e7f5db881fb882415cb6a988316faf2894a7c29c08383e97324c4 +SHA512 (lorax-templates-rhel-9.0-7.tar.gz) = a7ddaefabf875cfcd59c6cd39c3521b3e9491cba98ad5bd155c756e7f13ad76b1337c5b66c5b37edb757ba72e481a981485ec5f27cc8f5ecff65ce7a1e1d5d8f