1 From 61591a7585758c25ce9fcd9ac7f318b27f016f86 Mon Sep 17 00:00:00 2001
2 From: Jackie Huang <jackie.huang@windriver.com>
3 Date: Mon, 31 Jul 2023 15:05:44 +0800
4 Subject: [PATCH 4/7] kernel-modules: use BUILD_ARCH to fix arch names
6 Use @BUILD_ARCH@ to fix the hardcoded arch names
7 in kernel modules deb meta files.
10 PASS: build-pkgs on x86-64 host
11 PASS: build-image on x86-64 host
12 PASS: build-pkgs on arm64 host
13 PASS: build-image on arm64 host
14 PASS: Deploy AIO-SX on x86-64 target
15 PASS: Deploy AIO-SX on arm64 target
16 PASS: Deploy AIO-SX(low-latency) on arm64 target
17 PASS: Deploy AIO-DX on arm64 targets
22 Depends-On: https://review.opendev.org/c/starlingx/root/+/889686
24 Change-Id: Id2e19860235b89b60be949ae5929b38a4c0d7b55
25 Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
27 kernel-modules/bnxt_en/debian/deb_folder/control | 6 +++---
28 kernel-modules/bnxt_en/debian/deb_folder/rules | 4 ++--
29 .../intel-i40e-cvl-2.54/debian/deb_folder/control | 6 +++---
30 kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/rules | 2 +-
31 .../intel-i40e-cvl-4.10/debian/deb_folder/control | 6 +++---
32 kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/rules | 2 +-
33 kernel-modules/intel-i40e/debian/deb_folder/control | 6 +++---
34 kernel-modules/intel-i40e/debian/deb_folder/rules | 2 +-
35 .../intel-iavf-cvl-2.54/debian/deb_folder/control | 6 +++---
36 kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/rules | 2 +-
37 .../intel-iavf-cvl-4.10/debian/deb_folder/control | 6 +++---
38 kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/rules | 2 +-
39 kernel-modules/intel-iavf/debian/deb_folder/control | 6 +++---
40 kernel-modules/intel-iavf/debian/deb_folder/rules | 2 +-
41 kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/control | 6 +++---
42 kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/rules | 2 +-
43 kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/control | 6 +++---
44 kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/rules | 2 +-
45 kernel-modules/intel-ice/debian/deb_folder/control | 6 +++---
46 kernel-modules/intel-ice/debian/deb_folder/rules | 2 +-
47 kernel-modules/intel-igb_uio/debian/deb_folder/control | 6 +++---
48 kernel-modules/intel-igb_uio/debian/deb_folder/rules | 2 +-
49 kernel-modules/intel-opae-fpga/debian/deb_folder/control | 6 +++---
50 kernel-modules/intel-opae-fpga/debian/deb_folder/rules | 2 +-
51 kernel-modules/intel-qv/debian/deb_folder/control | 4 ++--
52 kernel-modules/intel-qv/debian/deb_folder/rules | 2 +-
53 ...nx-ofa_kernel-adapt-the-debian-folder-for-starling.patch | 4 ++--
54 kernel-modules/octeon_ep/debian/deb_folder/control | 4 ++--
55 kernel-modules/octeon_ep/debian/deb_folder/rules | 2 +-
56 kernel-modules/qat/debian/deb_folder/control | 2 +-
57 kernel-modules/qat/debian/deb_folder/rules | 2 +-
58 31 files changed, 59 insertions(+), 59 deletions(-)
60 diff --git a/kernel-modules/bnxt_en/debian/deb_folder/control b/kernel-modules/bnxt_en/debian/deb_folder/control
61 index 020bf4c..fa3063a 100644
62 --- a/kernel-modules/bnxt_en/debian/deb_folder/control
63 +++ b/kernel-modules/bnxt_en/debian/deb_folder/control
64 @@ -2,7 +2,7 @@ Source: bnxt-en
67 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
68 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, mlnx-ofed-kernel-dev@KERNEL_TYPE@
69 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys, mlnx-ofed-kernel-dev@KERNEL_TYPE@
70 Standards-Version: 4.5.1
71 Rules-Requires-Root: no
73 @@ -11,11 +11,11 @@ Architecture: any
74 Depends: ${shlibs:Depends}, ${misc:Depends}, bnxt-en-common
75 Description: This package provides the bnxt_en and bnxt_re kernel modules.
76 This package provides the bnxt_en and bnxt_re kernel modules built
77 - for the Linux kernel using the amd64 processors.
78 + for the Linux kernel using the @BUILD_ARCH@ processors.
80 Package: bnxt-en-common
82 Depends: ${shlibs:Depends}, ${misc:Depends}
83 Description: This package provides the common files of the bnxt_en and bnxt_re kernel modules.
84 This package provides the common files of the bnxt_en and bnxt_re kernel modules built
85 - for the Linux kernel-std and kernel-rt using the amd64 processors.
86 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
87 diff --git a/kernel-modules/bnxt_en/debian/deb_folder/rules b/kernel-modules/bnxt_en/debian/deb_folder/rules
88 index f999594..5d5ff6c 100755
89 --- a/kernel-modules/bnxt_en/debian/deb_folder/rules
90 +++ b/kernel-modules/bnxt_en/debian/deb_folder/rules
94 kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep common)
95 -kbuild_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
96 +kbuild_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
97 kversion=$(shell echo $(kbuild_name) | sed 's/linux@KERNEL_TYPE@-headers-//g')
98 pkg_common_name=bnxt-en-common
100 # "dpkg --status mlnx-ofed-kernel-dev" prints a version line
101 # like the following:
102 -# Version: 5.5-OFED.5.5.1.0.3.1.stx.5.kver.5.10.0-6-amd64
103 +# Version: 5.5-OFED.5.5.1.0.3.1.stx.5.kver.5.10.0-6-@BUILD_ARCH@
104 # Reduce this line to the version number substring "5.5" before
105 # the substring "-OFED".
106 ofed_version=$(shell dpkg --status mlnx-ofed-kernel-dev@KERNEL_TYPE@ | \
107 diff --git a/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/control b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/control
108 index 79f79b9..0781b5b 100644
109 --- a/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/control
110 +++ b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/control
111 @@ -2,7 +2,7 @@ Source: i40e-cvl-2.54
114 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
115 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
116 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
117 Standards-Version: 4.5.1
118 Rules-Requires-Root: no
120 @@ -11,11 +11,11 @@ Architecture: any
121 Depends: ${shlibs:Depends}, ${misc:Depends}, i40e-cvl-2.54-common
122 Description: This package provides the i40e kernel module(s).
123 This package provides the i40e kernel module(s) built
124 - for the Linux kernel using the amd64 processors.
125 + for the Linux kernel using the @BUILD_ARCH@ processors.
127 Package: i40e-cvl-2.54-common
129 Depends: ${shlibs:Depends}, ${misc:Depends}
130 Description: This package provides the common files of i40e kernel module(s).
131 This package provides the common files of i40e kernel module(s) built
132 - for the Linux kernel-std and kernel-rt using the amd64 processors.
133 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
134 diff --git a/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/rules b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/rules
135 index 065bc84..a961074 100755
136 --- a/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/rules
137 +++ b/kernel-modules/intel-i40e-cvl-2.54/debian/deb_folder/rules
142 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
143 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
144 export KSRC=/usr/src/$(kheaders_name)
145 kversion=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g')
147 diff --git a/kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/control b/kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/control
148 index 81c71f9..d24f420 100644
149 --- a/kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/control
150 +++ b/kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/control
151 @@ -2,7 +2,7 @@ Source: i40e-cvl-4.10
154 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
155 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
156 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
157 Standards-Version: 4.5.1
158 Rules-Requires-Root: no
160 @@ -11,11 +11,11 @@ Architecture: any
161 Depends: ${shlibs:Depends}, ${misc:Depends}, i40e-cvl-4.10-common
162 Description: This package provides the i40e kernel module(s).
163 This package provides the i40e kernel module(s) built
164 - for the Linux kernel using the amd64 processors.
165 + for the Linux kernel using the @BUILD_ARCH@ processors.
167 Package: i40e-cvl-4.10-common
169 Depends: ${shlibs:Depends}, ${misc:Depends}
170 Description: This package provides the common files of i40e kernel module(s).
171 This package provides the common files of i40e kernel module(s) built
172 - for the Linux kernel-std and kernel-rt using the amd64 processors.
173 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
174 diff --git a/kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/rules b/kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/rules
175 index d84ef16..366d041 100755
176 --- a/kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/rules
177 +++ b/kernel-modules/intel-i40e-cvl-4.10/debian/deb_folder/rules
182 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
183 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
184 export KSRC=/usr/src/$(kheaders_name)
185 kversion=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g')
187 diff --git a/kernel-modules/intel-i40e/debian/deb_folder/control b/kernel-modules/intel-i40e/debian/deb_folder/control
188 index a6fd3b3..f3d2faf 100644
189 --- a/kernel-modules/intel-i40e/debian/deb_folder/control
190 +++ b/kernel-modules/intel-i40e/debian/deb_folder/control
191 @@ -2,7 +2,7 @@ Source: i40e
194 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
195 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
196 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
197 Standards-Version: 4.5.1
198 Rules-Requires-Root: no
200 @@ -11,11 +11,11 @@ Architecture: any
201 Depends: ${shlibs:Depends}, ${misc:Depends}, i40e-common
202 Description: This package provides the i40e kernel module(s).
203 This package provides the i40e kernel module(s) built
204 - for the Linux kernel using the amd64 processors.
205 + for the Linux kernel using the @BUILD_ARCH@ processors.
209 Depends: ${shlibs:Depends}, ${misc:Depends}
210 Description: This package provides the common files of i40e kernel module(s).
211 This package provides the common files of i40e kernel module(s) built
212 - for the Linux kernel-std and kernel-rt using the amd64 processors.
213 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
214 diff --git a/kernel-modules/intel-i40e/debian/deb_folder/rules b/kernel-modules/intel-i40e/debian/deb_folder/rules
215 index 7cd46e7..a03ac56 100755
216 --- a/kernel-modules/intel-i40e/debian/deb_folder/rules
217 +++ b/kernel-modules/intel-i40e/debian/deb_folder/rules
222 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
223 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
224 export KSRC=/usr/src/$(kheaders_name)
225 kversion=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g')
227 diff --git a/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/control b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/control
228 index 02857b5..83bbf35 100644
229 --- a/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/control
230 +++ b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/control
231 @@ -2,7 +2,7 @@ Source: iavf-cvl-2.54
234 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
235 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
236 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
237 Standards-Version: 4.5.1
238 Rules-Requires-Root: no
240 @@ -11,11 +11,11 @@ Architecture: any
241 Depends: ${shlibs:Depends}, ${misc:Depends}, iavf-cvl-2.54-common
242 Description: This package provides the iavf kernel module(s).
243 This package provides the iavf kernel module(s) built
244 - for the Linux kernel using the amd64 processors.
245 + for the Linux kernel using the @BUILD_ARCH@ processors.
247 Package: iavf-cvl-2.54-common
249 Depends: ${shlibs:Depends}, ${misc:Depends}
250 Description: This package provides the common files of iavf kernel module(s).
251 This package provides the common files of iavf kernel module(s) built
252 - for the Linux kernel-std and kernel-rt using the amd64 processors.
253 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
254 diff --git a/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/rules b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/rules
255 index e779779..144c4cc 100755
256 --- a/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/rules
257 +++ b/kernel-modules/intel-iavf-cvl-2.54/debian/deb_folder/rules
262 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
263 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
264 kheaders_common=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep common)
265 export KSRC=/usr/src/$(kheaders_name)
266 export KSRC_COMMON=/usr/src/$(kheaders_common)
267 diff --git a/kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/control b/kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/control
268 index 3fb8898..1ea0b9f 100644
269 --- a/kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/control
270 +++ b/kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/control
271 @@ -2,7 +2,7 @@ Source: iavf-cvl-4.10
274 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
275 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
276 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
277 Standards-Version: 4.5.1
278 Rules-Requires-Root: no
280 @@ -11,11 +11,11 @@ Architecture: any
281 Depends: ${shlibs:Depends}, ${misc:Depends}, iavf-cvl-4.10-common
282 Description: This package provides the iavf kernel module(s).
283 This package provides the iavf kernel module(s) built
284 - for the Linux kernel using the amd64 processors.
285 + for the Linux kernel using the @BUILD_ARCH@ processors.
287 Package: iavf-cvl-4.10-common
289 Depends: ${shlibs:Depends}, ${misc:Depends}
290 Description: This package provides the common files of iavf kernel module(s).
291 This package provides the common files of iavf kernel module(s) built
292 - for the Linux kernel-std and kernel-rt using the amd64 processors.
293 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
294 diff --git a/kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/rules b/kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/rules
295 index 14fbe89..c172606 100755
296 --- a/kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/rules
297 +++ b/kernel-modules/intel-iavf-cvl-4.10/debian/deb_folder/rules
302 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
303 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
304 kheaders_common=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep common)
305 export KSRC=/usr/src/$(kheaders_name)
306 export KSRC_COMMON=/usr/src/$(kheaders_common)
307 diff --git a/kernel-modules/intel-iavf/debian/deb_folder/control b/kernel-modules/intel-iavf/debian/deb_folder/control
308 index ac1cb68..a548951 100644
309 --- a/kernel-modules/intel-iavf/debian/deb_folder/control
310 +++ b/kernel-modules/intel-iavf/debian/deb_folder/control
311 @@ -2,7 +2,7 @@ Source: iavf
314 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
315 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
316 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
317 Standards-Version: 4.5.1
318 Rules-Requires-Root: no
320 @@ -11,11 +11,11 @@ Architecture: any
321 Depends: ${shlibs:Depends}, ${misc:Depends}, iavf-common
322 Description: This package provides the iavf kernel module(s).
323 This package provides the iavf kernel module(s) built
324 - for the Linux kernel using the amd64 processors.
325 + for the Linux kernel using the @BUILD_ARCH@ processors.
329 Depends: ${shlibs:Depends}, ${misc:Depends}
330 Description: This package provides the common files of iavf kernel module(s).
331 This package provides the common files of iavf kernel module(s) built
332 - for the Linux kernel-std and kernel-rt using the amd64 processors.
333 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
334 diff --git a/kernel-modules/intel-iavf/debian/deb_folder/rules b/kernel-modules/intel-iavf/debian/deb_folder/rules
335 index aba5cee..13fbc62 100755
336 --- a/kernel-modules/intel-iavf/debian/deb_folder/rules
337 +++ b/kernel-modules/intel-iavf/debian/deb_folder/rules
342 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
343 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
344 kheaders_common=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep common)
345 export KSRC=/usr/src/$(kheaders_name)
346 export KSRC_COMMON=/usr/src/$(kheaders_common)
347 diff --git a/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/control b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/control
348 index 206a90e..44d5d36 100644
349 --- a/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/control
350 +++ b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/control
351 @@ -2,7 +2,7 @@ Source: ice-cvl-2.54
354 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
355 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, unzip
356 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys, unzip
357 Standards-Version: 4.5.1
358 Rules-Requires-Root: no
360 @@ -11,7 +11,7 @@ Architecture: any
361 Depends: ${shlibs:Depends}, ${misc:Depends}, ice-cvl-2.54-common
362 Description: This package provides the ice kernel module(s).
363 This package provides the ice kernel module(s) built
364 - for the Linux kernel using the amd64 processors.
365 + for the Linux kernel using the @BUILD_ARCH@ processors.
366 This package contains the Intel(R) Ethernet Connection E800 Series Linux Driver.
368 Package: ice-cvl-2.54-common
369 @@ -19,5 +19,5 @@ Architecture: any
370 Depends: ${shlibs:Depends}, ${misc:Depends}
371 Description: This package provides the common files of ice kernel module(s).
372 This package provides the common files of ice kernel module(s) built
373 - for the Linux kernel-std and kernel-rt using the amd64 processors.
374 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
375 This package contains the Intel(R) Ethernet Connection E800 Series Linux Driver.
376 diff --git a/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/rules b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/rules
377 index 3c4149a..5cdfbb2 100755
378 --- a/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/rules
379 +++ b/kernel-modules/intel-ice-cvl-2.54/debian/deb_folder/rules
384 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
385 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
386 kheaders_common=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep common)
387 export KSRC=/usr/src/$(kheaders_name)
388 export KSRC_COMMON=/usr/src/$(kheaders_common)
389 diff --git a/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/control b/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/control
390 index a038fce..422c6f7 100644
391 --- a/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/control
392 +++ b/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/control
393 @@ -2,7 +2,7 @@ Source: ice-cvl-4.10
396 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
397 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, unzip
398 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys, unzip
399 Standards-Version: 4.5.1
400 Rules-Requires-Root: no
402 @@ -11,7 +11,7 @@ Architecture: any
403 Depends: ${shlibs:Depends}, ${misc:Depends}, ice-cvl-4.10-common
404 Description: This package provides the ice kernel module(s).
405 This package provides the ice kernel module(s) built
406 - for the Linux kernel using the amd64 processors.
407 + for the Linux kernel using the @BUILD_ARCH@ processors.
408 This package contains the Intel(R) Ethernet Connection E800 Series Linux Driver.
410 Package: ice-cvl-4.10-common
411 @@ -19,5 +19,5 @@ Architecture: any
412 Depends: ${shlibs:Depends}, ${misc:Depends}
413 Description: This package provides the common files of ice kernel module(s).
414 This package provides the common files of ice kernel module(s) built
415 - for the Linux kernel-std and kernel-rt using the amd64 processors.
416 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
417 This package contains the Intel(R) Ethernet Connection E800 Series Linux Driver.
418 diff --git a/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/rules b/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/rules
419 index 24c15ac..8a6a52c 100755
420 --- a/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/rules
421 +++ b/kernel-modules/intel-ice-cvl-4.10/debian/deb_folder/rules
426 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
427 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
428 kheaders_common=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep common)
429 export KSRC=/usr/src/$(kheaders_name)
430 export KSRC_COMMON=/usr/src/$(kheaders_common)
431 diff --git a/kernel-modules/intel-ice/debian/deb_folder/control b/kernel-modules/intel-ice/debian/deb_folder/control
432 index f4da898..a5e19e4 100644
433 --- a/kernel-modules/intel-ice/debian/deb_folder/control
434 +++ b/kernel-modules/intel-ice/debian/deb_folder/control
435 @@ -2,7 +2,7 @@ Source: ice
438 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
439 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, unzip
440 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys, unzip
441 Standards-Version: 4.5.1
442 Rules-Requires-Root: no
444 @@ -11,7 +11,7 @@ Architecture: any
445 Depends: ${shlibs:Depends}, ${misc:Depends}, ice-common
446 Description: This package provides the ice kernel module(s).
447 This package provides the ice kernel module(s) built
448 - for the Linux kernel using the amd64 processors.
449 + for the Linux kernel using the @BUILD_ARCH@ processors.
450 This package contains the Intel(R) Ethernet Connection E800 Series Linux Driver.
453 @@ -19,5 +19,5 @@ Architecture: any
454 Depends: ${shlibs:Depends}, ${misc:Depends}
455 Description: This package provides the common files of ice kernel module(s).
456 This package provides the common files of ice kernel module(s) built
457 - for the Linux kernel-std and kernel-rt using the amd64 processors.
458 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
459 This package contains the Intel(R) Ethernet Connection E800 Series Linux Driver.
460 diff --git a/kernel-modules/intel-ice/debian/deb_folder/rules b/kernel-modules/intel-ice/debian/deb_folder/rules
461 index 3e85540..85d98ac 100755
462 --- a/kernel-modules/intel-ice/debian/deb_folder/rules
463 +++ b/kernel-modules/intel-ice/debian/deb_folder/rules
468 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
469 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
470 kheaders_common=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep common)
471 export KSRC=/usr/src/$(kheaders_name)
472 export KSRC_COMMON=/usr/src/$(kheaders_common)
473 diff --git a/kernel-modules/intel-igb_uio/debian/deb_folder/control b/kernel-modules/intel-igb_uio/debian/deb_folder/control
474 index 4cfde19..c5ef2fb 100644
475 --- a/kernel-modules/intel-igb_uio/debian/deb_folder/control
476 +++ b/kernel-modules/intel-igb_uio/debian/deb_folder/control
477 @@ -2,7 +2,7 @@ Source: igb-uio
480 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
481 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
482 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
483 Standards-Version: 4.5.1
484 Rules-Requires-Root: no
486 @@ -11,11 +11,11 @@ Architecture: any
487 Depends: ${shlibs:Depends}, ${misc:Depends}, python3, igb-uio-common
488 Description: This package provides the igb-uio kernel module(s).
489 This package provides the igb_uio kernel module(s) built
490 - for the Linux kernel using the amd64 processors.
491 + for the Linux kernel using the @BUILD_ARCH@ processors.
493 Package: igb-uio-common
495 Depends: ${shlibs:Depends}, ${misc:Depends}, python3
496 Description: This package provides the common files of igb-uio kernel module(s).
497 This package provides the common files of igb_uio kernel module(s) built
498 - for the Linux kernel-std and kernel-rt using the amd64 processors.
499 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
500 diff --git a/kernel-modules/intel-igb_uio/debian/deb_folder/rules b/kernel-modules/intel-igb_uio/debian/deb_folder/rules
501 index cc2cd59..868e86b 100755
502 --- a/kernel-modules/intel-igb_uio/debian/deb_folder/rules
503 +++ b/kernel-modules/intel-igb_uio/debian/deb_folder/rules
508 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
509 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
510 export KSRC=/usr/src/$(kheaders_name)
512 kversion=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g')
513 diff --git a/kernel-modules/intel-opae-fpga/debian/deb_folder/control b/kernel-modules/intel-opae-fpga/debian/deb_folder/control
514 index a7e7a2f..960cea6 100644
515 --- a/kernel-modules/intel-opae-fpga/debian/deb_folder/control
516 +++ b/kernel-modules/intel-opae-fpga/debian/deb_folder/control
517 @@ -2,7 +2,7 @@ Source: kmod-opae-fpga-driver
520 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
521 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys, perl, openssl
522 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys, perl, openssl
523 Standards-Version: 4.5.1
524 Rules-Requires-Root: no
526 @@ -11,11 +11,11 @@ Architecture: any
527 Depends: ${shlibs:Depends}, ${misc:Depends}, kmod-opae-fpga-driver-common
528 Description: This package provides the opae-fpga kernel module(s).
529 This package provides the opae-fpga-driver kernel module(s) built
530 - for the Linux kernel using the amd64 processors.
531 + for the Linux kernel using the @BUILD_ARCH@ processors.
533 Package: kmod-opae-fpga-driver-common
535 Depends: ${shlibs:Depends}, ${misc:Depends}
536 Description: This package provides the common files of opae-fpga kernel module(s).
537 This package provides the common files of opae-fpga-driver kernel module(s) built
538 - for the Linux kernel-std and kernel-rt using the amd64 processors.
539 + for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
540 diff --git a/kernel-modules/intel-opae-fpga/debian/deb_folder/rules b/kernel-modules/intel-opae-fpga/debian/deb_folder/rules
541 index 78443fc..665f208 100755
542 --- a/kernel-modules/intel-opae-fpga/debian/deb_folder/rules
543 +++ b/kernel-modules/intel-opae-fpga/debian/deb_folder/rules
548 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
549 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
550 export KERNELDIR=/usr/src/$(kheaders_name)
551 kversion=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g')
552 kmod_name=opae-intel-fpga-driver
553 diff --git a/kernel-modules/intel-qv/debian/deb_folder/control b/kernel-modules/intel-qv/debian/deb_folder/control
554 index eb5cbbf..9de0800 100644
555 --- a/kernel-modules/intel-qv/debian/deb_folder/control
556 +++ b/kernel-modules/intel-qv/debian/deb_folder/control
557 @@ -2,7 +2,7 @@ Source: iqvlinux
560 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
561 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
562 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
563 Standards-Version: 4.5.1
564 Rules-Requires-Root: no
566 @@ -11,4 +11,4 @@ Architecture: any
567 Depends: ${shlibs:Depends}, ${misc:Depends}
568 Description: This package provides the iqvlinux kernel module(s).
569 This package provides the iqvlinux kernel module(s) built
570 - for the Linux kernel using the amd64 processors.
571 + for the Linux kernel using the @BUILD_ARCH@ processors.
572 diff --git a/kernel-modules/intel-qv/debian/deb_folder/rules b/kernel-modules/intel-qv/debian/deb_folder/rules
573 index 7f1262b..c5a6e54 100755
574 --- a/kernel-modules/intel-qv/debian/deb_folder/rules
575 +++ b/kernel-modules/intel-qv/debian/deb_folder/rules
576 @@ -26,7 +26,7 @@ export NALDIR="$(PWD)"
580 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
581 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
582 export KSRC=/usr/src/$(kheaders_name)
583 kversion=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g')
585 diff --git a/kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch b/kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch
586 index 46375fd..1e4680c 100644
587 --- a/kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch
588 +++ b/kernel-modules/mlnx-ofa_kernel/debian/deb_patches/0001-mlnx-ofa_kernel-adapt-the-debian-folder-for-starling.patch
589 @@ -47,7 +47,7 @@ index 2b00d80..6b59989 100644
591 Maintainer: Vladimir Sokolovsky <vlad@mellanox.com>
592 -Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms,
593 -+Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms, linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
594 ++Build-Depends: debhelper (>= 8.0.0), autotools-dev, bzip2, dkms, linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
595 Standards-Version: 3.9.2
596 Homepage: http://www.mellanox.com/page/products_dyn?product_family=26&mtag=linux_sw_drivers
598 @@ -256,7 +256,7 @@ index 7e32e3c..e9b2564 100755
600 +#Here kernelver should be the one this package depends on,
601 +#while "uname -r" got the building machine's os release number.
602 -+kheaders_name = $(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
603 ++kheaders_name = $(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
604 +kernelver = $(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g')
606 +ifeq ($(WITH_MOD_SIGN),1)
607 diff --git a/kernel-modules/octeon_ep/debian/deb_folder/control b/kernel-modules/octeon_ep/debian/deb_folder/control
608 index 0d0fb9c..f425649 100644
609 --- a/kernel-modules/octeon_ep/debian/deb_folder/control
610 +++ b/kernel-modules/octeon_ep/debian/deb_folder/control
611 @@ -2,7 +2,7 @@ Source: octeon-ep
614 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
615 -Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
616 +Build-Depends: debhelper-compat (= 13), linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
617 Standards-Version: 4.5.1
618 Rules-Requires-Root: no
620 @@ -19,4 +19,4 @@ Architecture: any
621 Depends: ${shlibs:Depends}, ${misc:Depends}
622 Description: This package provides the common files of the octeon_ep kernel modules.
623 This package provides the config files files of the octeon_ep, octeon_ep_vf, oct_ep_phc
624 - kernel modules built for the Linux kernel-std and kernel-rt using the amd64 processors.
625 + kernel modules built for the Linux kernel-std and kernel-rt using the @BUILD_ARCH@ processors.
626 diff --git a/kernel-modules/octeon_ep/debian/deb_folder/rules b/kernel-modules/octeon_ep/debian/deb_folder/rules
627 index a50ac33..c3b3ef5 100755
628 --- a/kernel-modules/octeon_ep/debian/deb_folder/rules
629 +++ b/kernel-modules/octeon_ep/debian/deb_folder/rules
634 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
635 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
636 kheaders_common=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep common)
637 export KSRC=/usr/src/$(kheaders_name)
638 export KSRC_COMMON=/usr/src/$(kheaders_common)
639 diff --git a/kernel-modules/qat/debian/deb_folder/control b/kernel-modules/qat/debian/deb_folder/control
640 index 6d57018..e8cc660 100644
641 --- a/kernel-modules/qat/debian/deb_folder/control
642 +++ b/kernel-modules/qat/debian/deb_folder/control
643 @@ -2,7 +2,7 @@ Source: qat2.0.l
646 Maintainer: StarlingX Developers <starlingx-discuss@lists.starlingx.io>
647 -Build-Depends: debhelper-compat (= 13), autotools-dev, pkg-config, libudev-dev, yasm, libssl-dev, libz-dev, pciutils, libboost-dev, perl, openssl, libboost-regex-dev, linux@KERNEL_TYPE@-headers-stx-amd64, linux@KERNEL_TYPE@-keys
648 +Build-Depends: debhelper-compat (= 13), autotools-dev, pkg-config, libudev-dev, yasm, libssl-dev, libz-dev, pciutils, libboost-dev, perl, openssl, libboost-regex-dev, linux@KERNEL_TYPE@-headers-stx-@BUILD_ARCH@, linux@KERNEL_TYPE@-keys
649 Standards-Version: 4.5.1
650 Rules-Requires-Root: no
652 diff --git a/kernel-modules/qat/debian/deb_folder/rules b/kernel-modules/qat/debian/deb_folder/rules
653 index 63244e9..7bf5994 100755
654 --- a/kernel-modules/qat/debian/deb_folder/rules
655 +++ b/kernel-modules/qat/debian/deb_folder/rules
656 @@ -28,7 +28,7 @@ WITH_MOD_SIGN ?= 1
657 export DEB_BUILD_OPTIONS=noddebs
658 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
660 -kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep amd64)
661 +kheaders_name=$(shell ls /usr/src | grep linux@KERNEL_TYPE@-headers | grep @BUILD_ARCH@)
662 export KERNEL_SOURCE_ROOT=/usr/src/$(kheaders_name)
663 kernel_version=$(shell echo $(kheaders_name) | sed 's/linux@KERNEL_TYPE@-headers-//g')
664 pkg_name=qat2.0.l@KERNEL_TYPE@