Skip to content

Commit 4ce4471

Browse files
authored
Adjust the conflict package name for mlnx-ofa_kernel-hwe-modules (microsoft#14923)
1 parent 037fd5f commit 4ce4471

File tree

6 files changed

+7
-3
lines changed

6 files changed

+7
-3
lines changed

SPECS-SIGNED/knem-hwe-modules-signed/knem-hwe-modules-signed.spec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Group: System Environment/Libraries
5252
Vendor: Microsoft Corporation
5353
Distribution: Azure Linux
5454
ExclusiveArch: aarch64
55-
Conflicts: knem
55+
5656

5757
#
5858
# To populate these sources:
@@ -73,6 +73,7 @@ See http://knem.gitlabpages.inria.fr for details.
7373
Summary: KNEM: High-Performance Intra-Node MPI Communication
7474
Requires: kernel-hwe = %{target_kernel_version_full}
7575
Requires: kmod
76+
Conflicts: knem-modules
7677

7778
%description -n %{_name}
7879
%{description}

SPECS-SIGNED/mlnx-ofa_kernel-hwe-modules-signed/mlnx-ofa_kernel-hwe-modules-signed.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Requires: procps
126126
Requires: module-init-tools
127127
Requires: lsof
128128
Requires: ofed-scripts
129-
Conflicts: mlnx-ofa_kernel
129+
Conflicts: mlnx-ofa_kernel-modules
130130

131131
%description -n %{_name}
132132
%{description}

SPECS-SIGNED/xpmem-hwe-modules-signed/xpmem-hwe-modules-signed.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Requires: mlnx-ofa_kernel
5454
Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version}
5555
Requires: kernel-hwe = %{target_kernel_version_full}
5656
Requires: kmod
57-
Conflicts: xpmem
57+
Conflicts: xpmem-modules
5858

5959
%description -n %{_name}
6060
%{description}

SPECS/knem-hwe/knem-hwe.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ Summary: KNEM: High-Performance Intra-Node MPI Communication
116116
Group: System Environment/Libraries
117117
Requires: kernel-hwe = %{target_kernel_version_full}
118118
Requires: kmod
119+
Conflicts: knem-modules
119120
ExclusiveArch: aarch64
120121

121122
%description -n %{non_kmp_pname}

SPECS/mlnx-ofa_kernel-hwe/mlnx-ofa_kernel-hwe.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ Requires: procps
192192
Requires: module-init-tools
193193
Requires: lsof
194194
Requires: ofed-scripts
195+
Conflicts: mlnx-ofa_kernel-modules
195196

196197
%description -n %{non_kmp_pname}
197198
Core, HW and ULPs kernel modules

SPECS/xpmem-hwe/xpmem-hwe.spec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ Requires: mlnx-ofa_kernel
107107
Requires: mlnx-ofa_kernel-hwe-modules = %{_mofed_full_version}
108108
Requires: kernel-hwe = %{target_kernel_version_full}
109109
Requires: kmod
110+
Conflicts: xpmem-modules
110111

111112
%description modules
112113
XPMEM is a Linux kernel module that enables a process to map the

0 commit comments

Comments
 (0)