From 9f73f60a216eadc5fc7c854165fd6a1a6522f965 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Nov 2022 15:12:54 -0800 Subject: [PATCH 1/2] On ppc64le Use core.elf from grub2 package grub2 1:2.06-51 now ships a signed core.elf that includes all the needed modules, use that instead of making an unsigned one. Resolves: rhbz#2143422 --- 80-rhel/live/ppc64le.tmpl | 4 +--- 80-rhel/ppc64le.tmpl | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/80-rhel/live/ppc64le.tmpl b/80-rhel/live/ppc64le.tmpl index 5cd79e0..e8d225f 100644 --- a/80-rhel/live/ppc64le.tmpl +++ b/80-rhel/live/ppc64le.tmpl @@ -36,9 +36,7 @@ mkdir ${BOOTDIR} install ${configdir}/bootinfo.txt ${BOOTDIR} mkdir ${GRUBDIR}/powerpc-ieee1275 -## "()" means the current device to grub2 -runcmd grub2-mkimage --format=powerpc-ieee1275 --directory=/usr/lib/grub/powerpc-ieee1275 --prefix="()/"${GRUBDIR} \ ---output=${outroot}/${GRUBDIR}/powerpc-ieee1275/core.elf iso9660 ext2 ofnet net tftp http +install /usr/lib/grub/powerpc-ieee1275/core.elf ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.mod ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275 diff --git a/80-rhel/ppc64le.tmpl b/80-rhel/ppc64le.tmpl index dc03c09..b3503ca 100644 --- a/80-rhel/ppc64le.tmpl +++ b/80-rhel/ppc64le.tmpl @@ -36,9 +36,7 @@ mkdir ${BOOTDIR} install ${configdir}/bootinfo.txt ${BOOTDIR} mkdir ${GRUBDIR}/powerpc-ieee1275 -## "()" means the current device to grub2 -runcmd grub2-mkimage --format=powerpc-ieee1275 --directory=/usr/lib/grub/powerpc-ieee1275 --prefix="()/"${GRUBDIR} \ ---output=${outroot}/${GRUBDIR}/powerpc-ieee1275/core.elf iso9660 ext2 ofnet net tftp http +install /usr/lib/grub/powerpc-ieee1275/core.elf ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.mod ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275 From b1efe2d57665d532233363de2016eef0aba9ce96 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Mon, 28 Nov 2022 15:37:22 -0800 Subject: [PATCH 2/2] - On ppc64le Use core.elf from grub2 package (bcl) Resolves: rhbz#2143422 --- .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 e624c7e..aaee424 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog-spec clog /lorax-templates-rhel-9.0-34.tar.gz /lorax-templates-rhel-9.0-35.tar.gz +/lorax-templates-rhel-9.0-36.tar.gz diff --git a/SERIAL b/SERIAL index 8f92bfd..7facc89 100644 --- a/SERIAL +++ b/SERIAL @@ -1 +1 @@ -35 +36 diff --git a/lorax-templates-rhel.spec b/lorax-templates-rhel.spec index d79b985..c26c1a5 100644 --- a/lorax-templates-rhel.spec +++ b/lorax-templates-rhel.spec @@ -1,12 +1,12 @@ Name: lorax-templates-rhel Version: 9.0 -Release: 35%{?dist} +Release: 36%{?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-35.tar.gz +Source0: lorax-templates-rhel-9.0-36.tar.gz # Required for the template branding support Requires: lorax >= 34.9.1 @@ -34,6 +34,10 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir} %{templatedir}/* %changelog +* Mon Nov 28 2022 Brian C. Lane - 9.0-36 +- On ppc64le Use core.elf from grub2 package (bcl) + Resolves: rhbz#2143422 + * Tue Apr 05 2022 Brian C. Lane - 9.0-35 - Makefile: Making it easier to create releases (bcl) Related: rhbz#2071074 diff --git a/sources b/sources index bf127eb..cc53eb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lorax-templates-rhel-9.0-35.tar.gz) = cf1e55d2dd1a7add203773c5d9eddfda542da58d7c7378e6717eb3f434c96d84862c23ca1eb48e648b13caef95d17a656ce0cab9df5a3f909417da9daea69add +SHA512 (lorax-templates-rhel-9.0-36.tar.gz) = 6105b316f023361f4213c5aedf84708e599436725c28237fdf542aac20a65dd78a332d34896cdb2d0b48df90b98885fe6ae342b4bebaf4abb3063e4f963ff3c4