From 268b97df0b89364619a4c16afc11618bbcba2115 Mon Sep 17 00:00:00 2001 From: Sofia Boldyreva Date: Tue, 14 Jan 2025 13:34:38 +0100 Subject: [PATCH] Initial commit --- config.yaml | 41 ++++++++++ files/almalinux.conf | 30 +++++++ .../anaconda-almalinux-add-minimal-repo.patch | 13 +++ ...da-almalinux-disable-cdn-radiobutton.patch | 12 +++ ...conda-almalinux-disable-subscription.patch | 14 ++++ .../anaconda-almalinux-installer-colors.patch | 16 ++++ ...malinux-remove-visible-rh-references.patch | 80 +++++++++++++++++++ 7 files changed, 206 insertions(+) create mode 100644 config.yaml create mode 100644 files/almalinux.conf create mode 100644 files/anaconda-almalinux-add-minimal-repo.patch create mode 100644 files/anaconda-almalinux-disable-cdn-radiobutton.patch create mode 100644 files/anaconda-almalinux-disable-subscription.patch create mode 100644 files/anaconda-almalinux-installer-colors.patch create mode 100644 files/anaconda-almalinux-remove-visible-rh-references.patch diff --git a/config.yaml b/config.yaml new file mode 100644 index 0000000..5702998 --- /dev/null +++ b/config.yaml @@ -0,0 +1,41 @@ +actions: + - replace: + - target: "spec" + find: "%build" + replace: | + %autosetup -p 1\n + # AlmaLinux install class + cp %{SOURCE1} data/product.d/\n + # Debrand + sed -e 's/RHEL/AlmaLinux/g' -i po/*.po + sed -e 's/Red Hat Enterprise Linux/AlmaLinux/g' -i po/*.po + count: 1 + - modify_release: + - suffix: ".alma.1" + enabled: true + + - changelog_entry: + - name: "Eduard Abdullin" + email: "eabdullin@almalinux.org" + line: + - "AlmaLinux changes" + + - add_files: + - type: "source" + name: "almalinux.conf" + number: "Latest" + - type: "patch" + name: "anaconda-almalinux-installer-colors.patch" + number: 1000 + - type: "patch" + name: "anaconda-almalinux-disable-subscription.patch" + number: "Latest" + - type: "patch" + name: "anaconda-almalinux-disable-cdn-radiobutton.patch" + number: "Latest" + - type: "patch" + name: "anaconda-almalinux-remove-visible-rh-references.patch" + number: "Latest" + - type: "patch" + name: "anaconda-almalinux-add-minimal-repo.patch" + number: 1006 diff --git a/files/almalinux.conf b/files/almalinux.conf new file mode 100644 index 0000000..d9d55c6 --- /dev/null +++ b/files/almalinux.conf @@ -0,0 +1,30 @@ +# Anaconda configuration file for AlmaLinux. + +[Product] +product_name = AlmaLinux + +[Base Product] +product_name = Red Hat Enterprise Linux + +[Anaconda] +# List of enabled Anaconda DBus modules for RHEL. +# but without org.fedoraproject.Anaconda.Modules.Subscription +kickstart_modules = + org.fedoraproject.Anaconda.Modules.Timezone + org.fedoraproject.Anaconda.Modules.Network + org.fedoraproject.Anaconda.Modules.Localization + org.fedoraproject.Anaconda.Modules.Security + org.fedoraproject.Anaconda.Modules.Users + org.fedoraproject.Anaconda.Modules.Payloads + org.fedoraproject.Anaconda.Modules.Storage + org.fedoraproject.Anaconda.Modules.Services + +[Bootloader] +efi_dir = almalinux + +[Payload] +enable_closest_mirror = True +default_source = CLOSEST_MIRROR + +[License] +eula = /usr/share/almalinux-release/EULA diff --git a/files/anaconda-almalinux-add-minimal-repo.patch b/files/anaconda-almalinux-add-minimal-repo.patch new file mode 100644 index 0000000..88b115e --- /dev/null +++ b/files/anaconda-almalinux-add-minimal-repo.patch @@ -0,0 +1,13 @@ +diff -Naur anaconda-33.16.6.7/pyanaconda/core/constants.py anaconda-33.16.6.7.minimal/pyanaconda/core/constants.py +--- anaconda-33.16.6.7/pyanaconda/core/constants.py 2022-03-09 12:45:44.000000000 +0000 ++++ anaconda-33.16.6.7.minimal/pyanaconda/core/constants.py 2022-05-10 10:43:57.228244800 +0000 +@@ -61,7 +61,8 @@ + "fedora-modular-server", + "rawhide", + "BaseOS", # Used by RHEL +- "baseos"] # Used by CentOS Stream ++ "baseos", # Used by CentOS Stream ++ "Minimal"] # Used by AlmaLinux + + # Get list of repo names which should be used as updates repos + DEFAULT_UPDATE_REPOS = ["updates", diff --git a/files/anaconda-almalinux-disable-cdn-radiobutton.patch b/files/anaconda-almalinux-disable-cdn-radiobutton.patch new file mode 100644 index 0000000..9cbde67 --- /dev/null +++ b/files/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/files/anaconda-almalinux-disable-subscription.patch b/files/anaconda-almalinux-disable-subscription.patch new file mode 100644 index 0000000..ffe6c9d --- /dev/null +++ b/files/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/files/anaconda-almalinux-installer-colors.patch b/files/anaconda-almalinux-installer-colors.patch new file mode 100644 index 0000000..6c8b77b --- /dev/null +++ b/files/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 @redhat; ++@define-color product_bg_color @almalinux; + + /* logo and sidebar classes */ + diff --git a/files/anaconda-almalinux-remove-visible-rh-references.patch b/files/anaconda-almalinux-remove-visible-rh-references.patch new file mode 100644 index 0000000..00e5940 --- /dev/null +++ b/files/anaconda-almalinux-remove-visible-rh-references.patch @@ -0,0 +1,80 @@ +diff -Naur anaconda-33.16.3.26/data/liveinst/gnome/rhel-welcome.desktop anaconda-33.16.3.26.alma/data/liveinst/gnome/rhel-welcome.desktop +--- anaconda-33.16.3.26/data/liveinst/gnome/rhel-welcome.desktop 2020-05-25 18:17:00.000000000 +0300 ++++ anaconda-33.16.3.26.alma/data/liveinst/gnome/rhel-welcome.desktop 2021-01-22 07:43:25.007068971 +0300 +@@ -1,5 +1,5 @@ + [Desktop Entry] +-Name=Welcome to Red Hat Enterprise Linux ++Name=Welcome to AlmaLinux + Exec=/usr/share/anaconda/gnome/rhel-welcome + Terminal=false + Type=Application +diff -Naur anaconda-33.16.3.26/docs/intro.rst anaconda-33.16.3.26.alma/docs/intro.rst +--- anaconda-33.16.3.26/docs/intro.rst 2020-05-27 07:53:25.000000000 +0300 ++++ anaconda-33.16.3.26.alma/docs/intro.rst 2021-01-22 07:43:24.989735757 +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 -Naur anaconda-33.16.3.26/docs/iscsi.rst anaconda-33.16.3.26.alma/docs/iscsi.rst +--- anaconda-33.16.3.26/docs/iscsi.rst 2018-11-08 13:54:59.000000000 +0300 ++++ anaconda-33.16.3.26.alma/docs/iscsi.rst 2021-01-22 07:43:24.988652432 +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 -Naur anaconda-33.16.3.26/pyanaconda/core/constants.py anaconda-33.16.3.26.alma/pyanaconda/core/constants.py +--- anaconda-33.16.3.26/pyanaconda/core/constants.py 2021-01-22 07:44:21.084349532 +0300 ++++ anaconda-33.16.3.26.alma/pyanaconda/core/constants.py 2021-01-22 07:43:24.897653058 +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 -Naur anaconda-33.16.4.15/data/liveinst/gnome/rhel-welcome.js anaconda-33.16.4.15.live/data/liveinst/gnome/rhel-welcome.js +--- anaconda-33.16.4.15/data/liveinst/gnome/rhel-welcome.js 2021-02-02 13:55:25.000000000 +0300 ++++ anaconda-33.16.4.15.live/data/liveinst/gnome/rhel-welcome.js 2021-07-23 06:36:40.836621474 +0300 +@@ -59,7 +59,7 @@ + default_width: 600, + default_height: 550, + skip_taskbar_hint: true, +- title: _("Welcome to Red Hat Enterprise Linux"), ++ title: _("Welcome to AlmaLinux"), + window_position: Gtk.WindowPosition.CENTER }); + this.window.connect('key-press-event', Lang.bind(this, + function(w, event) { +@@ -88,7 +88,7 @@ + spacing: 16 }); + tryContent.add(new Gtk.Image({ icon_name: 'media-optical', + pixel_size: 256 })); +- tryContent.add(makeLabel(_("Try RHEL"), true)); ++ tryContent.add(makeLabel(_("Try AlmaLinux"), true)); + + let tryButton = new Gtk.Button({ child: tryContent }); + buttonBox.add(tryButton); +@@ -104,7 +104,7 @@ + let installButton = new Gtk.Button({ child: installContent }); + buttonBox.add(installButton); + +- this._label = makeLabel(_("You are currently running Red Hat Enterprise Linux from live media.\nYou can install Red Hat Enterprise Linux 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,