fixup! Test build alma->msvsphere

i9-inf1390 changed/i9-inf1390/anaconda-34.25.4.9-1.el9_4.inferit.4
Sergey Cherevko 4 months ago
parent c8d1b82459
commit da6f7434da
Signed by: scherevko
GPG Key ID: D87CBBC16D2E4A72

@ -0,0 +1,40 @@
From 856c3142e2a1060446632d7b56cec2aa9cedb811 Mon Sep 17 00:00:00 2001
From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
Date: Wed, 28 Aug 2024 14:59:11 +0300
Subject: [PATCH] Add MSVSphere product config
---
data/product.d/msvsphere.conf | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 data/product.d/msvsphere.conf
diff --git a/data/product.d/msvsphere.conf b/data/product.d/msvsphere.conf
new file mode 100644
index 0000000..baaf497
--- /dev/null
+++ b/data/product.d/msvsphere.conf
@@ -0,0 +1,21 @@
+# Anaconda configuration file for MSVSphere.
+
+[Product]
+product_name = MSVSphere
+
+[Base Product]
+product_name = Red Hat Enterprise Linux
+
+[Anaconda]
+forbidden_modules =
+ org.fedoraproject.Anaconda.Modules.Subscription
+
+[Bootloader]
+efi_dir = msvsphere
+
+[Payload]
+enable_closest_mirror = True
+default_source = CLOSEST_MIRROR
+
+[License]
+eula = /usr/share/sphere-release/EULA
--
2.43.5

@ -7,7 +7,7 @@ diff -Naur anaconda-34.25.0.29/pyanaconda/core/constants.py anaconda-34.25.0.29.
"BaseOS", # Used by RHEL
- "baseos"] # Used by CentOS Stream
+ "baseos", # Used by CentOS Stream
+ "Minimal"] # Used by AlmaLinux
+ "Minimal"] # Used by MSVSphere
DBUS_ANACONDA_SESSION_ADDRESS = "DBUS_ANACONDA_SESSION_BUS_ADDRESS"

@ -5,12 +5,12 @@ diff -uprN a/data/anaconda-gtk.css b/data/anaconda-gtk.css
@define-color redhat #2d2d2d;
@define-color fedora #2f4265;
+@define-color almalinux #0b2335;
+@define-color msvsphere #0b2335;
/* theme colors/images */
-@define-color product_bg_color @fedora;
+@define-color product_bg_color @almalinux;
+@define-color product_bg_color @msvsphere;
/* logo and sidebar classes */

@ -4,7 +4,7 @@ diff -aruN anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.desktop anacon
@@ -1,5 +1,5 @@
[Desktop Entry]
-Name=Welcome to Fedora
+Name=Welcome to AlmaLinux
+Name=Welcome to MSVSphere
Exec=/usr/share/anaconda/gnome/fedora-welcome
Terminal=false
Type=Application
@ -16,7 +16,7 @@ diff -aruN anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.js anaconda-34
default_height: 550,
skip_taskbar_hint: true,
- title: _("Welcome to Fedora"),
+ title: _("Welcome to AlmaLinux"),
+ title: _("Welcome to MSVSphere"),
window_position: Gtk.WindowPosition.CENTER });
this.window.connect('key-press-event', Lang.bind(this,
function(w, event) {
@ -25,7 +25,7 @@ diff -aruN anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.js anaconda-34
tryContent.add(new Gtk.Image({ icon_name: 'media-optical',
pixel_size: 256 }));
- tryContent.add(makeLabel(_("Try Fedora"), true));
+ tryContent.add(makeLabel(_("Try AlmaLinux"), true));
+ tryContent.add(makeLabel(_("Try MSVSphere"), true));
let tryButton = new Gtk.Button({ child: tryContent });
buttonBox.add(tryButton);
@ -34,7 +34,7 @@ diff -aruN anaconda-34.25.0.23/data/liveinst/gnome/fedora-welcome.js anaconda-34
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);
+ this._label = makeLabel(_("You are currently running AlmaLinux from live media.\nYou can install MSVSphere 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,
@ -48,7 +48,7 @@ diff -aruN anaconda-34.25.0.23/docs/intro.rst anaconda-34.25.0.23.alma/docs/intr
-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.
+MSVSphere 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.
@ -60,7 +60,7 @@ diff -aruN anaconda-34.25.0.23/docs/iscsi.rst anaconda-34.25.0.23.alma/docs/iscs
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
+Note that many of the iscsi adapters are installed in different MSVSphere machines
and so the issues can often be reproduced and debugged.
@ -73,8 +73,8 @@ diff -aruN anaconda-34.25.0.23/pyanaconda/core/constants.py anaconda-34.25.0.23.
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."
+ "This hardware (or a combination thereof) is not supported by MSVSphere. For more information "
+ "on supported hardware, please refer to https://msvsphere-os.ru/."
)
# Storage messages

@ -1,7 +1,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 34.25.4.9
Release: 1%{?dist}.inferit.3
Release: 1%{?dist}.inferit.4
License: GPLv2+ and MIT
URL: http://fedoraproject.org/wiki/Anaconda
@ -18,7 +18,8 @@ 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
# MSVSphere
Patch10000: 0001-Add-MSVSphere-product-config.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -315,8 +316,8 @@ runtime on NFS/HTTP/FTP servers or local disks.
%autosetup -p 1
# Debrand
sed -e 's/RHEL/AlmaLinux/g' -i po/*.po
sed -e 's/Red Hat Enterprise Linux/AlmaLinux/g' -i po/*.po
sed -e 's/RHEL/MSVSphere/g' -i po/*.po
sed -e 's/Red Hat Enterprise Linux/MSVSphere/g' -i po/*.po
%build
# use actual build-time release number, not tarball creation time release number
@ -426,7 +427,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_d
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Tue Aug 27 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 34.25.4.9-1.inferit.3
* Tue Aug 27 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 34.25.4.9-1.inferit.4
- Test build alma->msvsphere
- Rebuilt for MSVSphere 9.4

Loading…
Cancel
Save