Skip to content

Commit f77ff72

Browse files
jcfaraccojcfaracco
committed
Merge: redhat/kernel.spec: fix uname_variant call sites
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1260 JIRA: https://issues.redhat.com/browse/RHEL-104231 Upstream Status: ARK commit 694549cfbf7b62545f32b47b0eeb3e65f4e86473 commit 694549cfbf7b62545f32b47b0eeb3e65f4e86473 Author: Jan Stancek <jstancek@redhat.com> Date: Mon Jul 21 09:48:57 2025 +0200 redhat/kernel.spec: fix uname_variant call sites JIRA: https://issues.redhat.com/browse/RHEL-104231 Similar to previous commit, fix also uname_variant call sites, that result in duplicated '+' separator. (Note that this is only visible for debugbuildsenabled==0 builds.) Signed-off-by: Jan Stancek <jstancek@redhat.com> Signed-off-by: Jan Stancek <jstancek@redhat.com> Approved-by: Scott Weaver <scweaver@redhat.com> Approved-by: Patrick Talbert <ptalbert@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Julio Faracco <jfaracco@redhat.com>
2 parents 4decfbd + 7b65f26 commit f77ff72

File tree

1 file changed

+42
-42
lines changed

1 file changed

+42
-42
lines changed

‎redhat/kernel.spec.template‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,9 +1118,9 @@ The %{package_name} meta package
11181118
Provides: kernel = %{specversion}-%{pkg_release}\
11191119
Provides: %{name} = %{specversion}-%{pkg_release}\
11201120
%endif\
1121-
Provides: %{name}-%{_target_cpu} = %{specrpmversion}-%{pkg_release}%{uname_suffix %{?1:+%{1}}}\
1122-
Provides: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1123-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1121+
Provides: %{name}-%{_target_cpu} = %{specrpmversion}-%{pkg_release}%{uname_suffix %{?1}}\
1122+
Provides: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1123+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
11241124
Requires(pre): %{kernel_prereq}\
11251125
Requires(pre): %{initrd_prereq}\
11261126
Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
@@ -1427,9 +1427,9 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
14271427
%package %{?1:%{1}-}devel\
14281428
Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
14291429
Provides: %{name}%{?1:-%{1}}-devel-%{_target_cpu} = %{specrpmversion}-%{release}\
1430-
Provides: %{name}-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1431-
Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1432-
Provides: %{name}-devel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1430+
Provides: %{name}-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1431+
Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1432+
Provides: %{name}-devel-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
14331433
Provides: installonlypkg(kernel)\
14341434
AutoReqProv: no\
14351435
Requires(pre): findutils\
@@ -1442,7 +1442,7 @@ Requires: flex\
14421442
Requires: make\
14431443
Requires: gcc\
14441444
%if %{-m:1}%{!-m:0}\
1445-
Requires: %{name}-devel-uname-r = %{KVERREL}%{uname_variant %{?1:%{1}}}\
1445+
Requires: %{name}-devel-uname-r = %{KVERREL}%{uname_variant %{?1}}\
14461446
%endif\
14471447
%description %{?1:%{1}-}devel\
14481448
This package provides kernel headers and makefiles sufficient to build modules\
@@ -1479,13 +1479,13 @@ This meta package provides a single reference that other packages can Require to
14791479
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
14801480
Group: System Environment/Kernel\
14811481
Provides: %{name}%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{specrpmversion}-%{release}\
1482-
Provides: %{name}%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1483-
Provides: %{name}%{?1:-%{1}}-modules-internal = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1482+
Provides: %{name}%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1483+
Provides: %{name}%{?1:-%{1}}-modules-internal = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
14841484
Provides: installonlypkg(kernel-module)\
1485-
Provides: %{name}%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1486-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1487-
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1488-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1485+
Provides: %{name}%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1486+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1487+
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1488+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
14891489
AutoReq: no\
14901490
AutoProv: yes\
14911491
%description %{?1:%{1}-}modules-internal\
@@ -1500,15 +1500,15 @@ This package provides kernel modules for the %{?2:%{2} }kernel package for Red H
15001500
%package %{?1:%{1}-}modules-extra\
15011501
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
15021502
Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{specrpmversion}-%{release}\
1503-
Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1504-
Provides: %{name}%{?1:-%{1}}-modules-extra = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1503+
Provides: %{name}%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1504+
Provides: %{name}%{?1:-%{1}}-modules-extra = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
15051505
Provides: installonlypkg(kernel-module)\
1506-
Provides: %{name}%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1507-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1508-
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1509-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1506+
Provides: %{name}%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1507+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1508+
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1509+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
15101510
%if %{-m:1}%{!-m:0}\
1511-
Requires: %{name}-modules-extra-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
1511+
Requires: %{name}-modules-extra-uname-r = %{KVERREL}%{uname_variant %{?1}}\
15121512
%endif\
15131513
AutoReq: no\
15141514
AutoProv: yes\
@@ -1524,14 +1524,14 @@ This package provides less commonly used kernel modules for the %{?2:%{2} }kerne
15241524
%package %{?1:%{1}-}modules\
15251525
Summary: kernel modules to match the %{?2:%{2}-}core kernel\
15261526
Provides: %{name}%{?1:-%{1}}-modules-%{_target_cpu} = %{specrpmversion}-%{release}\
1527-
Provides: %{name}-modules-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1528-
Provides: %{name}-modules = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1527+
Provides: %{name}-modules-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1528+
Provides: %{name}-modules = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
15291529
Provides: installonlypkg(kernel-module)\
1530-
Provides: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1531-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1532-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1530+
Provides: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1531+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1532+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
15331533
%if %{-m:1}%{!-m:0}\
1534-
Requires: %{name}-modules-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
1534+
Requires: %{name}-modules-uname-r = %{KVERREL}%{uname_variant %{?1}}\
15351535
%endif\
15361536
AutoReq: no\
15371537
AutoProv: yes\
@@ -1547,13 +1547,13 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne
15471547
%package %{?1:%{1}-}modules-core\
15481548
Summary: Core kernel modules to match the %{?2:%{2}-}core kernel\
15491549
Provides: %{name}%{?1:-%{1}}-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}\
1550-
Provides: %{name}-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1551-
Provides: %{name}-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1550+
Provides: %{name}-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1551+
Provides: %{name}-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
15521552
Provides: installonlypkg(kernel-module)\
1553-
Provides: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1554-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1553+
Provides: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1554+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
15551555
%if %{-m:1}%{!-m:0}\
1556-
Requires: %{name}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
1556+
Requires: %{name}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1}}\
15571557
%endif\
15581558
AutoReq: no\
15591559
AutoProv: yes\
@@ -1592,11 +1592,11 @@ The meta-package for the %{1} kernel\
15921592
%define kernel_variant_package(n:mo) \
15931593
%package %{?1:%{1}-}core\
15941594
Summary: %{variant_summary}\
1595-
Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1595+
Provides: %{name}-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
15961596
Provides: installonlypkg(kernel)\
15971597
%if %{-m:1}%{!-m:0}\
1598-
Requires: %{name}-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
1599-
Requires: %{name}-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
1598+
Requires: %{name}-core-uname-r = %{KVERREL}%{uname_variant %{?1}}\
1599+
Requires: %{name}-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1}}\
16001600
%endif\
16011601
%{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\
16021602
%if %{?1:1} %{!?1:0} \
@@ -1618,8 +1618,8 @@ Requires: %{name}-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %
16181618
%package %{?1:%{1}-}uki-virt\
16191619
Summary: %{variant_summary} unified kernel image for virtual machines\
16201620
Provides: installonlypkg(kernel)\
1621-
Provides: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1622-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1621+
Provides: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1622+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
16231623
Requires(pre): %{kernel_prereq}\
16241624
Requires(pre): systemd >= 254-1\
16251625
%package %{?1:%{1}-}uki-virt-addons\
@@ -1642,13 +1642,13 @@ Requires(pre): systemd >= 254-1\
16421642
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
16431643
Group: System Environment/Kernel\
16441644
Provides: %{name}%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{specrpmversion}-%{release}\
1645-
Provides: %{name}%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1646-
Provides: %{name}%{?1:-%{1}}-modules-partner = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
1645+
Provides: %{name}%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
1646+
Provides: %{name}%{?1:-%{1}}-modules-partner = %{specrpmversion}-%{release}%{uname_suffix %{?1}}\
16471647
Provides: installonlypkg(kernel-module)\
1648-
Provides: %{name}%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1649-
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1650-
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1651-
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
1648+
Provides: %{name}%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1649+
Requires: %{name}-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1650+
Requires: %{name}%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
1651+
Requires: %{name}%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1}}\
16521652
AutoReq: no\
16531653
AutoProv: yes\
16541654
%description %{?1:%{1}-}modules-partner\

0 commit comments

Comments
 (0)