rpms/dnf
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add x86_64_v2 to _BASEARCH_MAP

Browse Source 
Add link to AlmaLinux bugtracker
This commit is contained in:
Eduard Abdullin 2025-09-24 06:47:34 +00:00 committed by root
commit fb0c581a05
4 changed files with 119 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
0024-Add-deprecation-warning-for-module-commands.patch Normal file
View File

@ -0,0 +1,34 @@
From f939a23c1d8436365e7587258f264e79b014befc Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Mon, 14 Jul 2025 17:31:04 +0000
Subject: [PATCH 1/2] Add deprecation warning for module commands
For: https://issues.redhat.com/browse/RHEL-89940
---
dnf/cli/commands/module.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dnf/cli/commands/module.py b/dnf/cli/commands/module.py
index b1396360e..88dc8b23c 100644
--- a/dnf/cli/commands/module.py
+++ b/dnf/cli/commands/module.py
@@ -349,7 +349,7 @@ class ModuleCommand(commands.Command):
SUBCMDS_NOT_REQUIRED_ARG = {ListSubCommand}
aliases = ("module",)
- summary = _("Interact with Modules.")
+ summary = _("Interact with Modules. WARNING: modularity is deprecated, and functionality will be removed in a future release of DNF5.")
def __init__(self, cli):
super(ModuleCommand, self).__init__(cli)
@@ -389,6 +389,7 @@ class ModuleCommand(commands.Command):
help=_("Module specification"))
def configure(self):
+ logger.warning(_("WARNING: modularity is deprecated, and functionality will be removed in a future release of DNF5."))
try:
self.subcmd = self._subcmd_name2obj[self.opts.subcmd[0]]
except (CliError, KeyError):
--
2.50.1

57
0025-Add-modularity-deprecation-warning-to-doc-pages.patch Normal file
View File

@ -0,0 +1,57 @@
From 244d46c247bcac729cd84f7454157b86982e2233 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Mon, 14 Jul 2025 17:37:56 +0000
Subject: [PATCH 2/2] Add modularity deprecation warning to doc pages
---
doc/api_module.rst | 2 ++
doc/command_ref.rst | 2 ++
doc/modularity.rst | 3 ++-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/doc/api_module.rst b/doc/api_module.rst
index e2a5c6a11..6d84e214b 100644
--- a/doc/api_module.rst
+++ b/doc/api_module.rst
@@ -19,6 +19,8 @@
Modularity Interface
=====================
+.. warning:: Modularity is deprecated, and functionality will be removed in a future release of DNF5.
+
.. module:: dnf.module.module_base
diff --git a/doc/command_ref.rst b/doc/command_ref.rst
index f7b8e22c8..4e3077283 100644
--- a/doc/command_ref.rst
+++ b/doc/command_ref.rst
@@ -1025,6 +1025,8 @@ Module Command
| Command: ``module``
+.. warning:: Modularity is deprecated, and functionality will be removed in a future release of DNF5.
+
Modularity overview is available at :ref:`man page dnf.modularity(7) <modularity-label>`.
Module subcommands take :ref:`\<module-spec>\ <specifying_modules-label>`... arguments that specify modules or profiles.
diff --git a/doc/modularity.rst b/doc/modularity.rst
index 8ebd07e23..3683bc608 100644
--- a/doc/modularity.rst
+++ b/doc/modularity.rst
@@ -21,10 +21,11 @@
Modularity
############
+.. warning:: Modularity is deprecated, and functionality will be removed in a future release of DNF5.
+
Modularity is new way of building, organizing and delivering packages.
For more details see: https://docs.pagure.org/modularity/
-
=============
Definitions
=============
--
2.50.1

22
2260.patch → 0026-automatic-Fix-detecting-releasever_minor.patch
View File

