From 4d1b5dc1c1375c590d74e94ff2947a73abb5f330 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sep 28 2021 12:46:24 +0000 Subject: Import anaconda-33.16.5.6-2.hs.el8 --- diff --git a/.anaconda.metadata b/.anaconda.metadata index aa98b79..cf8658d 100644 --- a/.anaconda.metadata +++ b/.anaconda.metadata @@ -1 +1 @@ -c7cdac90390b3bb8d66bfc228df087585ebc453e SOURCES/anaconda-33.16.5.3.tar.bz2 +44557b8c6c1d2c83c8d431351f896199b38a3d6a SOURCES/anaconda-33.16.5.6.tar.bz2 diff --git a/.gitignore b/.gitignore index 3f6a7fa..af845fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/anaconda-33.16.5.2.tar.bz2 +SOURCES/anaconda-33.16.5.6.tar.bz2 diff --git a/SOURCES/0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch b/SOURCES/0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch deleted file mode 100644 index 73f1cc2..0000000 --- a/SOURCES/0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a9193e649be010130d57fc6b49427f329e20fb69 Mon Sep 17 00:00:00 2001 -From: Carl George -Date: Fri, 9 Jul 2021 17:09:28 -0500 -Subject: [PATCH] Use a custom stylesheet to define CentOS-specific stylesheet - data - -Use a stylesheet provided by the centos-logos package. This is adapted -from #3179, which is intended for RHEL9+, but CentOS Stream 8 is going -to take advantage of that approach as well. - -Related: rhbz#1974149 ---- - data/product.d/centos-stream.conf | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf -index 723a484038..c9eefe8a6d 100644 ---- a/data/product.d/centos-stream.conf -+++ b/data/product.d/centos-stream.conf -@@ -29,6 +29,8 @@ default_help_pages = - centos_help_placeholder.xml - centos_help_placeholder.xml - -+custom_stylesheet = /usr/share/anaconda/pixmaps/redhat.css -+ - [Payload] - enable_closest_mirror = True - default_source = CLOSEST_MIRROR --- -2.31.1 - diff --git a/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch b/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch index 4fc8ab2..3c9f51c 100644 --- a/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch +++ b/SOURCES/20001-Import-RPM-certificates-at-end-of-installation.patch @@ -1,4 +1,4 @@ -From bc03f2abb2924bd22d7e8b4a3c2a5be5ae3e8463 Mon Sep 17 00:00:00 2001 +From 424c4014c88cc6a0b1f6df8ec0a2a4d43125230c Mon Sep 17 00:00:00 2001 From: Vladimir Slavik Date: Tue, 15 Sep 2020 09:57:58 +0200 Subject: [PATCH 20001/20007] Import RPM certificates at end of installation @@ -189,5 +189,5 @@ index f047a1e66..c2c3c0c0f 100644 + version = util.get_os_version(root) + self.assertEqual(version, None) -- -2.31.1 +2.32.0 diff --git a/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch b/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch index 631d7dd..42f559c 100644 --- a/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch +++ b/SOURCES/20002-Define-the-updates-repositories-in-the-Anaconda-con.patch @@ -1,4 +1,4 @@ -From 1ca30ca30dbb5b19139d6ce5bfc9560dea089ebf Mon Sep 17 00:00:00 2001 +From 4e37dd06b9a21ec2ff92171751e764cf040094b5 Mon Sep 17 00:00:00 2001 From: Vendula Poncova Date: Fri, 27 Nov 2020 13:30:53 +0100 Subject: [PATCH 20002/20007] Define the updates repositories in the Anaconda @@ -154,5 +154,5 @@ index d0d4da72b..a5d89e1c2 100644 else: really_hide(self._updates_box) -- -2.31.1 +2.32.0 diff --git a/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch b/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch index e37e7f4..a1c68ae 100644 --- a/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch +++ b/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch @@ -1,4 +1,4 @@ -From 39db82a878e3c60d4cd7e343a0110c933ebd6a37 Mon Sep 17 00:00:00 2001 +From 5df5658fba7d16f385078f1fa4afd748aef65150 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 14 May 2021 15:03:05 -0400 Subject: [PATCH 20003/20007] Revert "Remove kickstart btrfs support" @@ -50,5 +50,5 @@ index c5e1b2938..4bb102c08 100644 from pykickstart.commands.reboot import F23_Reboot as Reboot from pykickstart.commands.repo import RHEL8_Repo as Repo -- -2.31.1 +2.32.0 diff --git a/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch b/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch index 7aa9077..6ee142b 100644 --- a/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch +++ b/SOURCES/20004-Add-product-configuration-for-CentOS-Stream-Hypersc.patch @@ -1,4 +1,4 @@ -From 5f643e473c98246f947fbeea566e2ddc8bae4e32 Mon Sep 17 00:00:00 2001 +From d9c16ae9bc72ecf714d793e67ae7fd9e280a41ad Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 26 Jun 2021 08:21:49 -0400 Subject: [PATCH 20004/20007] Add product configuration for CentOS Stream @@ -48,5 +48,5 @@ index 000000000..88979adb5 + epel-next + powertools -- -2.31.1 +2.32.0 diff --git a/SOURCES/20005-Storage-add-btrfs_compression-option.patch b/SOURCES/20005-Storage-add-btrfs_compression-option.patch index d8b6da1..b776145 100644 --- a/SOURCES/20005-Storage-add-btrfs_compression-option.patch +++ b/SOURCES/20005-Storage-add-btrfs_compression-option.patch @@ -1,4 +1,4 @@ -From c45667cb27c72293ebb16ae11350af2715d6a93b Mon Sep 17 00:00:00 2001 +From 0c0fa70924336d66faaf1923ad21a3a447fe0601 Mon Sep 17 00:00:00 2001 From: Michel Alexandre Salim Date: Tue, 16 Feb 2021 18:39:29 -0800 Subject: [PATCH 20005/20007] [Storage] add btrfs_compression option @@ -19,14 +19,14 @@ Default this to None, but set it to "zstd:1" for CentOS Stream Hyperscale. 5 files changed, 18 insertions(+), 1 deletion(-) diff --git a/anaconda.spec.in b/anaconda.spec.in -index b5c3b7824..0f0f904a5 100644 +index 86e576819..7e443c580 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -35,6 +35,7 @@ Source0: %{name}-%{version}.tar.bz2 %define nmver 1.0 %define pykickstartver 3.16.11-1 %define pypartedver 2.5-2 -+%define pythonblivetver 1:3.2.2-11 ++%define pythonblivetver 1:3.4.0-1 %define rpmver 4.10.0 %define simplelinever 1.1-1 %define utillinuxver 2.15.1 @@ -34,7 +34,7 @@ index b5c3b7824..0f0f904a5 100644 Summary: Core of the Anaconda installer Requires: python3-libs Requires: python3-dnf >= %{dnfver} --Requires: python3-blivet >= 1:3.2.2-1 +-Requires: python3-blivet >= 1:3.4.0-1 +Requires: python3-blivet >= %{pythonblivetver} Requires: python3-blockdev >= %{libblockdevver} Requires: python3-meh >= %{mehver} @@ -100,5 +100,5 @@ index cb2488a31..6b2838ead 100644 # Platform class setup depends on flags, re-initialize it. platform.update_from_flags() -- -2.31.1 +2.32.0 diff --git a/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch b/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch index 7be14f5..9e7ee19 100644 --- a/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch +++ b/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch @@ -1,4 +1,4 @@ -From 31f9517e68e40e2d3e73dda4c6dfced3b106a5f1 Mon Sep 17 00:00:00 2001 +From 4a619d0f0b629929fdd3c639f7475e69a09ef045 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 27 Jun 2021 17:46:23 -0400 Subject: [PATCH 20006/20007] Change rhel-welcome to centos-welcome @@ -110,5 +110,5 @@ index 7b6df634f..eda6399d8 100755 Gtk.Settings.get_default().gtk_application_prefer_dark_theme = true; -- -2.31.1 +2.32.0 diff --git a/SOURCES/20007-Add-support-for-detecting-the-Hyperscale-variant-in.patch b/SOURCES/20007-Add-support-for-detecting-the-Hyperscale-variant-in.patch index ed34a5f..d7a26b7 100644 --- a/SOURCES/20007-Add-support-for-detecting-the-Hyperscale-variant-in.patch +++ b/SOURCES/20007-Add-support-for-detecting-the-Hyperscale-variant-in.patch @@ -1,4 +1,4 @@ -From b045c446ed8c845b4fb1b49a1542127d803868bb Mon Sep 17 00:00:00 2001 +From 255327663550b796e67ea5fb2ab245034d3697e5 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 27 Jun 2021 21:01:07 -0400 Subject: [PATCH 20007/20007] Add support for detecting the Hyperscale variant @@ -35,5 +35,5 @@ index 4e3a670f3..b7106bbc1 100755 # FIXME really, livemedia-creator should include .buildstamp in live # images, if it did, we could remove this: -- -2.31.1 +2.32.0 diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 8dea224..7a2254f 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,6 +1,6 @@ Summary: Graphical system installer Name: anaconda -Version: 33.16.5.3 +Version: 33.16.5.6 Release: 2%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -12,9 +12,6 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: %{name}-%{version}.tar.bz2 -# https://github.com/rhinstaller/anaconda/pull/3477 -Patch10001: 0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch - ## Hyperscale changes ### Cf. https://pagure.io/centos-sig-hyperscale/anaconda/commits/c8s-hs-v33.16.5.2 Patch20001: 20001-Import-RPM-certificates-at-end-of-installation.patch @@ -48,7 +45,7 @@ Patch20007: 20007-Add-support-for-detecting-the-Hyperscale-variant-in.patch %define nmver 1.0 %define pykickstartver 3.16.11-1 %define pypartedver 2.5-2 -%define pythonblivetver 1:3.2.2-11 +%define pythonblivetver 1:3.4.0-1 %define rpmver 4.10.0 %define simplelinever 1.1-1 %define utillinuxver 2.15.1 @@ -121,7 +118,6 @@ Requires: python3-systemd Requires: python3-productmd Requires: python3-dasbus >= %{dasbusver} Requires: flatpak-libs -# https://github.com/rhinstaller/anaconda/pull/3534 %if %{defined rhel} && %{undefined centos} Requires: python3-syspurpose Requires: subscription-manager >= 1.26 @@ -394,7 +390,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog -* Wed Jul 28 2021 Neal Gompa - 33.16.5.3-2 +* Tue Sep 28 2021 Neal Gompa - 33.16.5.6-2 - Add changes for CentOS Hyperscale spin + Re-enable Btrfs support + Add CentOS Stream Hyperscale config @@ -403,6 +399,32 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d + Debrand the liveinst welcome widget + Add support for Hyperscale variant in liveinst +* Fri Sep 24 2021 Radek Vykydal - 33.16.5.6-1 +- Payload should wait for all storage related threads to finish (mkolman) + Resolves: rhbz#2002203 + +* Mon Sep 13 2021 Radek Vykydal - 33.16.5.5-1 +- Remove misleading warning about inst.ks.device replacing ksdevice (rvykydal) + Resolves: rhbz#2001913 + +* Mon Aug 02 2021 Radek Vykydal - 33.16.5.4-1 +- Disable anaconda-core's requirement on subscription-manager on CentOS (carl) + Resolves: rhbz#1984958 +- Show suggestions for an error caused by inconsistent sector sizes (vponcova) + Resolves: rhbz#1935722 +- Use a custom stylesheet to define CentOS-specific stylesheet data (carl) + Related: rhbz#1974149 +- Use RHEL help content for RHV/Ovirt (mkolman) + Resolves: rhbz#1915910 +- Move post installation scripts to the end of queue (lveyde) + Resolves: rhbz#1970879 +- Do not generate dracut arguments multiple times for some storage devices + (rvykydal) + Related: rhbz#1937208 +- Make failure in generating of dracut arguments for iSCSI device non-fatal. + (rvykydal) + Resolves: rhbz#1937208 + * Thu Jul 01 2021 Radek Vykydal - 33.16.5.3-1 - Check source type directly, not via DBus (mkolman) Resolves: rhbz#1941578