Skip to content

Commit a1da990

Browse files
jstancekjstancek
committed
redhat/kernel.spec: fix uname_suffix call sites
JIRA: https://issues.redhat.com/browse/RHEL-104231 Upstream Status: ARK commit ec175b99fad8e27d66749b6acd8701e40bbbc20f commit ec175b99fad8e27d66749b6acd8701e40bbbc20f Author: Jan Stancek <jstancek@redhat.com> Date: Mon Jul 21 09:45:45 2025 +0200 redhat/kernel.spec: fix uname_suffix call sites JIRA: https://issues.redhat.com/browse/RHEL-104231 Fix double '+' in provides/requires - currently both the macro and parameters add '+' separator, which leads to it being repeated twice, e.g.: kernel-devel-uname-r = 6.12.0-109.el10.aarch64++64k Signed-off-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: Jan Stancek <jstancek@redhat.com>
1 parent 45ee25b commit a1da990

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

‎redhat/kernel.spec.template‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,9 +1113,9 @@ The %{package_name} meta package
11131113
Provides: kernel = %{specversion}-%{pkg_release}\
11141114
Provides: %{name} = %{specversion}-%{pkg_release}\
11151115
%endif\
1116-
Provides: %{name}-%{_target_cpu} = %{specrpmversion}-%{pkg_release}%{uname_suffix %{?1:+%{1}}}\
1117-
Provides: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1118-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1116+
Provides: %{name}-%{_target_cpu} = %{specrpmversion}-%{pkg_release}%{uname_suffix %{?1}}\
1117+
Provides: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:}}\
1118+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
11191119
Requires(pre): %{kernel_prereq}\
11201120
Requires(pre): %{initrd_prereq}\
11211121
Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
@@ -1422,9 +1422,9 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
14221422
%package %{?1:%{1}-}devel\
14231423
Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
14241424
Provides: %{name}%{?1:-%{1}}-devel-%{_target_cpu} = %{specrpmversion}-%{release}\
1425-
Provides: %{name}-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1426-
Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1427-
Provides: %{name}-devel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1425+
Provides: %{name}-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1426+
Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1427+
Provides: %{name}-devel-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
14281428
Provides: installonlypkg(kernel)\
14291429
AutoReqProv: no\
14301430
Requires(pre): findutils\
@@ -1474,13 +1474,13 @@ This meta package provides a single reference that other packages can Require to
14741474
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
14751475
Group: System Environment/Kernel\
14761476
Provides: %{name}%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{specrpmversion}-%{release}\
1477-
Provides: %{name}%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1478-
Provides: %{name}%{?1:-%{1}}-modules-internal = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1477+
Provides: %{name}%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1478+
Provides: %{name}%{?1:-%{1}}-modules-internal = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
14791479
Provides: installonlypkg(kernel-module)\
1480-
Provides: %{name}%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1481-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1482-
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1483-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1480+
Provides: %{name}%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1481+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1482+
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1483+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
14841484
AutoReq: no\
14851485
AutoProv: yes\
14861486
%description %{?1:%{1}-}modules-internal\
@@ -1495,13 +1495,13 @@ This package provides kernel modules for the %{?2:%{2} }kernel package for Red H
14951495
%package %{?1:%{1}-}modules-extra\
14961496
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
14971497
Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{specrpmversion}-%{release}\
1498-
Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1499-
Provides: %{name}%{?1:-%{1}}-modules-extra = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1498+
Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1499+
Provides: %{name}%{?1:-%{1}}-modules-extra = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
15001500
Provides: installonlypkg(kernel-module)\
1501-
Provides: %{name}%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1502-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1503-
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1504-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1501+
Provides: %{name}%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1502+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1503+
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1504+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
15051505
%if %{-m:1}%{!-m:0}\
15061506
Requires: %{name}-modules-extra-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
15071507
%endif\
@@ -1519,12 +1519,12 @@ This package provides less commonly used kernel modules for the %{?2:%{2} }kerne
15191519
%package %{?1:%{1}-}modules\
15201520
Summary: kernel modules to match the %{?2:%{2}-}core kernel\
15211521
Provides: %{name}%{?1:-%{1}}-modules-%{_target_cpu} = %{specrpmversion}-%{release}\
1522-
Provides: %{name}-modules-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1523-
Provides: %{name}-modules = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1522+
Provides: %{name}-modules-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1523+
Provides: %{name}-modules = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
15241524
Provides: installonlypkg(kernel-module)\
1525-
Provides: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1526-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1527-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1525+
Provides: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1526+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1527+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
15281528
%if %{-m:1}%{!-m:0}\
15291529
Requires: %{name}-modules-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
15301530
%endif\
@@ -1542,11 +1542,11 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne
15421542
%package %{?1:%{1}-}modules-core\
15431543
Summary: Core kernel modules to match the %{?2:%{2}-}core kernel\
15441544
Provides: %{name}%{?1:-%{1}}-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}\
1545-
Provides: %{name}-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1546-
Provides: %{name}-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1545+
Provides: %{name}-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1546+
Provides: %{name}-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
15471547
Provides: installonlypkg(kernel-module)\
1548-
Provides: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1549-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1548+
Provides: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1549+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
15501550
%if %{-m:1}%{!-m:0}\
15511551
Requires: %{name}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
15521552
%endif\
@@ -1587,7 +1587,7 @@ The meta-package for the %{1} kernel\
15871587
%define kernel_variant_package(n:mo) \
15881588
%package %{?1:%{1}-}core\
15891589
Summary: %{variant_summary}\
1590-
Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1590+
Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
15911591
Provides: installonlypkg(kernel)\
15921592
%if %{-m:1}%{!-m:0}\
15931593
Requires: %{name}-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
@@ -1613,8 +1613,8 @@ Requires: %{name}-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %
16131613
%package %{?1:%{1}-}uki-virt\
16141614
Summary: %{variant_summary} unified kernel image for virtual machines\
16151615
Provides: installonlypkg(kernel)\
1616-
Provides: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1617-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1616+
Provides: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1617+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
16181618
Requires(pre): %{kernel_prereq}\
16191619
Requires(pre): systemd >= 254-1\
16201620
%package %{?1:%{1}-}uki-virt-addons\
@@ -1637,13 +1637,13 @@ Requires(pre): systemd >= 254-1\
16371637
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
16381638
Group: System Environment/Kernel\
16391639
Provides: %{name}%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{specrpmversion}-%{release}\
1640-
Provides: %{name}%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1641-
Provides: %{name}%{?1:-%{1}}-modules-partner = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1640+
Provides: %{name}%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1641+
Provides: %{name}%{?1:-%{1}}-modules-partner = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
16421642
Provides: installonlypkg(kernel-module)\
1643-
Provides: %{name}%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1644-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1645-
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1646-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1643+
Provides: %{name}%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1644+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1645+
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1646+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
16471647
AutoReq: no\
16481648
AutoProv: yes\
16491649
%description %{?1:%{1}-}modules-partner\

0 commit comments

Comments
 (0)