Compare commits

...

No commits in common. "imports/c9/supermin-5.2.1-8.el9" and "c8-stream-rhel" have entirely different histories.

6 changed files with 103 additions and 108 deletions

View File

@ -1,7 +1,7 @@
From 90251e796a14cd7ce77ad7f07fd1fbe5d3a43664 Mon Sep 17 00:00:00 2001
From b1672fa8a1fdb9c00a0fa1c04547d69abc6afb0a Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 1 Feb 2021 10:07:02 +0000
Subject: [PATCH 1/4] Open Unix.LargeFile to avoid "lstat: Value too large for
Subject: [PATCH] Open Unix.LargeFile to avoid "lstat: Value too large for
defined data type".
On 32 bit platforms, because OCaml native ints are limited to 31 bits,
@ -18,6 +18,8 @@ using int64 for some (unfortunately not all) fields.
For more information see the OCaml sources, file
otherlibs/unix/stat.c, all instances of "EOVERFLOW".
(cherry picked from commit fd9f17c7eb63979af882533a0d234bfc8ca42de3)
---
src/format_chroot.ml | 1 +
src/format_ext2.ml | 1 +

View File

@ -1,11 +1,12 @@
From 629069fb8c4101d21ec7883e2a137cb280fbe448 Mon Sep 17 00:00:00 2001
From d5e5a787b53490c5503a598721d7b34b7d30badd Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 29 Nov 2021 14:40:15 +0000
Subject: [PATCH 2/4] Ignore zfcpdump kernel on s390x
Subject: [PATCH] Ignore zfcpdump kernel on s390x
Reported-by: Sebastian Mitterle
Thanks: Cornelia Huck
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2027375
(cherry picked from commit 9fbe476d4df0b01568d3668e6121cae7c779c8c7)
---
src/format_ext2_kernel.ml | 2 ++
1 file changed, 2 insertions(+)

View File

@ -1,7 +1,7 @@
From 664ef10ae4fe0f6070f43f2cf1efd1a05d5514d9 Mon Sep 17 00:00:00 2001
From b843c724ee6e3f66991b8bd81a602e2bea0c1625 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Wed, 1 Dec 2021 10:28:36 +0000
Subject: [PATCH 3/4] Ignore unbootable kernels in /lib/modules
Subject: [PATCH] Ignore unbootable kernels in /lib/modules
The previous commit didn't ignore zfcpdump kernels if found in
/lib/modules because we didn't apply the kernel filter to those paths.
@ -13,6 +13,7 @@ roles.
Fixes: commit 9fbe476d4df0b01568d3668e6121cae7c779c8c7
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2027375
Reported-by: Yongkui Guo
(cherry picked from commit f53868ce875fc17527696a85b48c67fefa3176e7)
---
src/format_ext2_kernel.ml | 44 +++++++++++++++++++++++----------------
1 file changed, 26 insertions(+), 18 deletions(-)

View File

@ -1,7 +1,7 @@
From 0b3ae5be86025f4902cb558f377e446baf49bc6d Mon Sep 17 00:00:00 2001
From b2565eb1ddc43d8ff6e3406f11004ff42ab108aa Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Mon, 28 Feb 2022 16:54:33 -0500
Subject: [PATCH 4/4] Ignore debug kernels
Subject: [PATCH] Ignore debug kernels
On RHEL 8.2 with RT, these kernels are not bootable. The kernel in
that instance was called
@ -11,7 +11,6 @@ kernel-rt-debug-core-4.18.0-193.70.1.rt13.120.el8_2.x86_64
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2051332
(cherry picked from commit c44d685e662e001f5fe70f0a98d0964cb561e1ec)
(cherry picked from commit 7f91755424299fde5dec1af83c7c99b107a94a9d)
---
src/format_ext2_kernel.ml | 2 ++
1 file changed, 2 insertions(+)

55
SOURCES/copy-patches.sh Executable file
View File

