Add Minimal patch, remove almalinux.conf (already included upstream)

This commit is contained in:
Andrew Lukoshko 2022-05-24 14:12:16 +02:00
parent 114ebdc6e2
commit 1a3c998a48
3 changed files with 14 additions and 34 deletions

View File

@ -1,30 +0,0 @@
# 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

View File

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

View File

@ -11,14 +11,13 @@ URL: http://fedoraproject.org/wiki/Anaconda
# ./autogen.sh
# make dist
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
Patch1004: anaconda-almalinux-add-minimal-repo.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -306,8 +305,6 @@ runtime on NFS/HTTP/FTP servers or local disks.
%prep
%autosetup -p 1
# AlmaLinux install class
cp %{SOURCE1} data/product.d/
# Debrand
sed -e 's/RHEL/AlmaLinux/g' -i po/*.po