rpms/lorax-templates-rhel
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge remote-tracking branch 'cs/c9s' into eln

Browse Source
This commit is contained in:
Stephen Gallagher 2022-12-14 11:59:21 -05:00
commit 7683ec1342
No known key found for this signature in database
GPG Key ID: 45DB85A568286D11
6 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -20,3 +20,4 @@ clog
/lorax-templates-rhel-10.0-18.tar.gz /lorax-templates-rhel-10.0-18.tar.gz
/lorax-templates-rhel-10.0-19.tar.gz /lorax-templates-rhel-10.0-19.tar.gz
/lorax-templates-rhel-10.0-20.tar.gz /lorax-templates-rhel-10.0-20.tar.gz
/lorax-templates-rhel-10.0-21.tar.gz

4
80-rhel/live/ppc64le.tmpl
View File

@ -36,9 +36,7 @@ mkdir ${BOOTDIR}
install ${configdir}/bootinfo.txt ${BOOTDIR} install ${configdir}/bootinfo.txt ${BOOTDIR}
mkdir ${GRUBDIR}/powerpc-ieee1275 mkdir ${GRUBDIR}/powerpc-ieee1275
## "()" means the current device to grub2 install /usr/lib/grub/powerpc-ieee1275/core.elf ${GRUBDIR}/powerpc-ieee1275
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/*.mod ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.mod ${GRUBDIR}/powerpc-ieee1275
install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275

4
80-rhel/ppc64le.tmpl
View File

@ -36,9 +36,7 @@ mkdir ${BOOTDIR}
install ${configdir}/bootinfo.txt ${BOOTDIR} install ${configdir}/bootinfo.txt ${BOOTDIR}
mkdir ${GRUBDIR}/powerpc-ieee1275 mkdir ${GRUBDIR}/powerpc-ieee1275
## "()" means the current device to grub2 install /usr/lib/grub/powerpc-ieee1275/core.elf ${GRUBDIR}/powerpc-ieee1275
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/*.mod ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.mod ${GRUBDIR}/powerpc-ieee1275
install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275 install /usr/lib/grub/powerpc-ieee1275/*.lst ${GRUBDIR}/powerpc-ieee1275

2
SERIAL
View File

@ -1 +1 @@
20 21

11
lorax-templates-rhel.spec
View File

@ -1,6 +1,6 @@
Name: lorax-templates-rhel Name: lorax-templates-rhel
Version: 10.0 Version: 10.0
Release: 20%{?dist} Release: 21%{?dist}
Summary: RHEL build templates for lorax and livemedia-creator Summary: RHEL build templates for lorax and livemedia-creator
License: GPLv2+ License: GPLv2+
@ -10,7 +10,7 @@ BuildArch: noarch
# This tarball is generated from the contents of this dist-git repository # This tarball is generated from the contents of this dist-git repository
# by running the command `make tar`. # by running the command `make tar`.
# See README for full details of how to update this package # See README for full details of how to update this package
Source0: lorax-templates-rhel-10.0-20.tar.gz Source0: lorax-templates-rhel-10.0-21.tar.gz
# Required for the template branding support # Required for the template branding support
Requires: lorax >= 34.9.1 Requires: lorax >= 34.9.1
@ -40,6 +40,13 @@ cp -a 80-rhel/* $RPM_BUILD_ROOT/%{templatedir}
%{templatedir}/* %{templatedir}/*
%changelog %changelog
* Wed Dec 14 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-21
- Sync from CentOS Stream 9
- On ppc64le Use core.elf from grub2 package (bcl)
Resolves: rhbz#2143422
- 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.
* Tue Oct 18 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-20 * Tue Oct 18 2022 Stephen Gallagher <sgallagh@redhat.com> - 10.0-20
- Sync from Fedora - Sync from Fedora
- Commit (502cc01d9a8a8c6626e83ff7ea7f7853cce92df5) - Commit (502cc01d9a8a8c6626e83ff7ea7f7853cce92df5)

2
sources
View File

@ -1 +1 @@
SHA512 (lorax-templates-rhel-10.0-20.tar.gz) = 06304e00a34ac72676ec7299c28ff38a0c852ec9bc8484baab205417cf25883cef0441296aab823a2d44726c92eb054ecbb095f395672e8846209708574f3240 SHA512 (lorax-templates-rhel-10.0-21.tar.gz) = 10e0d168be4cd276042e23bab6212ea24244b486e5ab8bef7c7d86ee9b530ce11557b87d69a0dc28b6067dbde5edc74ea19dd31fc046cd9f67cb8e05c0417f74