@ -0,0 +1,55 @@
#!/bin/bash -
set -e
# Maintainer script to copy patches from the git repo to the current
# directory. Use it like this:
# ./copy-patches.sh
rhel_version=8.7.0
# Check we're in the right directory.
if [ ! -f supermin.spec ]; then
echo "$0: run this from the directory containing 'supermin.spec'"
exit 1
fi
git_checkout=$HOME/d/supermin-rhel-$rhel_version
if [ ! -d $git_checkout ]; then
echo "$0: $git_checkout does not exist"
echo "This script is only for use by the maintainer when preparing a"
echo "supermin release on RHEL."
exit 1
fi
# Get the base version of supermin.
version=`grep '^Version:' supermin.spec | awk '{print $2}'`
tag="v$version"
# Remove any existing patches.
git rm -f [0-9]*.patch ||:
rm -f [0-9]*.patch
# Get the patches.
(cd $git_checkout; rm -f [0-9]*.patch; git format-patch -N --submodule=diff $tag)
mv $git_checkout/[0-9]*.patch .
# Remove any not to be applied.
rm -f *NOT-FOR-RPM*.patch
# Add the patches.
git add [0-9]*.patch
# Print out the patch lines.
echo
echo "--- Copy the following text into supermin.spec file"
echo
echo "# Patches."
for f in [0-9]*.patch; do
n=`echo $f | awk -F- '{print $1}'`
echo "Patch$n: $f"
done
echo
echo "--- End of text"

View File

