rpms/anaconda
7
0
Fork 0
Code Issues Pull Requests Releases Activity

AlmaLinux changes

Browse Source
This commit is contained in:
Andrew Lukoshko 2021-09-02 10:23:47 +00:00
parent 72c931d5e2
commit 5f9ef75e13
8 changed files with 2497 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
SOURCES/almalinux.conf Normal file
View File

@ -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

13
SOURCES/anaconda-almalinux-baseos-repo-default.patch Normal file
View File

@ -0,0 +1,13 @@
diff -Naur anaconda-33.16.4.15/pyanaconda/core/constants.py anaconda-33.16.4.15.alma/pyanaconda/core/constants.py
--- anaconda-33.16.4.15/pyanaconda/core/constants.py 2021-02-02 10:55:25.000000000 +0000
+++ anaconda-33.16.4.15.alma/pyanaconda/core/constants.py 2021-06-23 13:56:29.257233450 +0000
@@ -60,7 +60,8 @@
DEFAULT_REPOS = [productName.split('-')[0].lower(),
"fedora-modular-server",
"rawhide",
- "BaseOS"]
+ "BaseOS",
+ "baseos"]
# Get list of repo names which should be used as updates repos
DEFAULT_UPDATE_REPOS = ["updates",

12
SOURCES/anaconda-almalinux-disable-cdn-radiobutton.patch Normal file
View File

@ -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")

14
SOURCES/anaconda-almalinux-disable-subscription.patch Normal file
View File

@ -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()

16
SOURCES/anaconda-almalinux-installer-colors.patch Normal file
View File

@ -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 */

80
SOURCES/anaconda-almalinux-remove-visible-rh-references.patch Normal file
View File

@ -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,

2298
SOURCES/anaconda-almalinux-update-smt-url.patch Normal file
View File

File diff suppressed because it is too large Load Diff

38
SPECS/anaconda.spec
View File

@ -1,3 +1,5 @@
%global dist %{?dist}.alma.2
Summary: Graphical system installer Summary: Graphical system installer
Name: anaconda Name: anaconda
Version: 33.16.4.15 Version: 33.16.4.15
@ -11,6 +13,16 @@ URL: http://fedoraproject.org/wiki/Anaconda
# ./autogen.sh # ./autogen.sh
# make dist # make dist
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
# AlmaLinux install class
Source1: almalinux.conf
# AlmaLinux
Patch1000: anaconda-almalinux-installer-colors.patch
Patch1001: anaconda-almalinux-disable-subscription.patch
Patch1002: anaconda-almalinux-disable-cdn-radiobutton.patch
Patch1003: anaconda-almalinux-remove-visible-rh-references.patch
# Patch1004: anaconda-almalinux-update-smt-url.patch
Patch1005: anaconda-almalinux-baseos-repo-default.patch
# Versions of required components (done so we make sure the buildrequires # Versions of required components (done so we make sure the buildrequires
# match the requires versions of things). # match the requires versions of things).
@ -101,10 +113,6 @@ Requires: python3-systemd
Requires: python3-productmd Requires: python3-productmd
Requires: python3-dasbus >= %{dasbusver} Requires: python3-dasbus >= %{dasbusver}
Requires: flatpak-libs Requires: flatpak-libs
%if 0%{?rhel}
Requires: python3-syspurpose
Requires: subscription-manager >= 1.26
%endif
# pwquality only "recommends" the dictionaries it needs to do anything useful, # pwquality only "recommends" the dictionaries it needs to do anything useful,
# which is apparently great for containers but unhelpful for the rest of us # which is apparently great for containers but unhelpful for the rest of us
@ -265,6 +273,13 @@ runtime on NFS/HTTP/FTP servers or local disks.
%prep %prep
%autosetup -p 1 %autosetup -p 1
# AlmaLinux install class
cp %{SOURCE1} data/product.d/
# Debrand
sed -e 's/RHEL/AlmaLinux/g' -i po/*.po
sed -e 's/Red Hat Enterprise Linux/AlmaLinux/g' -i po/*.po
%build %build
# use actual build-time release number, not tarball creation time release number # use actual build-time release number, not tarball creation time release number
%configure ANACONDA_RELEASE=%{release} %configure ANACONDA_RELEASE=%{release}
@ -367,6 +382,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_* %{_prefix}/libexec/anaconda/dd_*
%changelog %changelog
* Wed May 19 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 33.16.4.15-1.alma
- AlmaLinux changes
* Wed Mar 24 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.15-1 * Wed Mar 24 2021 Radek Vykydal <rvykydal@redhat.com> - 33.16.4.15-1
- network: clone connections from intramfs to persistent config (rvykydal) - network: clone connections from intramfs to persistent config (rvykydal)
Resolves: rhbz#1910438 Resolves: rhbz#1910438
@ -630,6 +648,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
- Propagate verify_ssl to RHSM (mkolman) - Propagate verify_ssl to RHSM (mkolman)
Resolves: rhbz#1858126 Resolves: rhbz#1858126
* Wed Aug 19 2020 Diana Bautina <dbautina@cloudlinux.com> - 33.16.3.10-1.cloudlinux
- apply rebrending for CloudLinux
* Wed Aug 12 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.18-1 * Wed Aug 12 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.18-1
- subscription: Only restart payload when needed (mkolman) - subscription: Only restart payload when needed (mkolman)
Resolves: rhbz#1861351 Resolves: rhbz#1861351
@ -733,6 +754,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
- Fix software spoke message when source changes (mkolman) - Fix software spoke message when source changes (mkolman)
Resolves: rhbz#1788458 Resolves: rhbz#1788458
* Tue Jun 30 2020 Sergey Fokin <sfokin@cloudlinux.com> - 29.19.2.17-1.cloudlinux.1
- disable Red Hat subscription menu
* Mon Jun 29 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.10-1 * Mon Jun 29 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.10-1
- Fix RHSM HTTP proxy configuration crash in the GUI (mkolman) - Fix RHSM HTTP proxy configuration crash in the GUI (mkolman)
Resolves: rhbz#1849792 Resolves: rhbz#1849792
@ -889,6 +913,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
- Remove unused imports (vslavik) - Remove unused imports (vslavik)
Related: rhbz#1691319 Related: rhbz#1691319
* Tue May 26 2020 Diana Bautina <dautina@cloudlinux.com> - 29.19.2.17-1.cloudlinux
- apply rebrending for CloudLinux
* Mon May 25 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.1-1 * Mon May 25 2020 Radek Vykydal <rvykydal@redhat.com> - 33.16.3.1-1
- Change git branch configuration (jkonecny) - Change git branch configuration (jkonecny)
Related: rhbz#1805757 Related: rhbz#1805757
@ -994,6 +1021,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
- Fix branding in the Connect to Red Hat spoke (mkolman) - Fix branding in the Connect to Red Hat spoke (mkolman)
Resolves: rhbz#1787342 Resolves: rhbz#1787342
* Tue Dec 24 2019 Sergey Fokin <sfokin@cloudlinux.com> - 29.19.1.13-1.cloudlinux
- apply rebrending for CloudLinux
* Fri Dec 13 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.6-1 * Fri Dec 13 2019 Radek Vykydal <rvykydal@redhat.com> - 29.19.2.6-1
- Fix RHSM HTTP proxy setup (mkolman) - Fix RHSM HTTP proxy setup (mkolman)
Related: rhbz#1748281 Related: rhbz#1748281