AlmaLinux changes
This commit is contained in:
parent
bb90159b01
commit
a7e96ccaba
30
SOURCES/almalinux.conf
Normal file
30
SOURCES/almalinux.conf
Normal 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
|
12
SOURCES/anaconda-almalinux-disable-cdn-radiobutton.patch
Normal file
12
SOURCES/anaconda-almalinux-disable-cdn-radiobutton.patch
Normal 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
14
SOURCES/anaconda-almalinux-disable-subscription.patch
Normal 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
16
SOURCES/anaconda-almalinux-installer-colors.patch
Normal 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 @fedora;
|
||||||
|
+@define-color product_bg_color @almalinux;
|
||||||
|
|
||||||
|
/* logo and sidebar classes */
|
||||||
|
|
@ -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
|
@ -1,7 +1,7 @@
|
|||||||
Summary: Graphical system installer
|
Summary: Graphical system installer
|
||||||
Name: anaconda
|
Name: anaconda
|
||||||
Version: 34.25.0.29
|
Version: 34.25.0.29
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}.alma
|
||||||
License: GPLv2+ and MIT
|
License: GPLv2+ and MIT
|
||||||
URL: http://fedoraproject.org/wiki/Anaconda
|
URL: http://fedoraproject.org/wiki/Anaconda
|
||||||
|
|
||||||
@ -12,6 +12,15 @@ URL: http://fedoraproject.org/wiki/Anaconda
|
|||||||
# make dist
|
# make dist
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
|
|
||||||
|
# AlmaLinux install class
|
||||||
|
Source1: almalinux.conf
|
||||||
|
|
||||||
|
# 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
|
||||||
|
|
||||||
# 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).
|
||||||
|
|
||||||
@ -224,7 +233,7 @@ Requires: rsync
|
|||||||
Requires: device-mapper-multipath
|
Requires: device-mapper-multipath
|
||||||
Requires: zram-generator
|
Requires: zram-generator
|
||||||
# Submitting bugs to bugzilla
|
# Submitting bugs to bugzilla
|
||||||
Requires: libreport-rhel-anaconda-bugzilla
|
# Requires: libreport-rhel-anaconda-bugzilla
|
||||||
|
|
||||||
%description install-img-deps
|
%description install-img-deps
|
||||||
The anaconda-install-img-deps metapackage lists all boot.iso installation image dependencies.
|
The anaconda-install-img-deps metapackage lists all boot.iso installation image dependencies.
|
||||||
@ -299,6 +308,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}
|
||||||
@ -407,6 +423,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
|
|||||||
%{_prefix}/libexec/anaconda/dd_*
|
%{_prefix}/libexec/anaconda/dd_*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Web May 18 2022 Eduard Abdullin <eabdullin@almalinux.org> - 34.25.0.29-1.alma
|
||||||
|
- AlmaLinux changes
|
||||||
|
|
||||||
* Thu Mar 17 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.0.29-1
|
* Thu Mar 17 2022 Radek Vykydal <rvykydal@redhat.com> - 34.25.0.29-1
|
||||||
- Make failure in generating of dracut arguments for iSCSI device non-fatal.
|
- Make failure in generating of dracut arguments for iSCSI device non-fatal.
|
||||||
(rvykydal)
|
(rvykydal)
|
||||||
|
Loading…
Reference in New Issue
Block a user