autopatch/subscription-manager
4
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: autopatch:a9
Branches Tags
autopatch:a8
autopatch:a9
autopatch:a10
autopatch:a10s
..
compare: autopatch:a8
Branches Tags
autopatch:a9
autopatch:a8
autopatch:a10
autopatch:a10s

No commits in common. "a9" and "a8" have entirely different histories.
a9 ... a8

5 changed files with 119 additions and 74 deletions
Show Stats Expand all files Collapse all files

78
config.yaml
View File

@ -1,38 +1,67 @@
actions:
- replace:
- target: "spec"
find: "%global use_initial_setup 1"
replace: "%global use_initial_setup 0"
count: 1
- target: "spec"
find: "%global use_rhsm_gtk 1"
replace: "%global use_rhsm_gtk 0"
count: 1
- target: "spec"
find: "%global use_cockpit 0%{?fedora} || 0%{?rhel} >= 7"
replace: "%global use_cockpit 0"
count: 1
- target: "spec"
find: |
%if !%{use_container_plugin}
Obsoletes: subscription-manager-plugin-container <= %{version}
Obsoletes: subscription-manager-plugin-container
%endif
replace: |
%if !%{use_container_plugin}
Obsoletes: subscription-manager-plugin-container <= %{version}
Obsoletes: subscription-manager-plugin-container
%endif
# AlmaLinux do not provide the following packages no more
Obsoletes: subscription-manager-cockpit
Obsoletes: subscription-manager-initial-setup-addon
Obsoletes: rhsm-gtk
Obsoletes: rhsm-icons
count: 1
- target: "spec"
find: "to manage subscriptions and yum repositories from the Red Hat entitlement"
replace: "to manage subscriptions and yum repositories from the EL entitlement"
find: "a Red Hat"
replace: "a"
- target: "spec"
find: "the Red Hat"
replace: "an"
replace: "the"
- target: "spec"
find: "Red Hat product subscriptions"
replace: "product subscriptions"
- target: "spec"
find: "Red Hat Subscription"
replace: "Subscription"
- target: "spec"
find: "Red Hat subscriptions"
replace: "subscriptions"
- target: "spec"
find: |
# fake out the redhat.repo file
%if %{use_dnf}
%if (0%{?rhel} >= 8)
Supplements: initial-setup-gui
%endif
replace: |
%if %{undefined almalinux_ver}
%if (0%{?rhel} >= 8)
Supplements: initial-setup-gui
%endif
%endif
count: 1
- target: "spec"
find: |
%if %{use_yum} || %{use_dnf}
mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
%endif
replace: |
# fake out the redhat.repo file
%if %{use_dnf}
%if %{use_yum} || %{use_dnf}
mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
%if %{undefined almalinux_ver}
touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
@ -52,15 +81,13 @@ actions:
%endif
count: 1
- target: "spec"
find: |
# fix timestamps on our byte compiled files so they match across arches
find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
find: "# base/cli tools use the gettext domain 'rhsm', while the"
replace: |
# fix timestamps on our byte compiled files so they match across arches
find %{buildroot} -name \*.py* -exec touch -r %{SOURCE0} '{}' \;
%if %{defined almalinux_ver}
sed -e '/^enabled=/ s/1/0/' -i %{buildroot}%{_sysconfdir}/dnf/plugins/subscription-manager.conf
%endif
# base/cli tools use the gettext domain 'rhsm', while the
count: 1
- target: "spec"
find: |
@ -76,15 +103,6 @@ actions:
%endif
%endif
count: 1
- target: "spec"
find: "with a Red Hat"
replace: "with"
count: -1
- target: "spec"
find: "of a Red Hat"
replace: "of"
count: -1
- modify_release:
- suffix: ".alma.1"
@ -94,9 +112,15 @@ actions:
- name: "Eduard Abdullin"
email: "eabdullin@almalinux.org"
line:
- "Debrand for AlmaLinux"
- "AlmaLinux changes"
- add_files:
- type: "patch"
name: "almalinux_debrand.patch"
name: "use-almalinux-syspurposes.patch"
number: 100
- type: "patch"
name: "subscription-manager-remove-redhat.repo.patch"
number: 101
- type: "patch"
name: "subscription-manager-debrand.patch"
number: 102

47
files/almalinux_debrand.patch
View File

