From bae3824f65a21374c0b4930a529348f448bc865b Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 9 Aug 2024 17:09:55 +0000 Subject: [PATCH] Update AlmaLinux patches --- 0001-Add-Minimal-repo-support.patch | 24 ++++++ 0002-Change-anaconda-background-color.patch | 25 ++++++ 0003-Remove-visible-Fedora-references.patch | 55 +++++++++++++ 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 | 8 +- 9 files changed, 107 insertions(+), 140 deletions(-) create mode 100644 0001-Add-Minimal-repo-support.patch create mode 100644 0002-Change-anaconda-background-color.patch create mode 100644 0003-Remove-visible-Fedora-references.patch delete mode 100644 anaconda-almalinux-add-minimal-repo.patch delete mode 100644 anaconda-almalinux-disable-cdn-radiobutton.patch delete mode 100644 anaconda-almalinux-disable-subscription.patch delete mode 100644 anaconda-almalinux-installer-colors.patch delete mode 100644 anaconda-almalinux-remove-visible-fedora-references.patch diff --git a/0001-Add-Minimal-repo-support.patch b/0001-Add-Minimal-repo-support.patch new file mode 100644 index 0000000..a4fd827 --- /dev/null +++ b/0001-Add-Minimal-repo-support.patch @@ -0,0 +1,24 @@ +From 2b5791f0ed5a4b6886b49eeefeed66511e7218ce Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Fri, 9 Aug 2024 16:50:16 +0000 +Subject: [PATCH 1/3] Add Minimal repo support + +--- + pyanaconda/core/constants.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pyanaconda/core/constants.py b/pyanaconda/core/constants.py +index 5232e6d..8e87274 100644 +--- a/pyanaconda/core/constants.py ++++ b/pyanaconda/core/constants.py +@@ -58,6 +58,7 @@ DEFAULT_REPOS = [ + "BaseOS", # Used by RHEL + "baseos", # Used by CentOS Stream + "eln-baseos", # Used by Fedora ELN ++ "Minimal", # Used by AlmaLinux + ] + + DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS" +-- +2.43.5 + diff --git a/0002-Change-anaconda-background-color.patch b/0002-Change-anaconda-background-color.patch new file mode 100644 index 0000000..78d9db4 --- /dev/null +++ b/0002-Change-anaconda-background-color.patch @@ -0,0 +1,25 @@ +From 7d0eaa2ebb521e327b98171689e4731a7db5d503 Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Fri, 9 Aug 2024 16:59:05 +0000 +Subject: [PATCH 2/3] Change anaconda background color + +--- + data/anaconda-gtk.css | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/anaconda-gtk.css b/data/anaconda-gtk.css +index f83cf15..e5d859c 100644 +--- a/data/anaconda-gtk.css ++++ b/data/anaconda-gtk.css +@@ -95,7 +95,7 @@ infobar.error box { + * to be overridden by a stylesheet in product.img. + */ + +-@define-color anaconda_bg_color #2f4265; ++@define-color anaconda_bg_color #0b2335; + + .logo-sidebar { + background-color: @anaconda_bg_color; +-- +2.43.5 + diff --git a/0003-Remove-visible-Fedora-references.patch b/0003-Remove-visible-Fedora-references.patch new file mode 100644 index 0000000..3de2486 --- /dev/null +++ b/0003-Remove-visible-Fedora-references.patch @@ -0,0 +1,55 @@ +From 36a77712950b1462573ade28c1bd6f175a201174 Mon Sep 17 00:00:00 2001 +From: Andrew Lukoshko +Date: Fri, 9 Aug 2024 17:03:55 +0000 +Subject: [PATCH 3/3] Remove visible Fedora references + +--- + data/liveinst/gnome/fedora-welcome.js | 6 +++--- + .../liveinst/gnome/org.fedoraproject.welcome-screen.desktop | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/fedora-welcome.js +index fc42e5d..ce60209 100755 +--- a/data/liveinst/gnome/fedora-welcome.js ++++ b/data/liveinst/gnome/fedora-welcome.js +@@ -46,7 +46,7 @@ class WelcomeWindow extends Adw.ApplicationWindow { + } + + constructor(application) { +- const title = _('Welcome to Fedora!'); ++ const title = _('Welcome to AlmaLinux!'); + super({ + application, + title, +@@ -58,7 +58,7 @@ class WelcomeWindow extends Adw.ApplicationWindow { + const statusPage = new Adw.StatusPage({ + title, + iconName: 'fedora-logo-icon', +- description: _('This live media can be used to install Fedora or as a temporary system. Installation can be started at any time using the install icon in Activities.'), ++ description: _('This live media can be used to install AlmaLinux or as a temporary system. Installation can be started at any time using the install icon in Activities.'), + }); + this.content.set_child(statusPage); + +@@ -71,7 +71,7 @@ class WelcomeWindow extends Adw.ApplicationWindow { + statusPage.set_child(buttonBox); + + const installButton = new Gtk.Button({ +- label: _('Install Fedora…'), ++ label: _('Install AlmaLinux…'), + actionName: 'window.install-fedora', + }); + installButton.add_css_class('pill'); +diff --git a/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop b/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop +index c3551b1..8c9065b 100644 +--- a/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop ++++ b/data/liveinst/gnome/org.fedoraproject.welcome-screen.desktop +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Name=Welcome to Fedora ++Name=Welcome to AlmaLinux + Icon=fedora-logo-icon + Exec=/usr/share/anaconda/gnome/fedora-welcome + Terminal=false +-- +2.43.5 + diff --git a/anaconda-almalinux-add-minimal-repo.patch b/anaconda-almalinux-add-minimal-repo.patch deleted file mode 100644 index 753ea1c..0000000 --- a/anaconda-almalinux-add-minimal-repo.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 9cbde67..0000000 --- a/anaconda-almalinux-disable-cdn-radiobutton.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index ffe6c9d..0000000 --- a/anaconda-almalinux-disable-subscription.patch +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index a5b2cfc..0000000 --- a/anaconda-almalinux-installer-colors.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index d703fca..0000000 --- a/anaconda-almalinux-remove-visible-fedora-references.patch +++ /dev/null @@ -1,80 +0,0 @@ -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 1d4e955..b669e6e 100644 --- a/anaconda.spec +++ b/anaconda.spec @@ -13,11 +13,9 @@ URL: http://fedoraproject.org/wiki/Anaconda 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 +Patch1001: 0001-Add-Minimal-repo-support.patch +Patch1002: 0002-Change-anaconda-background-color.patch +Patch1003: 0003-Remove-visible-Fedora-references.patch # Versions of required components (done so we make sure the buildrequires # match the requires versions of things).