Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
subscription-manager
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
staging
patch
subscription-manager
Commits
baf3350f
Verified
Commit
baf3350f
authored
2 years ago
by
Louis Abel
Browse files
Options
Downloads
Patches
Plain Diff
update patch for sub man
parent
9fa5ef10
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
ROCKY/CFG/subscription-manager.cfg
+8
-1
8 additions, 1 deletion
ROCKY/CFG/subscription-manager.cfg
ROCKY/_supporting/0001-subscription-manager-rocky-remove-redhat-refs.patch
+17
-13
17 additions, 13 deletions
.../0001-subscription-manager-rocky-remove-redhat-refs.patch
with
25 additions
and
14 deletions
ROCKY/CFG/subscription-manager.cfg
+
8
−
1
View file @
baf3350f
...
...
@@ -25,6 +25,13 @@ spec_change {
# n_path: 1
# }
search_and_replace
{
any:
true
find:
"Requires:
subscription-manager-rhsm-certificates"
replace:
"
#Requires: subscription-manager-rhsm-certificates"
n:
-1
}
search_and_replace
{
any:
true
find:
"Source0:
%{name}-%{version}.tar.gz"
...
...
@@ -55,7 +62,7 @@ spec_change {
search_and_replace
{
any:
true
find:
"install
-m
644
%{_builddir}/%{buildsubdir}/
etc-conf
/redhat-entitlement-authority.pem
%{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt"
find:
"install
-m
644
%{_builddir}/%{buildsubdir}/
src/content_plugins
/redhat-entitlement-authority.pem
%{buildroot}%{_sysconfdir}/docker/certs.d/cdn.redhat.com/redhat-entitlement-authority.crt"
replace:
"
# remove redhat entitlement"
n:
1
}
...
...
This diff is collapsed.
Click to expand it.
ROCKY/_supporting/0001-subscription-manager-rocky-remove-redhat-refs.patch
+
17
−
13
View file @
baf3350f
diff -Naurp subscription-manager-1.29.21/etc-conf/plugin/subscription-manager.conf subscription-manager-1.29.21-patch/etc-conf/plugin/subscription-manager.conf
--- subscription-manager-1.29.21/etc-conf/plugin/subscription-manager.conf 2021-11-11 13:38:40.000000000 -0700
+++ subscription-manager-1.29.21-patch/etc-conf/plugin/subscription-manager.conf 2022-04-02 17:11:05.744562815 -0700
diff --git a/etc-conf/plugin/subscription-manager.conf b/etc-conf/plugin/subscription-manager.conf
index 9050582..2392f67 100644
--- a/etc-conf/plugin/subscription-manager.conf
+++ b/etc-conf/plugin/subscription-manager.conf
@@ -1,5 +1,5 @@
[main]
-enabled=1
...
...
@@ -8,9 +9,10 @@ diff -Naurp subscription-manager-1.29.21/etc-conf/plugin/subscription-manager.co
# When following option is set to 1, then all repositories defined outside redhat.repo will be disabled
# every time subscription-manager plugin is triggered by dnf or yum
diff -Naurp subscription-manager-1.29.21/etc-conf/subscription-manager-cockpit.desktop.in subscription-manager-1.29.21-patch/etc-conf/subscription-manager-cockpit.desktop.in
--- subscription-manager-1.29.21/etc-conf/subscription-manager-cockpit.desktop.in 2021-11-11 13:38:40.000000000 -0700
+++ subscription-manager-1.29.21-patch/etc-conf/subscription-manager-cockpit.desktop.in 2022-04-02 17:09:53.877818116 -0700
diff --git a/etc-conf/subscription-manager-cockpit.desktop.in b/etc-conf/subscription-manager-cockpit.desktop.in
index 74b78e1..257f540 100644
--- a/etc-conf/subscription-manager-cockpit.desktop.in
+++ b/etc-conf/subscription-manager-cockpit.desktop.in
@@ -1,5 +1,5 @@
[Desktop Entry]
-_Name=Red Hat Subscription Manager
...
...
@@ -18,9 +20,10 @@ diff -Naurp subscription-manager-1.29.21/etc-conf/subscription-manager-cockpit.d
Icon=subscription-manager
Type=Application
TryExec=/usr/libexec/cockpit-desktop
diff -Naurp subscription-manager-1.29.21/src/subscription_manager/repofile.py subscription-manager-1.29.21-patch/src/subscription_manager/repofile.py
--- subscription-manager-1.29.21/src/subscription_manager/repofile.py 2021-11-11 13:38:40.000000000 -0700
+++ subscription-manager-1.29.21-patch/src/subscription_manager/repofile.py 2022-04-02 17:12:11.796328172 -0700
diff --git a/src/subscription_manager/repofile.py b/src/subscription_manager/repofile.py
index 113378a..667ae04 100644
--- a/src/subscription_manager/repofile.py
+++ b/src/subscription_manager/repofile.py
@@ -369,11 +369,7 @@
class RepoFileBase(object):
Try to create new repo file.
:return: None
...
...
@@ -34,10 +37,11 @@ diff -Naurp subscription-manager-1.29.21/src/subscription_manager/repofile.py su
def fix_content(self, content):
return content
diff -Naurp subscription-manager-1.29.21/src/subscription_manager/repolib.py subscription-manager-1.29.21-patch/src/subscription_manager/repolib.py
--- subscription-manager-1.29.21/src/subscription_manager/repolib.py 2021-11-11 13:38:40.000000000 -0700
+++ subscription-manager-1.29.21-patch/src/subscription_manager/repolib.py 2022-04-02 17:10:07.445769917 -0700
@@ -83,7 +83,7 @@
class YumPluginManager(object):
diff --git a/src/subscription_manager/repolib.py b/src/subscription_manager/repolib.py
index de7ab1d..77aadbf 100644
--- a/src/subscription_manager/repolib.py
+++ b/src/subscription_manager/repolib.py
@@ -82,7 +82,7 @@
class YumPluginManager(object):
@staticmethod
def warning_message(enabled_yum_plugins):
message = _('The yum/dnf plugins: %s were automatically enabled for the benefit of '
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment