From ea44a676b3e55f6e09ea8a82f4d35c7c6e4c5403 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Mon, 5 Aug 2024 12:50:43 +0300 Subject: [PATCH] - Apply AlmaLinux patches --- anaconda-almalinux-add-minimal-repo.patch | 13 +++ ...da-almalinux-disable-cdn-radiobutton.patch | 12 +++ anaconda-almalinux-disable-subscription.patch | 14 ++++ anaconda-almalinux-installer-colors.patch | 16 ++++ ...nux-remove-visible-fedora-references.patch | 80 +++++++++++++++++++ anaconda.spec | 15 +++- 6 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 anaconda-almalinux-add-minimal-repo.patch create mode 100644 anaconda-almalinux-disable-cdn-radiobutton.patch create mode 100644 anaconda-almalinux-disable-subscription.patch create mode 100644 anaconda-almalinux-installer-colors.patch create mode 100644 anaconda-almalinux-remove-visible-fedora-references.patch diff --git a/anaconda-almalinux-add-minimal-repo.patch b/anaconda-almalinux-add-minimal-repo.patch new file mode 100644 index 0000000..753ea1c --- /dev/null +++ b/anaconda-almalinux-add-minimal-repo.patch @@ -0,0 +1,13 @@ +diff -Naur anaconda-34.25.0.29/pyanaconda/core/constants.py anaconda-34.25.0.29.minimal/pyanaconda/core/constants.py +--- anaconda-34.25.0.29/pyanaconda/core/constants.py 2022-03-17 17:39:24.000000000 +0100 ++++ anaconda-34.25.0.29.minimal/pyanaconda/core/constants.py 2022-05-24 14:07:32.000000000 +0200 +@@ -58,7 +58,8 @@ + "fedora-modular-server", + "rawhide", + "BaseOS", # Used by RHEL +- "baseos"] # Used by CentOS Stream ++ "baseos", # Used by CentOS Stream ++ "Minimal"] # Used by AlmaLinux + + DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS" + diff --git a/anaconda-almalinux-disable-cdn-radiobutton.patch b/anaconda-almalinux-disable-cdn-radiobutton.patch new file mode 100644 index 0000000..9cbde67 --- /dev/null +++ b/anaconda-almalinux-disable-cdn-radiobutton.patch @@ -0,0 +1,12 @@ +diff -uNrp anaconda-33.16.3.26.orig/pyanaconda/ui/gui/spokes/installation_source.py anaconda-33.16.3.26/pyanaconda/ui/gui/spokes/installation_source.py +--- anaconda-33.16.3.26.orig/pyanaconda/ui/gui/spokes/installation_source.py 2020-08-24 05:10:07.000000000 -0500 ++++ anaconda-33.16.3.26/pyanaconda/ui/gui/spokes/installation_source.py 2020-11-16 10:41:09.663907591 -0600 +@@ -704,6 +704,8 @@ class SourceSpoke(NormalSpoke, GUISpokeI + self._network_button = self.builder.get_object("networkRadioButton") + self._network_box = self.builder.get_object("networkBox") + ++ really_hide(self._cdn_button) ++ + self._url_entry = self.builder.get_object("urlEntry") + self._protocol_combo_box = self.builder.get_object("protocolComboBox") + self._iso_chooser_button = self.builder.get_object("isoChooserButton") diff --git a/anaconda-almalinux-disable-subscription.patch b/anaconda-almalinux-disable-subscription.patch new file mode 100644 index 0000000..ffe6c9d --- /dev/null +++ b/anaconda-almalinux-disable-subscription.patch @@ -0,0 +1,14 @@ +diff -uprN a/pyanaconda/ui/gui/spokes/subscription.py b/pyanaconda/ui/gui/spokes/subscription.py +--- a/pyanaconda/ui/gui/spokes/subscription.py 2020-09-04 11:31:43.743451360 +0300 ++++ b/pyanaconda/ui/gui/spokes/subscription.py 2020-09-04 11:33:07.002306508 +0300 +@@ -540,6 +540,10 @@ class SubscriptionSpoke(NormalSpoke): + # also set the spoke warning banner + self.show_warning_message(error_message) + ++ @property ++ def showable(self): ++ return False ++ + def initialize(self): + NormalSpoke.initialize(self) + self.initialize_start() diff --git a/anaconda-almalinux-installer-colors.patch b/anaconda-almalinux-installer-colors.patch new file mode 100644 index 0000000..a5b2cfc --- /dev/null +++ b/anaconda-almalinux-installer-colors.patch @@ -0,0 +1,16 @@ +diff -uprN a/data/anaconda-gtk.css b/data/anaconda-gtk.css +--- a/data/anaconda-gtk.css 2020-11-16 01:33:12.596735620 +0300 ++++ b/data/anaconda-gtk.css 2020-11-16 01:35:17.925684936 +0300 +@@ -92,10 +92,11 @@ infobar.error { + + @define-color redhat #2d2d2d; + @define-color fedora #2f4265; ++@define-color almalinux #0b2335; + + /* theme colors/images */ + +-@define-color product_bg_color @fedora; ++@define-color product_bg_color @almalinux; + + /* logo and sidebar classes */ + diff --git a/anaconda-almalinux-remove-visible-fedora-references.patch b/anaconda-almalinux-remove-visible-fedora-references.patch new file mode 100644 index 0000000..d703fca --- /dev/null +++ b/anaconda-almalinux-remove-visible-fedora-references.patch @@ -0,0 +1,80 @@ +diff -aruN anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.desktop anaconda-34.25.0.23.alma/data/liveinst/gnome/fedora-welcome.desktop +--- anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.desktop 2021-12-09 18:57:10.000000000 +0300 ++++ anaconda-34.25.0.23.alma/data/liveinst/gnome/fedora-welcome.desktop 2022-01-27 16:41:21.926325600 +0300 +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Name=Welcome to Fedora ++Name=Welcome to AlmaLinux + Exec=/usr/share/anaconda/gnome/fedora-welcome + Terminal=false + Type=Application +diff -aruN anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.js anaconda-34.25.0.23.alma/data/liveinst/gnome/fedora-welcome.js +--- anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.js 2021-12-09 18:57:10.000000000 +0300 ++++ anaconda-34.25.0.23.alma/data/liveinst/gnome/fedora-welcome.js 2022-01-27 16:46:02.899570400 +0300 +@@ -62,7 +62,7 @@ + default_width: 600, + default_height: 550, + skip_taskbar_hint: true, +- title: _("Welcome to Fedora"), ++ title: _("Welcome to AlmaLinux"), + window_position: Gtk.WindowPosition.CENTER }); + this.window.connect('key-press-event', Lang.bind(this, + function(w, event) { +@@ -91,7 +91,7 @@ + spacing: 16 }); + tryContent.add(new Gtk.Image({ icon_name: 'media-optical', + pixel_size: 256 })); +- tryContent.add(makeLabel(_("Try Fedora"), true)); ++ tryContent.add(makeLabel(_("Try AlmaLinux"), true)); + + let tryButton = new Gtk.Button({ child: tryContent }); + buttonBox.add(tryButton); +@@ -107,7 +107,7 @@ + let installButton = new Gtk.Button({ child: installContent }); + buttonBox.add(installButton); + +- this._label = makeLabel(_("You are currently running Fedora from live media.\nYou can install Fedora now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false); ++ this._label = makeLabel(_("You are currently running AlmaLinux from live media.\nYou can install AlmaLinux now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false); + mainGrid.add(this._label); + + installButton.connect('clicked', Lang.bind(this, +diff -aruN anaconda-34.25.0.23/docs/intro.rst anaconda-34.25.0.23.alma/docs/intro.rst +--- anaconda-34.25.0.23/docs/intro.rst 2021-12-09 18:57:10.000000000 +0300 ++++ anaconda-34.25.0.23.alma/docs/intro.rst 2022-01-27 16:42:10.434747900 +0300 +@@ -1,8 +1,8 @@ + Introduction to Anaconda + ======================== + +-Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux +-and some other distributions. ++Anaconda is the installation program used by Fedora, Red Hat Enterprise Linux, ++AlmaLinux and some other distributions. + + During installation, a target computer's hardware is identified and configured + and the appropriate file systems for the system's architecture are created. +diff -aruN anaconda-34.25.0.23/docs/iscsi.rst anaconda-34.25.0.23.alma/docs/iscsi.rst +--- anaconda-34.25.0.23/docs/iscsi.rst 2021-12-09 18:57:10.000000000 +0300 ++++ anaconda-34.25.0.23.alma/docs/iscsi.rst 2022-01-27 16:43:34.244471700 +0300 +@@ -139,7 +139,7 @@ + The booting problems are either due to incorrectly generated dracut boot + arguments or they are simply dracut bugs. + +-Note that many of the iscsi adapters are installed in different Red Hat machines ++Note that many of the iscsi adapters are installed in different AlmaLinux machines + and so the issues can often be reproduced and debugged. + + +diff -aruN anaconda-34.25.0.23/pyanaconda/core/constants.py anaconda-34.25.0.23.alma/pyanaconda/core/constants.py +--- anaconda-34.25.0.23/pyanaconda/core/constants.py 2021-12-09 18:59:10.000000000 +0300 ++++ anaconda-34.25.0.23.alma/pyanaconda/core/constants.py 2022-01-27 16:54:30.830920800 +0300 +@@ -160,8 +160,8 @@ + ) + + WARNING_HARDWARE_UNSUPPORTED = N_( +- "This hardware (or a combination thereof) is not supported by Red Hat. For more information " +- "on supported hardware, please refer to http://www.redhat.com/hardware." ++ "This hardware (or a combination thereof) is not supported by AlmaLinux. For more information " ++ "on supported hardware, please refer to https://almalinux.org." + ) + + # Storage messages diff --git a/anaconda.spec b/anaconda.spec index b8b710c..1d4e955 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -1,7 +1,7 @@ Summary: Graphical system installer Name: anaconda Version: 40.22.3.10 -Release: 1%{?dist} +Release: 1%{?dist}.alma.1 License: GPL-2.0-or-later URL: http://fedoraproject.org/wiki/Anaconda @@ -12,6 +12,13 @@ URL: http://fedoraproject.org/wiki/Anaconda # make dist Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +# AlmaLinux patches +Patch1000: anaconda-almalinux-installer-colors.patch +Patch1001: anaconda-almalinux-disable-subscription.patch +Patch1002: anaconda-almalinux-disable-cdn-radiobutton.patch +Patch1003: anaconda-almalinux-remove-visible-fedora-references.patch +Patch1004: anaconda-almalinux-add-minimal-repo.patch + # Versions of required components (done so we make sure the buildrequires # match the requires versions of things). @@ -352,6 +359,9 @@ runtime on NFS/HTTP/FTP servers or local disks. %prep %autosetup -p 1 +sed -e 's/RHEL/AlmaLinux/g' -i po/*.po +sed -e 's/Red Hat Enterprise Linux/AlmaLinux/g' -i po/*.po + %build # use actual build-time release number, not tarball creation time release number %configure ANACONDA_RELEASE=%{release} %{!?with_glade:--disable-glade} @@ -482,6 +492,9 @@ rm -rf \ %{_prefix}/libexec/anaconda/dd_* %changelog +* Mon Aug 05 2024 Eduard Abdullin - 40.22.3.10-1.alma.1 +- Apply AlmaLinux patches + * Fri Jul 26 2024 Radek Vykydal - 40.22.3.10-1 - Cleanup remaining Xorg and VNC references and dead code (mkolman) Resolves: RHEL-41219