@ -1,47 +0,0 @@
diff -aruN subscription-manager-1.29.37/etc-conf/syspurpose/valid_fields.json subscription-manager-1.29.37.alma/etc-conf/syspurpose/valid_fields.json
--- subscription-manager-1.29.37/etc-conf/syspurpose/valid_fields.json 2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/etc-conf/syspurpose/valid_fields.json 2023-10-09 23:38:40
@@ -1,12 +1,10 @@
{
"role": [
- "Red Hat Enterprise Linux Server",
- "Red Hat Enterprise Linux Workstation",
- "Red Hat Enterprise Linux Compute Node"
+ "AlmaLinux Server",
+ "AlmaLinux Workstation",
+ "AlmaLinux Compute Node"
],
"service_level_agreement": [
- "Premium",
- "Standard",
"Self-Support"
],
"usage": [
diff -aruN subscription-manager-1.29.37/src/subscription_manager/repofile.py subscription-manager-1.29.37.alma/src/subscription_manager/repofile.py
--- subscription-manager-1.29.37/src/subscription_manager/repofile.py 2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/src/subscription_manager/repofile.py 2023-10-09 23:38:48
@@ -375,11 +375,7 @@
"""
Try to create new repo file.
"""
- self.create_dir_path()
- if self.path_exists(self.path) or not self.manage_repos:
- return
- with open(self.path, "w") as f:
- f.write(self.REPOFILE_HEADER)
+ pass
def fix_content(self, content: str) -> str:
return content
diff -aruN subscription-manager-1.29.37/src/subscription_manager/repolib.py subscription-manager-1.29.37.alma/src/subscription_manager/repolib.py
--- subscription-manager-1.29.37/src/subscription_manager/repolib.py 2023-08-23 07:18:22
+++ subscription-manager-1.29.37.alma/src/subscription_manager/repolib.py 2023-10-09 23:38:57
@@ -92,7 +92,7 @@
def warning_message(enabled_yum_plugins: List[str]) -> str:
message = _(
"The yum/dnf plugins: %s were automatically enabled for the benefit of "
- "Red Hat Subscription Management. If not desired, use "
+ "Subscription Management. If not desired, use "
'"subscription-manager config --rhsm.auto_enable_yum_plugins=0" to '
"block this behavior."
) % ", ".join(enabled_yum_plugins)

32
files/subscription-manager-debrand.patch Normal file
View File

@ -0,0 +1,32 @@
diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in
--- subscription-manager-1.28.29/etc-conf/subscription-manager-cockpit.desktop.in 2022-04-13 18:01:03.000000000 +0300
+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-cockpit.desktop.in 2022-05-10 19:54:57.000000000 +0300
@@ -1,5 +1,5 @@
[Desktop Entry]
-_Name=Red Hat Subscription Manager
+_Name=Subscription Manager
Icon=subscription-manager
Type=Application
TryExec=/usr/libexec/cockpit-desktop
diff -aruN subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in
--- subscription-manager-1.28.29/etc-conf/subscription-manager-gui.desktop.in 2022-04-13 18:01:03.000000000 +0300
+++ subscription-manager-1.28.29.alma/etc-conf/subscription-manager-gui.desktop.in 2022-05-10 19:55:18.000000000 +0300
@@ -1,5 +1,5 @@
[Desktop Entry]
-_Name=Red Hat Subscription Manager
+_Name=Subscription Manager
Icon=subscription-manager
Exec=subscription-manager-gui
Terminal=false
diff -aruN subscription-manager-1.28.29/src/subscription_manager/repolib.py subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py
--- subscription-manager-1.28.29/src/subscription_manager/repolib.py 2022-04-13 18:01:03.000000000 +0300
+++ subscription-manager-1.28.29.alma/src/subscription_manager/repolib.py 2022-05-10 20:01:44.000000000 +0300
@@ -87,7 +87,7 @@
@staticmethod
def warning_message(enabled_yum_plugins):
message = _('The yum/dnf plugins: %s were automatically enabled for the benefit of '
- 'Red Hat Subscription Management. If not desired, use '
+ 'Subscription Management. If not desired, use '
'"subscription-manager config --rhsm.auto_enable_yum_plugins=0" to '
'block this behavior.') % ', '.join(enabled_yum_plugins)
return message

16
files/subscription-manager-remove-redhat.repo.patch Normal file
View File

@ -0,0 +1,16 @@
diff -Nurp subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py subscription-manager-1.27.11/src/subscription_manager/repofile.py
--- subscription-manager-1.27.11.orig/src/subscription_manager/repofile.py 2020-07-28 11:06:10.000000000 -0500
+++ subscription-manager-1.27.11/src/subscription_manager/repofile.py 2020-08-05 16:48:00.911709258 -0500
@@ -368,11 +368,7 @@ class RepoFileBase(object):
Try to create new repo file.
:return: None
"""
- self.create_dir_path()
- if self.path_exists(self.path) or not self.manage_repos:
- return
- with open(self.path, 'w') as f:
- f.write(self.REPOFILE_HEADER)
+ pass
def fix_content(self, content):
return content

20
files/use-almalinux-syspurposes.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/etc-conf/syspurpose/valid_fields.json b/etc-conf/syspurpose/valid_fields.json
index 1ac7ea0e..305ec4b9 100644
--- a/etc-conf/syspurpose/valid_fields.json
+++ b/etc-conf/syspurpose/valid_fields.json
@@ -1,12 +1,10 @@
{
"role": [
- "Red Hat Enterprise Linux Server",
- "Red Hat Enterprise Linux Workstation",
- "Red Hat Enterprise Linux Compute Node"
+ "AlmaLinux Server",
+ "AlmaLinux Workstation",
+ "AlmaLinux Compute Node"
],
"service_level_agreement": [
- "Premium",
- "Standard",
"Self-Support"
],
"usage": [