@ -29,14 +29,10 @@
Summary: Tool for creating supermin appliances
Name: supermin
Version: 5.2.1
Release: 8%{?dist}
Release: 2%{?dist}
License: GPLv2+
ExclusiveArch: %{kernel_arches}
%if 0%{?rhel}
# No qemu-kvm on POWER (RHBZ#1946532).
ExcludeArch: %{power64}
%endif
ExcludeArch: %{ix86}
URL: http://people.redhat.com/~rjones/supermin/
Source0: http://download.libguestfs.org/supermin/%{source_directory}/%{name}-%{version}.tar.gz
@ -44,15 +40,17 @@ Source1: http://download.libguestfs.org/supermin/%{source_directory}/%{nam
# Keyring used to verify tarball signature.
Source2: libguestfs.keyring
# Patches are stored here:
# https://github.com/libguestfs/supermin/tree/rhel-9.1
# RHEL 8 git repository is:
# https://github.com/libguestfs/supermin/tree/rhel-8.7.0
# Use 'copy-patches.sh' to copy the patches from the git repo
# to the current directory.
# Patches.
Patch0001: 0001-Open-Unix.LargeFile-to-avoid-lstat-Value-too-large-f.patch
Patch0002: 0002-Ignore-zfcpdump-kernel-on-s390x.patch
Patch0003: 0003-Ignore-unbootable-kernels-in-lib-modules.patch
Patch0004: 0004-Ignore-debug-kernels.patch
BuildRequires: make
BuildRequires: /usr/bin/pod2man
BuildRequires: /usr/bin/pod2html
BuildRequires: rpm
@ -76,14 +74,6 @@ BuildRequires: gnupg2
# tests to not require these packages.
BuildRequires: augeas hivex kernel tar
%if 0%{?rhel}
%ifarch s390x
# On RHEL 9 s390x, kernel incorrectly pulls in kernel-zfcpdump-core
# https://bugzilla.redhat.com/show_bug.cgi?id=2027654
BuildRequires: kernel-core
%endif
%endif
# For complicated reasons, this is required so that
# /bin/kernel-install puts the kernel directly into /boot, instead of
# into a /boot/<machine-id> subdirectory (in Fedora >= 23). Read the
@ -108,6 +98,9 @@ Requires: findutils
Source3: supermin.attr
Source4: supermin-find-requires
# Maintainer script which helps with handling patches.
Source5: copy-patches.sh
%description
Supermin is a tool for building supermin appliances. These are tiny
@ -131,7 +124,8 @@ from supermin appliances.
%prep
%if 0%{verify_tarball_signature}
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
tmphome="$(mktemp -d)"
gpgv2 --homedir "$tmphome" --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%endif
%setup -q
%autopatch -p1
@ -181,94 +175,37 @@ make check || {
%changelog
* Tue Mar 15 2022 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-8
- Fix ignore +debug kernels when choosing a kernel to boot
resolves: rhbz#2059397
* Fri Mar 04 2022 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-2.el8
- Supermin should ignore +debug kernels
resolves: rhbz#2051332
- Add copy-patches script.
* Wed Dec 01 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-7
- Further fix to ignore zfcpdump kernel on s390x
* Thu Sep 2 2021 Danilo C. L. de Paula <ddepaula@redhat.com> - 5.2.1-1.el8
- Resolves: bz#2000225
(Rebase virt:rhel module:stream based on AV-8.6)
* Tue Nov 30 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-6
- Ignore zfcpdump kernel on s390x
resolves: rhbz#2027375
* Mon Apr 27 2020 Danilo C. L. de Paula <ddepaula@redhat.com> - 5.1.19
- Resolves: bz#1810193
(Upgrade components in virt:rhel module:stream for RHEL-8.3 release)
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.1-4
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jun 28 2019 Danilo de Paula <ddepaula@redhat.com> - 5.1.19-9
- Rebuild all virt packages to fix RHEL's upgrade path
- Resolves: rhbz#1695587
(Ensure modular RPM upgrade path)
* Wed Jun 2 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-3
- Add gating tests (for RHEL 9)
* Tue Oct 16 2018 Richard W.M. Jones <rjones@redhat.com> - 5.1.19-8
- Pass CFLAGS & LDFLAGS to final supermin link
resolves: rhbz#1624175
* Fri May 07 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-2.el9.1
- Do not include the package on POWER on RHEL 9
resolves: rhbz#1956934
* Fri Jul 20 2018 Richard W.M. Jones <rjones@redhat.com> - 5.1.19-7
- Rebuild for OCaml 4.07.0.
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 5.2.1-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jun 6 2018 Richard W.M. Jones <rjones@redhat.com> - 5.1.19-6
- Drop dietlibc in RHEL 8
resolves: rhbz#1588067
* Mon Feb 01 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.1-1
- New upstream version 5.2.1.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Jan 14 2021 Richard W.M. Jones <rjones@redhat.com> - 5.2.0-6
- Remove inactive strip override (see RHBZ#1915570).
* Mon Nov 23 2020 Richard W.M. Jones <rjones@redhat.com> - 5.2.0-5
- Disable dietlibc on RHEL 9.
* Fri Aug 07 2020 Troy Dawson <tdawson@redhat.com> - 5.2.0-4
- Use ExclusiveArch: %{kernel_arches}
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Apr 03 2020 Richard W.M. Jones <rjones@redhat.com> - 5.2.0-2
- ppc64le: ibmvscsi driver missing from supermin appliance (RHBZ#1819019).
* Tue Mar 10 2020 Richard W.M. Jones <rjones@redhat.com> - 5.2.0-1
- New upstream stable version 5.2.0.
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.20-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Tue Dec 10 2019 Richard W.M. Jones <rjones@redhat.com> - 5.1.20-11
- Add further patch to fix symlinks (RHBZ#1770304).
- Add all patches since 5.1.20 was released.
* Thu Nov 28 2019 Richard W.M. Jones <rjones@redhat.com> - 5.1.20-10
- Add upstream patch to fix symlinks on recent kernels (RHBZ#1770304).
* Wed Nov 27 2019 Richard W.M. Jones <rjones@redhat.com> - 5.1.20-9
- Use gpgverify macro instead of explicit gpgv2 command.
* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 5.1.20-8
- OCaml 4.08.1 (rc2) rebuild.
* Sat Jul 27 2019 Richard W.M. Jones <rjones@redhat.com> - 5.1.20-7
- Disable package on i686 because no kernel.
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.20-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jun 10 22:13:23 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.1.20-5
- Rebuild for RPM 4.15
* Mon Jun 10 15:42:06 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5.1.20-4
- Rebuild for RPM 4.15
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.20-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jan 24 2019 Richard W.M. Jones <rjones@redhat.com> - 5.1.20-2
- Add upstream patches to diagnose possible F29 issue.
* Thu Jan 17 2019 Richard W.M. Jones <rjones@redhat.com> - 5.1.20-1
- New upstream version 5.1.20.
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.19-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue May 22 2018 Richard W.M. Jones <rjones@redhat.com> - 5.1.19-5
- Bump release and rebuild.
* Sat Feb 24 2018 Florian Weimer <fweimer@redhat.com> - 5.1.19-4
- Reenable hardened build