@ -1,7 +1,12 @@
From a93e9843cf224aecf7adcbf1b7eb9efd9014ec28 Mon Sep 17 00:00:00 2001
From ed51df30350eadc77688d3a44184b5fdb8db9b97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 28 Jul 2025 17:25:09 +0200
Subject: [PATCH] automatic: Fix detecting releasever_minor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream commit: b7eb2e399c42d10444f7d045689fd50f91cf72db
When running dnf-automatic in RHEL 10.0 where releasever_minor should
default to "0", releasever_minor variable was incorrectly detected as
@ -28,16 +33,18 @@ Instead it saves the original releasever_minor value to be able to
default to it again.
Resolve: #2259
Resolve: https://issues.redhat.com/browse/RHEL-108617
Signed-off-by: Petr Písař <ppisar@redhat.com>
---
dnf/cli/cli.py | 8 ++++++--
tests/test_config.py | 12 ++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
index 7aa7b04410..e0d88cac38 100644
index 0be9559d4..f1eef7a9a 100644
--- a/dnf/cli/cli.py
+++ b/dnf/cli/cli.py
@@ -1018,9 +1018,13 @@ def or_else(*args):
@@ -986,9 +986,13 @@ class Cli(object):
if arg is not None:
return arg
return None
@ -54,10 +61,10 @@ index 7aa7b04410..e0d88cac38 100644
if conf.releasever is None:
logger.warning(_("Unable to detect release version (use '--releasever' to specify "
diff --git a/tests/test_config.py b/tests/test_config.py
index 69ba988c41..9445ea29be 100644
index 69ba988c4..9445ea29b 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -21,6 +21,7 @@
@@ -21,6 +21,7 @@ from __future__ import unicode_literals
import argparse
@ -65,7 +72,7 @@ index 69ba988c41..9445ea29be 100644
import dnf.conf
import dnf.conf.read
import dnf.exceptions
@@ -164,3 +165,14 @@ def test_releasever_major_minor(self):
@@ -164,3 +165,14 @@ class ConfTest(tests.support.TestCase):
self.assertEqual(conf.releasever, '1.2')
self.assertEqual(conf.releasever_major, '3')
self.assertEqual(conf.releasever_minor, '4')
@ -80,3 +87,6 @@ index 69ba988c41..9445ea29be 100644
+ self.assertEqual(base.conf.releasever, '1')
+ self.assertEqual(base.conf.releasever_major, '1')
+ self.assertEqual(base.conf.releasever_minor, '2')
--
2.50.1

16
dnf.spec
View File

@ -72,7 +72,7 @@ It supports RPMs, modules and comps groups & environments.
Name: dnf
Version: 4.20.0
Release: 12%{?dist}.alma.2
Release: 14%{?dist}.alma.1
Summary: %{pkg_summary}
# For a breakdown of the licensing, see PACKAGE-LICENSING
License: GPL-2.0-or-later AND GPL-1.0-only
@ -101,11 +101,13 @@ Patch20: 0020-Add-releasever-major-and-releasever-minor-options.patch
Patch21: 0021-doc-Document-detect_releasevers-and-update-example.patch
Patch22: 0022-tests-Patch-detect_releasevers-not-detect_releasever.patch
Patch23: 0023-Document-how-releasever-releasever_-major-minor-affe.patch
Patch24: 0024-Add-deprecation-warning-for-module-commands.patch
Patch25: 0025-Add-modularity-deprecation-warning-to-doc-pages.patch
Patch26: 0026-automatic-Fix-detecting-releasever_minor.patch
# AlmaLinux Patch
Patch1001: 0001-Add-link-to-AlmaLinux-bugtracker.patch
Patch1002: 0001-Add-x86_64_v2-to-_BASEARCH_MAP.patch
Patch1003: 2260.patch
BuildArch: noarch
BuildRequires: cmake
@ -461,10 +463,16 @@ popd
# bootc subpackage does not include any files
%changelog
* Sun Aug 03 2025 Eduard Abdullin <eabdullin@almalinux.org> - 4.20.0-12.alma.2
* Wed Sep 24 2025 Eduard Abdullin <eabdullin@almalinux.org> - 4.20.0-14.alma.1
- Add x86_64_v2 to _BASEARCH_MAP
- Add link to AlmaLinux bugtracker
- automatic: Fix detecting releasever_minor
* Wed Aug 13 2025 Petr Pisar <ppisar@redhat.com> - 4.20.0-14
- Fix detecting releasever_minor in dnf-automatic (RHEL-108617)
* Tue Aug 12 2025 Evan Goode <egoode@redhat.com> - 4.20.0-13
- Add deprecation warning to modularity commands/docs
Resolves: RHEL-104310
* Fri Feb 07 2025 Carl George <carl@redhat.com> - 4.20.0-12
- Override releasever_{major,minor} with system-release provides (RHEL-68034)