From 215d7ed2b9f0e34ee42109af7648fc1a27a40513 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Jul 28 2021 23:37:31 +0000 Subject: Import anaconda-33.16.5.3-2.hs.el8 --- diff --git a/.anaconda.metadata b/.anaconda.metadata index f5b2363..aa98b79 100644 --- a/.anaconda.metadata +++ b/.anaconda.metadata @@ -1 +1 @@ -93086dd1fa8f4760ad806a46500e0c72c9bbd361 SOURCES/anaconda-33.16.5.2.tar.bz2 +c7cdac90390b3bb8d66bfc228df087585ebc453e SOURCES/anaconda-33.16.5.3.tar.bz2 diff --git a/SOURCES/0001-Fix-CDN-button-visibility.patch b/SOURCES/0001-Fix-CDN-button-visibility.patch deleted file mode 100644 index 2f30fff..0000000 --- a/SOURCES/0001-Fix-CDN-button-visibility.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 105134042d26ce62ecd39657f016e0b333d4aa68 Mon Sep 17 00:00:00 2001 -From: Martin Kolman -Date: Fri, 11 Sep 2020 15:27:59 +0200 -Subject: [PATCH 1/2] Fix CDN button visibility - -Only show the Red Hat CDN button if the Subscription -module appears to be running. To achieve that, we do -the same thing as with the HMC button - the CDN -button invisible by default. And enable it only if it -looks like the Subscription module is running. - -(cherry picked from commit: aca297587ab8bdd7342fa056273bfff379bc0a0b) - -Resolves: rhbz#1903178 - -https://github.com/rhinstaller/anaconda/pull/3020 -https://github.com/M4rtinK/anaconda/commit/c29802a2be591a4cdcc91ba86b74fc4d01087b72 ---- - pyanaconda/ui/gui/spokes/installation_source.glade | 2 +- - pyanaconda/ui/gui/spokes/installation_source.py | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/pyanaconda/ui/gui/spokes/installation_source.glade b/pyanaconda/ui/gui/spokes/installation_source.glade -index a23f8be714..e53fa230ca 100644 ---- a/pyanaconda/ui/gui/spokes/installation_source.glade -+++ b/pyanaconda/ui/gui/spokes/installation_source.glade -@@ -633,9 +633,9 @@ - - - Red Hat _CDN -- True - True - False -+ True - 12 - True - 0 -diff --git a/pyanaconda/ui/gui/spokes/installation_source.py b/pyanaconda/ui/gui/spokes/installation_source.py -index 6aab9b387a..d0d4da72b9 100644 ---- a/pyanaconda/ui/gui/spokes/installation_source.py -+++ b/pyanaconda/ui/gui/spokes/installation_source.py -@@ -854,9 +854,9 @@ class SourceSpoke(NormalSpoke, GUISpokeInputCheckHandler, SourceSwitchHandler): - def _initialize(self): - threadMgr.wait(constants.THREAD_PAYLOAD) - -- # If there is no Subscriptiopn DBus module, disable the CDN radio button -+ # If there is the Subscriptiopn DBus module, make the CDN radio button visible - if is_module_available(SUBSCRIPTION): -- gtk_call_once(self._cdn_button.set_no_show_all, True) -+ gtk_call_once(self._cdn_button.set_no_show_all, False) - - # Get the current source. - source_proxy = self.payload.get_source_proxy() --- -2.31.1 - 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 new file mode 100644 index 0000000..73f1cc2 --- /dev/null +++ b/SOURCES/0001-Use-a-custom-stylesheet-to-define-CentOS-specific-st.patch @@ -0,0 +1,31 @@ +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/0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch b/SOURCES/0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch deleted file mode 100644 index 8e7adf3..0000000 --- a/SOURCES/0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 96351859cfd2030c4ab2f931f2f0a38190180e00 Mon Sep 17 00:00:00 2001 -From: Vendula Poncova -Date: Wed, 10 Feb 2021 17:50:11 +0100 -Subject: [PATCH 2/2] Use a custom stylesheet to define RHEL-specific - stylesheet data - -Use a stylesheet provided by the rhel-logos package. ---- - data/product.d/rhel.conf | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/data/product.d/rhel.conf b/data/product.d/rhel.conf -index c4de9b6a8a..5f69be1d45 100644 ---- a/data/product.d/rhel.conf -+++ b/data/product.d/rhel.conf -@@ -50,6 +50,7 @@ default_help_pages = - rhel_help_placeholder.xml - rhel_help_placeholder.xml - -+custom_stylesheet = /usr/share/anaconda/pixmaps/redhat.css - blivet_gui_supported = False - - [License] --- -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 e0ec7a2..4fc8ab2 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 4ebcf9d422bef11bd5b50f421a4b30ed826d1cbb Mon Sep 17 00:00:00 2001 +From bc03f2abb2924bd22d7e8b4a3c2a5be5ae3e8463 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 @@ -37,10 +37,10 @@ index 824f4bb56..ab6c15bb6 100644 [Security] # Enable SELinux usage in the installed system. diff --git a/data/product.d/centos-stream.conf b/data/product.d/centos-stream.conf -index 723a48403..c8af2d2fe 100644 +index c9eefe8a6..0178bc9e4 100644 --- a/data/product.d/centos-stream.conf +++ b/data/product.d/centos-stream.conf -@@ -32,3 +32,5 @@ default_help_pages = +@@ -34,3 +34,5 @@ custom_stylesheet = /usr/share/anaconda/pixmaps/redhat.css [Payload] enable_closest_mirror = True default_source = CLOSEST_MIRROR @@ -83,18 +83,18 @@ index ab4cd900b..17d56b752 100644 +# OS version in os-release file +OS_RELEASE_OS_VERSION = re.compile(r"VERSION_ID=[\"']?([0-9a-z._-]+)[\"']?") diff --git a/pyanaconda/core/util.py b/pyanaconda/core/util.py -index 6fab33ed5..73c9d5ba3 100644 +index 825bb7260..16a0f6c6f 100644 --- a/pyanaconda/core/util.py +++ b/pyanaconda/core/util.py -@@ -47,6 +47,7 @@ from pyanaconda.core.constants import DRACUT_SHUTDOWN_EJECT, TRANSLATIONS_UPDATE +@@ -45,6 +45,7 @@ from pyanaconda.core.process_watchers import WatchProcesses + from pyanaconda.core.constants import DRACUT_SHUTDOWN_EJECT, TRANSLATIONS_UPDATE_DIR, \ IPMI_ABORTED, X_TIMEOUT, TAINT_HARDWARE_UNSUPPORTED, TAINT_SUPPORT_REMOVED, \ WARNING_HARDWARE_UNSUPPORTED, WARNING_SUPPORT_REMOVED - from pyanaconda.core.constants import SCREENSHOTS_DIRECTORY, SCREENSHOTS_TARGET_DIRECTORY +from pyanaconda.core.regexes import OS_RELEASE_OS_VERSION from pyanaconda.errors import RemovedModuleError from pyanaconda.anaconda_logging import program_log_lock -@@ -1489,3 +1490,22 @@ def is_smt_enabled(): +@@ -1469,3 +1470,22 @@ def is_smt_enabled(): except (IOError, ValueError): log.warning("Failed to detect SMT.") return False 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 390f93e..631d7dd 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 5d5d1a7099537a0da7c5a54520d7474b4696d940 Mon Sep 17 00:00:00 2001 +From 1ca30ca30dbb5b19139d6ce5bfc9560dea089ebf 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 @@ -109,7 +109,7 @@ index 4cc2c0244..de521e009 100644 @property def enabled_repositories_from_treeinfo(self): diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py -index 9c56068e9..3f0abea3f 100644 +index f6b433062..b413a55fd 100644 --- a/pyanaconda/core/constants.py +++ b/pyanaconda/core/constants.py @@ -63,10 +63,6 @@ DEFAULT_REPOS = [productName.split('-')[0].lower(), diff --git a/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch b/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch index a41341a..e37e7f4 100644 --- a/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch +++ b/SOURCES/20003-Revert-Remove-kickstart-btrfs-support.patch @@ -1,4 +1,4 @@ -From 1a19890f66c6e746f3d6a9cd5c981946552e07a7 Mon Sep 17 00:00:00 2001 +From 39db82a878e3c60d4cd7e343a0110c933ebd6a37 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" 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 8e89fef..7aa9077 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 225e4acb9ec64c8fdc944c485aff74bc0441f171 Mon Sep 17 00:00:00 2001 +From 5f643e473c98246f947fbeea566e2ddc8bae4e32 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 diff --git a/SOURCES/20005-Storage-add-btrfs_compression-option.patch b/SOURCES/20005-Storage-add-btrfs_compression-option.patch index aec3582..d8b6da1 100644 --- a/SOURCES/20005-Storage-add-btrfs_compression-option.patch +++ b/SOURCES/20005-Storage-add-btrfs_compression-option.patch @@ -1,4 +1,4 @@ -From ab2ee2d89ed127fcd59326bec85a9404dbbaa425 Mon Sep 17 00:00:00 2001 +From c45667cb27c72293ebb16ae11350af2715d6a93b 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,7 +19,7 @@ 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 bd7d74eac..471093c17 100644 +index b5c3b7824..0f0f904a5 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -35,6 +35,7 @@ Source0: %{name}-%{version}.tar.bz2 diff --git a/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch b/SOURCES/20006-Change-rhel-welcome-to-centos-welcome.patch index c508e8e..7be14f5 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 32dede4a858792a6ff5ce57e4552ae42f35b17d3 Mon Sep 17 00:00:00 2001 +From 31f9517e68e40e2d3e73dda4c6dfced3b106a5f1 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 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 4d19b80..ed34a5f 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 e29db11f7cae3d42fe08ef0787f7f419acaff88c Mon Sep 17 00:00:00 2001 +From b045c446ed8c845b4fb1b49a1542127d803868bb 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 diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec index 9c84d96..8dea224 100644 --- a/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda -Version: 33.16.5.2 -Release: 5%{?dist} +Version: 33.16.5.3 +Release: 2%{?dist} License: GPLv2+ and MIT URL: http://fedoraproject.org/wiki/Anaconda @@ -12,11 +12,8 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: %{name}-%{version}.tar.bz2 -# https://github.com/rhinstaller/anaconda/pull/3020 -Patch10001: 0001-Fix-CDN-button-visibility.patch - # https://github.com/rhinstaller/anaconda/pull/3477 -Patch10002: 0002-Use-a-custom-stylesheet-to-define-RHEL-specific-styl.patch +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 @@ -124,7 +121,8 @@ Requires: python3-systemd Requires: python3-productmd Requires: python3-dasbus >= %{dasbusver} Requires: flatpak-libs -%if 0%{?rhel} +# https://github.com/rhinstaller/anaconda/pull/3534 +%if %{defined rhel} && %{undefined centos} Requires: python3-syspurpose Requires: subscription-manager >= 1.26 %endif @@ -396,21 +394,28 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d %{_prefix}/libexec/anaconda/dd_* %changelog -* Fri Jul 16 2021 Neal Gompa - 33.16.5.2-5 -- Merge in refreshed patch stack from c8s - -* Sun Jun 27 2021 Neal Gompa - 33.16.5.2-4 -- Fix liveinst to be able to detect Hyperscale variant - -* Sun Jun 27 2021 Neal Gompa - 33.16.5.2-3 -- Debrand the liveinst welcome widget - -* Sat Jun 26 2021 Neal Gompa - 33.16.5.2-2 +* Wed Jul 28 2021 Neal Gompa - 33.16.5.3-2 - Add changes for CentOS Hyperscale spin + Re-enable Btrfs support + Add CentOS Stream Hyperscale config + Backport improvements for managing default repositories + Backport support for zstd compression for Btrfs + + Debrand the liveinst welcome widget + + Add support for Hyperscale variant in liveinst + +* Thu Jul 01 2021 Radek Vykydal - 33.16.5.3-1 +- Check source type directly, not via DBus (mkolman) + Resolves: rhbz#1941578 +- Remove autostep functionality (vslavik) + Resolves: rhbz#1976913 +- Make it possible to skip install time Insights errors (mkolman) + Resolves: rhbz#1931069 +- Fix CDN button visibility (mkolman) + Resolves: rhbz#1903178 +- network: do not bind virtual devices to mac (rvykydal) + Resolves: rhbz#1963834 +- Add a log message for successful installation (vslavik) + Resolves: rhbz#1949487 * Mon May 24 2021 Radek Vykydal - 33.16.5.2-1 - Use modinfo to check ko before modprobe (t.feng94)