summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-28 23:28:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-08-02 15:44:10 +0100
commitbb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch)
tree76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-kernel
parentfcc456ee4b8f619134abb4649db53c638074082c (diff)
downloadpoky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz
Convert to new override syntax
This is the result of automated script conversion: scripts/contrib/convert-overrides.py <oe-core directory> converting the metadata to use ":" as the override character instead of "_". (From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb2
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb4
-rw-r--r--meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb2
-rw-r--r--meta/recipes-kernel/dtc/dtc.inc4
-rw-r--r--meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb24
-rw-r--r--meta/recipes-kernel/kmod/kmod-native_git.bb2
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc2
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb18
-rw-r--r--meta/recipes-kernel/linux-firmware/linux-firmware_20210511.bb874
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc10
-rw-r--r--meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb4
-rw-r--r--meta/recipes-kernel/linux/kernel-devsrc.bb16
-rw-r--r--meta/recipes-kernel/linux/linux-dummy.bb12
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-dev.bb16
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb14
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb14
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb14
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto.inc28
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb56
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.13.bb62
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.4.bb52
-rw-r--r--meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb6
-rw-r--r--meta/recipes-kernel/lttng/babeltrace_1.5.8.bb2
-rw-r--r--meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb16
-rw-r--r--meta/recipes-kernel/lttng/lttng-platforms.inc12
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb30
-rw-r--r--meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb16
-rw-r--r--meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb2
-rw-r--r--meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb4
-rw-r--r--meta/recipes-kernel/perf/perf.bb40
-rw-r--r--meta/recipes-kernel/powertop/powertop_2.14.bb4
-rw-r--r--meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb4
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb26
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc2
-rw-r--r--meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.04.21.bb8
38 files changed, 710 insertions, 710 deletions
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb
index c55577c661..d5ea9d8529 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.12.bb
@@ -9,5 +9,5 @@ do_install() {
9 install -D ${S}/crypto/cryptodev.h ${D}${includedir}/crypto/cryptodev.h 9 install -D ${S}/crypto/cryptodev.h ${D}${includedir}/crypto/cryptodev.h
10} 10}
11 11
12ALLOW_EMPTY_${PN} = "1" 12ALLOW_EMPTY:${PN} = "1"
13BBCLASSEXTEND = "native nativesdk" 13BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb
index b3b554c7d3..5192cf03ed 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-module_1.12.bb
@@ -12,5 +12,5 @@ SRC_URI += "file://0001-Disable-installing-header-file-provided-by-another-p.pat
12 12
13EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"' 13EXTRA_OEMAKE='KERNEL_DIR="${STAGING_KERNEL_DIR}" PREFIX="${D}"'
14 14
15RCONFLICTS_${PN} = "ocf-linux" 15RCONFLICTS:${PN} = "ocf-linux"
16RREPLACES_${PN} = "ocf-linux" 16RREPLACES:${PN} = "ocf-linux"
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb
index 9cb5dcb94f..c1adbb6245 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.12.bb
@@ -18,4 +18,4 @@ do_install() {
18 oe_runmake install_tests 18 oe_runmake install_tests
19} 19}
20 20
21FILES_${PN} = "${bindir}/*" 21FILES:${PN} = "${bindir}/*"
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index 5da6c24fbf..12508b235d 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -23,6 +23,6 @@ do_install () {
23} 23}
24 24
25PACKAGES =+ "${PN}-misc" 25PACKAGES =+ "${PN}-misc"
26FILES_${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff" 26FILES:${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff"
27 27
28RDEPENDS_${PN}-misc += "bash diffutils" 28RDEPENDS:${PN}-misc += "bash diffutils"
diff --git a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb b/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
index dcc4402111..d12ad4e6fe 100644
--- a/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
+++ b/meta/recipes-kernel/kexec/kexec-tools_2.0.22.bb
@@ -29,7 +29,7 @@ inherit autotools update-rc.d systemd
29export LDFLAGS = "-L${STAGING_LIBDIR}" 29export LDFLAGS = "-L${STAGING_LIBDIR}"
30EXTRA_OECONF = " --with-zlib=yes" 30EXTRA_OECONF = " --with-zlib=yes"
31 31
32do_compile_prepend() { 32do_compile:prepend() {
33 # Remove the prepackaged config.h from the source tree as it overrides 33 # Remove the prepackaged config.h from the source tree as it overrides
34 # the same file generated by configure and placed in the build tree 34 # the same file generated by configure and placed in the build tree
35 rm -f ${S}/include/config.h 35 rm -f ${S}/include/config.h
@@ -44,7 +44,7 @@ do_compile_prepend() {
44 done 44 done
45} 45}
46 46
47do_install_append () { 47do_install:append () {
48 install -d ${D}${sysconfdir}/sysconfig 48 install -d ${D}${sysconfdir}/sysconfig
49 install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig 49 install -m 0644 ${WORKDIR}/kdump.conf ${D}${sysconfdir}/sysconfig
50 50
@@ -61,28 +61,28 @@ do_install_append () {
61 61
62PACKAGES =+ "kexec kdump vmcore-dmesg" 62PACKAGES =+ "kexec kdump vmcore-dmesg"
63 63
64ALLOW_EMPTY_${PN} = "1" 64ALLOW_EMPTY:${PN} = "1"
65RRECOMMENDS_${PN} = "kexec kdump vmcore-dmesg" 65RRECOMMENDS:${PN} = "kexec kdump vmcore-dmesg"
66 66
67FILES_kexec = "${sbindir}/kexec" 67FILES:kexec = "${sbindir}/kexec"
68FILES_kdump = "${sbindir}/kdump \ 68FILES:kdump = "${sbindir}/kdump \
69 ${sysconfdir}/sysconfig/kdump.conf \ 69 ${sysconfdir}/sysconfig/kdump.conf \
70 ${sysconfdir}/init.d/kdump \ 70 ${sysconfdir}/init.d/kdump \
71 ${libexecdir}/kdump-helper \ 71 ${libexecdir}/kdump-helper \
72 ${systemd_unitdir}/system/kdump.service \ 72 ${systemd_unitdir}/system/kdump.service \
73" 73"
74 74
75FILES_vmcore-dmesg = "${sbindir}/vmcore-dmesg" 75FILES:vmcore-dmesg = "${sbindir}/vmcore-dmesg"
76 76
77INITSCRIPT_PACKAGES = "kdump" 77INITSCRIPT_PACKAGES = "kdump"
78INITSCRIPT_NAME_kdump = "kdump" 78INITSCRIPT_NAME:kdump = "kdump"
79INITSCRIPT_PARAMS_kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ." 79INITSCRIPT_PARAMS:kdump = "start 56 2 3 4 5 . stop 56 0 1 6 ."
80 80
81SYSTEMD_PACKAGES = "kdump" 81SYSTEMD_PACKAGES = "kdump"
82SYSTEMD_SERVICE_kdump = "kdump.service" 82SYSTEMD_SERVICE:kdump = "kdump.service"
83 83
84SECURITY_PIE_CFLAGS_remove = "-fPIE -pie" 84SECURITY_PIE_CFLAGS:remove = "-fPIE -pie"
85 85
86COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)' 86COMPATIBLE_HOST = '(x86_64.*|i.86.*|arm.*|aarch64.*|powerpc.*|mips.*)-(linux|freebsd.*)'
87 87
88INSANE_SKIP_${PN} = "arch" 88INSANE_SKIP:${PN} = "arch"
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb
index f61134bbaf..4dd34b1c82 100644
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ b/meta/recipes-kernel/kmod/kmod-native_git.bb
@@ -7,7 +7,7 @@ DEPENDS += "zlib-native"
7 7
8inherit native 8inherit native
9 9
10do_install_append (){ 10do_install:append (){
11 for tool in depmod insmod lsmod modinfo modprobe rmmod 11 for tool in depmod insmod lsmod modinfo modprobe rmmod
12 do 12 do
13 ln -s kmod ${D}${bindir}/$tool 13 ln -s kmod ${D}${bindir}/$tool
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index e66684fda0..c2d550acaf 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -6,7 +6,7 @@ DESCRIPTION = "kmod is a set of tools to handle common tasks with Linux kernel m
6 insert, remove, list, check properties, resolve dependencies and aliases." 6 insert, remove, list, check properties, resolve dependencies and aliases."
7HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kmod/" 7HOMEPAGE = "http://kernel.org/pub/linux/utils/kernel/kmod/"
8LICENSE = "GPL-2.0+ & LGPL-2.1+" 8LICENSE = "GPL-2.0+ & LGPL-2.1+"
9LICENSE_libkmod = "LGPL-2.1+" 9LICENSE:libkmod = "LGPL-2.1+"
10SECTION = "base" 10SECTION = "base"
11 11
12LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ 12LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index 4f2b037f2f..853561a61e 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -5,17 +5,17 @@ require kmod.inc
5 5
6DEPENDS += "zlib" 6DEPENDS += "zlib"
7PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 7PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
8RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 8RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
9RCONFLICTS_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 9RCONFLICTS:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
10RREPLACES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 10RREPLACES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
11 11
12# to force user to remove old module-init-tools and replace them with kmod variants 12# to force user to remove old module-init-tools and replace them with kmod variants
13RCONFLICTS_libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" 13RCONFLICTS:libkmod2 += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
14 14
15# autotools set prefix to /usr, however we want them in /bin and /sbin 15# autotools set prefix to /usr, however we want them in /bin and /sbin
16EXTRA_OECONF += " --bindir=${base_bindir} --sbindir=${base_sbindir}" 16EXTRA_OECONF += " --bindir=${base_bindir} --sbindir=${base_sbindir}"
17 17
18do_install_append () { 18do_install:append () {
19 install -dm755 ${D}${base_bindir} 19 install -dm755 ${D}${base_bindir}
20 install -dm755 ${D}${base_sbindir} 20 install -dm755 ${D}${base_sbindir}
21 # add symlinks to kmod 21 # add symlinks to kmod
@@ -33,7 +33,7 @@ do_install_append () {
33 install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf" 33 install -Dm644 "${WORKDIR}/depmod-search.conf" "${D}${base_libdir}/depmod.d/search.conf"
34} 34}
35 35
36do_compile_prepend() { 36do_compile:prepend() {
37 sed -i 's/ac_pwd=/#ac_pwd=/' config.status ; sed -i "/#ac_pwd=/a\ac_pwd='.'" config.status 37 sed -i 's/ac_pwd=/#ac_pwd=/' config.status ; sed -i "/#ac_pwd=/a\ac_pwd='.'" config.status
38} 38}
39 39
@@ -41,7 +41,7 @@ inherit update-alternatives bash-completion
41 41
42ALTERNATIVE_PRIORITY = "70" 42ALTERNATIVE_PRIORITY = "70"
43 43
44ALTERNATIVE_kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod" 44ALTERNATIVE:kmod = "insmod modprobe rmmod modinfo bin-lsmod lsmod depmod"
45 45
46ALTERNATIVE_LINK_NAME[insmod] = "${base_sbindir}/insmod" 46ALTERNATIVE_LINK_NAME[insmod] = "${base_sbindir}/insmod"
47ALTERNATIVE_LINK_NAME[modprobe] = "${base_sbindir}/modprobe" 47ALTERNATIVE_LINK_NAME[modprobe] = "${base_sbindir}/modprobe"
@@ -56,7 +56,7 @@ ALTERNATIVE_LINK_NAME[depmod] = "${base_sbindir}/depmod"
56 56
57PACKAGES =+ "libkmod" 57PACKAGES =+ "libkmod"
58 58
59FILES_libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}" 59FILES:libkmod = "${base_libdir}/libkmod*${SOLIBS} ${libdir}/libkmod*${SOLIBS}"
60FILES_${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d" 60FILES:${PN} += "${base_libdir}/depmod.d ${base_libdir}/modprobe.d"
61 61
62BBCLASSEXTEND = "nativesdk" 62BBCLASSEXTEND = "nativesdk"
diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20210511.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20210511.bb
index 26091fba70..fe46cb5192 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20210511.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20210511.bb
@@ -312,19 +312,19 @@ PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
312 " 312 "
313 313
314# For atheros 314# For atheros
315LICENSE_${PN}-ar9170 = "Firmware-atheros_firmware" 315LICENSE:${PN}-ar9170 = "Firmware-atheros_firmware"
316LICENSE_${PN}-ath6k = "Firmware-atheros_firmware" 316LICENSE:${PN}-ath6k = "Firmware-atheros_firmware"
317LICENSE_${PN}-ath9k = "Firmware-atheros_firmware" 317LICENSE:${PN}-ath9k = "Firmware-atheros_firmware"
318LICENSE_${PN}-atheros-license = "Firmware-atheros_firmware" 318LICENSE:${PN}-atheros-license = "Firmware-atheros_firmware"
319 319
320FILES_${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware" 320FILES:${PN}-atheros-license = "${nonarch_base_libdir}/firmware/LICENCE.atheros_firmware"
321FILES_${PN}-ar9170 = " \ 321FILES:${PN}-ar9170 = " \
322 ${nonarch_base_libdir}/firmware/ar9170*.fw \ 322 ${nonarch_base_libdir}/firmware/ar9170*.fw \
323" 323"
324FILES_${PN}-ath6k = " \ 324FILES:${PN}-ath6k = " \
325 ${nonarch_base_libdir}/firmware/ath6k \ 325 ${nonarch_base_libdir}/firmware/ath6k \
326" 326"
327FILES_${PN}-ath9k = " \ 327FILES:${PN}-ath9k = " \
328 ${nonarch_base_libdir}/firmware/ar9271.fw \ 328 ${nonarch_base_libdir}/firmware/ar9271.fw \
329 ${nonarch_base_libdir}/firmware/ar7010*.fw \ 329 ${nonarch_base_libdir}/firmware/ar7010*.fw \
330 ${nonarch_base_libdir}/firmware/htc_9271.fw \ 330 ${nonarch_base_libdir}/firmware/htc_9271.fw \
@@ -333,166 +333,166 @@ FILES_${PN}-ath9k = " \
333 ${nonarch_base_libdir}/firmware/ath9k_htc/htc_9271-1.4.0.fw \ 333 ${nonarch_base_libdir}/firmware/ath9k_htc/htc_9271-1.4.0.fw \
334" 334"
335 335
336RDEPENDS_${PN}-ar9170 += "${PN}-atheros-license" 336RDEPENDS:${PN}-ar9170 += "${PN}-atheros-license"
337RDEPENDS_${PN}-ath6k += "${PN}-atheros-license" 337RDEPENDS:${PN}-ath6k += "${PN}-atheros-license"
338RDEPENDS_${PN}-ath9k += "${PN}-atheros-license" 338RDEPENDS:${PN}-ath9k += "${PN}-atheros-license"
339 339
340# For carl9170 340# For carl9170
341LICENSE_${PN}-carl9170 = "Firmware-GPLv2" 341LICENSE:${PN}-carl9170 = "Firmware-GPLv2"
342LICENSE_${PN}-gplv2-license = "Firmware-GPLv2" 342LICENSE:${PN}-gplv2-license = "Firmware-GPLv2"
343 343
344FILES_${PN}-gplv2-license = "${nonarch_base_libdir}/firmware/GPL-2" 344FILES:${PN}-gplv2-license = "${nonarch_base_libdir}/firmware/GPL-2"
345FILES_${PN}-carl9170 = " \ 345FILES:${PN}-carl9170 = " \
346 ${nonarch_base_libdir}/firmware/carl9170*.fw \ 346 ${nonarch_base_libdir}/firmware/carl9170*.fw \
347" 347"
348 348
349RDEPENDS_${PN}-carl9170 += "${PN}-gplv2-license" 349RDEPENDS:${PN}-carl9170 += "${PN}-gplv2-license"
350 350
351# For QualCommAthos 351# For QualCommAthos
352LICENSE_${PN}-ar3k = "Firmware-qualcommAthos_ar3k" 352LICENSE:${PN}-ar3k = "Firmware-qualcommAthos_ar3k"
353LICENSE_${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k" 353LICENSE:${PN}-ar3k-license = "Firmware-qualcommAthos_ar3k"
354LICENSE_${PN}-ath10k = "Firmware-qualcommAthos_ath10k" 354LICENSE:${PN}-ath10k = "Firmware-qualcommAthos_ath10k"
355LICENSE_${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k" 355LICENSE:${PN}-ath10k-license = "Firmware-qualcommAthos_ath10k"
356LICENSE_${PN}-qca = "Firmware-qualcommAthos_ath10k" 356LICENSE:${PN}-qca = "Firmware-qualcommAthos_ath10k"
357 357
358FILES_${PN}-ar3k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k" 358FILES:${PN}-ar3k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ar3k"
359FILES_${PN}-ar3k = " \ 359FILES:${PN}-ar3k = " \
360 ${nonarch_base_libdir}/firmware/ar3k \ 360 ${nonarch_base_libdir}/firmware/ar3k \
361" 361"
362 362
363FILES_${PN}-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k" 363FILES:${PN}-ath10k-license = "${nonarch_base_libdir}/firmware/LICENSE.QualcommAtheros_ath10k"
364FILES_${PN}-ath10k = " \ 364FILES:${PN}-ath10k = " \
365 ${nonarch_base_libdir}/firmware/ath10k \ 365 ${nonarch_base_libdir}/firmware/ath10k \
366" 366"
367 367
368FILES_${PN}-ath11k = " \ 368FILES:${PN}-ath11k = " \
369 ${nonarch_base_libdir}/firmware/ath11k \ 369 ${nonarch_base_libdir}/firmware/ath11k \
370" 370"
371 371
372FILES_${PN}-qca = " \ 372FILES:${PN}-qca = " \
373 ${nonarch_base_libdir}/firmware/qca \ 373 ${nonarch_base_libdir}/firmware/qca \
374" 374"
375 375
376RDEPENDS_${PN}-ar3k += "${PN}-ar3k-license" 376RDEPENDS:${PN}-ar3k += "${PN}-ar3k-license"
377RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license" 377RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license"
378RDEPENDS_${PN}-ath11k += "${PN}-ath10k-license" 378RDEPENDS:${PN}-ath11k += "${PN}-ath10k-license"
379RDEPENDS_${PN}-qca += "${PN}-ath10k-license" 379RDEPENDS:${PN}-qca += "${PN}-ath10k-license"
380 380
381# For ralink 381# For ralink
382LICENSE_${PN}-ralink = "Firmware-ralink-firmware" 382LICENSE:${PN}-ralink = "Firmware-ralink-firmware"
383LICENSE_${PN}-ralink-license = "Firmware-ralink-firmware" 383LICENSE:${PN}-ralink-license = "Firmware-ralink-firmware"
384 384
385FILES_${PN}-ralink-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink-firmware.txt" 385FILES:${PN}-ralink-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink-firmware.txt"
386FILES_${PN}-ralink = " \ 386FILES:${PN}-ralink = " \
387 ${nonarch_base_libdir}/firmware/rt*.bin \ 387 ${nonarch_base_libdir}/firmware/rt*.bin \
388" 388"
389 389
390RDEPENDS_${PN}-ralink += "${PN}-ralink-license" 390RDEPENDS:${PN}-ralink += "${PN}-ralink-license"
391 391
392# For mediatek MT7601U 392# For mediatek MT7601U
393LICENSE_${PN}-mt7601u = "Firmware-ralink_a_mediatek_company_firmware" 393LICENSE:${PN}-mt7601u = "Firmware-ralink_a_mediatek_company_firmware"
394LICENSE_${PN}-mt7601u-license = "Firmware-ralink_a_mediatek_company_firmware" 394LICENSE:${PN}-mt7601u-license = "Firmware-ralink_a_mediatek_company_firmware"
395 395
396FILES_${PN}-mt7601u-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware" 396FILES:${PN}-mt7601u-license = "${nonarch_base_libdir}/firmware/LICENCE.ralink_a_mediatek_company_firmware"
397FILES_${PN}-mt7601u = " \ 397FILES:${PN}-mt7601u = " \
398 ${nonarch_base_libdir}/firmware/mt7601u.bin \ 398 ${nonarch_base_libdir}/firmware/mt7601u.bin \
399" 399"
400 400
401RDEPENDS_${PN}-mt7601u += "${PN}-mt7601u-license" 401RDEPENDS:${PN}-mt7601u += "${PN}-mt7601u-license"
402 402
403# For radeon 403# For radeon
404LICENSE_${PN}-radeon = "Firmware-radeon" 404LICENSE:${PN}-radeon = "Firmware-radeon"
405LICENSE_${PN}-radeon-license = "Firmware-radeon" 405LICENSE:${PN}-radeon-license = "Firmware-radeon"
406 406
407FILES_${PN}-radeon-license = "${nonarch_base_libdir}/firmware/LICENSE.radeon" 407FILES:${PN}-radeon-license = "${nonarch_base_libdir}/firmware/LICENSE.radeon"
408FILES_${PN}-radeon = " \ 408FILES:${PN}-radeon = " \
409 ${nonarch_base_libdir}/firmware/radeon \ 409 ${nonarch_base_libdir}/firmware/radeon \
410" 410"
411 411
412RDEPENDS_${PN}-radeon += "${PN}-radeon-license" 412RDEPENDS:${PN}-radeon += "${PN}-radeon-license"
413 413
414# For lontium 414# For lontium
415LICENSE_${PN}-lt9611uxc = "Firmware-Lontium" 415LICENSE:${PN}-lt9611uxc = "Firmware-Lontium"
416 416
417FILES_${PN}-lontium-license = "${nonarch_base_libdir}/firmware/LICENSE.Lontium" 417FILES:${PN}-lontium-license = "${nonarch_base_libdir}/firmware/LICENSE.Lontium"
418FILES_${PN}-lt9611uxc = "${nonarch_base_libdir}/firmware/lt9611uxc_fw.bin" 418FILES:${PN}-lt9611uxc = "${nonarch_base_libdir}/firmware/lt9611uxc_fw.bin"
419 419
420# For marvell 420# For marvell
421LICENSE_${PN}-pcie8897 = "Firmware-Marvell" 421LICENSE:${PN}-pcie8897 = "Firmware-Marvell"
422LICENSE_${PN}-pcie8997 = "Firmware-Marvell" 422LICENSE:${PN}-pcie8997 = "Firmware-Marvell"
423LICENSE_${PN}-sd8686 = "Firmware-Marvell" 423LICENSE:${PN}-sd8686 = "Firmware-Marvell"
424LICENSE_${PN}-sd8688 = "Firmware-Marvell" 424LICENSE:${PN}-sd8688 = "Firmware-Marvell"
425LICENSE_${PN}-sd8787 = "Firmware-Marvell" 425LICENSE:${PN}-sd8787 = "Firmware-Marvell"
426LICENSE_${PN}-sd8797 = "Firmware-Marvell" 426LICENSE:${PN}-sd8797 = "Firmware-Marvell"
427LICENSE_${PN}-sd8801 = "Firmware-Marvell" 427LICENSE:${PN}-sd8801 = "Firmware-Marvell"
428LICENSE_${PN}-sd8887 = "Firmware-Marvell" 428LICENSE:${PN}-sd8887 = "Firmware-Marvell"
429LICENSE_${PN}-sd8897 = "Firmware-Marvell" 429LICENSE:${PN}-sd8897 = "Firmware-Marvell"
430LICENSE_${PN}-sd8997 = "Firmware-Marvell" 430LICENSE:${PN}-sd8997 = "Firmware-Marvell"
431LICENSE_${PN}-usb8997 = "Firmware-Marvell" 431LICENSE:${PN}-usb8997 = "Firmware-Marvell"
432LICENSE_${PN}-marvell-license = "Firmware-Marvell" 432LICENSE:${PN}-marvell-license = "Firmware-Marvell"
433 433
434FILES_${PN}-marvell-license = "${nonarch_base_libdir}/firmware/LICENCE.Marvell" 434FILES:${PN}-marvell-license = "${nonarch_base_libdir}/firmware/LICENCE.Marvell"
435FILES_${PN}-pcie8897 = " \ 435FILES:${PN}-pcie8897 = " \
436 ${nonarch_base_libdir}/firmware/mrvl/pcie8897_uapsta.bin \ 436 ${nonarch_base_libdir}/firmware/mrvl/pcie8897_uapsta.bin \
437" 437"
438FILES_${PN}-pcie8997 = " \ 438FILES:${PN}-pcie8997 = " \
439 ${nonarch_base_libdir}/firmware/mrvl/pcie8997_wlan_v4.bin \ 439 ${nonarch_base_libdir}/firmware/mrvl/pcie8997_wlan_v4.bin \
440 ${nonarch_base_libdir}/firmware/mrvl/pcieuart8997_combo_v4.bin \ 440 ${nonarch_base_libdir}/firmware/mrvl/pcieuart8997_combo_v4.bin \
441 ${nonarch_base_libdir}/firmware/mrvl/pcieusb8997_combo_v4.bin \ 441 ${nonarch_base_libdir}/firmware/mrvl/pcieusb8997_combo_v4.bin \
442" 442"
443FILES_${PN}-sd8686 = " \ 443FILES:${PN}-sd8686 = " \
444 ${nonarch_base_libdir}/firmware/libertas/sd8686_v9* \ 444 ${nonarch_base_libdir}/firmware/libertas/sd8686_v9* \
445 ${nonarch_base_libdir}/firmware/sd8686* \ 445 ${nonarch_base_libdir}/firmware/sd8686* \
446" 446"
447FILES_${PN}-sd8688 = " \ 447FILES:${PN}-sd8688 = " \
448 ${nonarch_base_libdir}/firmware/libertas/sd8688* \ 448 ${nonarch_base_libdir}/firmware/libertas/sd8688* \
449 ${nonarch_base_libdir}/firmware/mrvl/sd8688* \ 449 ${nonarch_base_libdir}/firmware/mrvl/sd8688* \
450" 450"
451FILES_${PN}-sd8787 = " \ 451FILES:${PN}-sd8787 = " \
452 ${nonarch_base_libdir}/firmware/mrvl/sd8787_uapsta.bin \ 452 ${nonarch_base_libdir}/firmware/mrvl/sd8787_uapsta.bin \
453" 453"
454FILES_${PN}-sd8797 = " \ 454FILES:${PN}-sd8797 = " \
455 ${nonarch_base_libdir}/firmware/mrvl/sd8797_uapsta.bin \ 455 ${nonarch_base_libdir}/firmware/mrvl/sd8797_uapsta.bin \
456" 456"
457FILES_${PN}-sd8801 = " \ 457FILES:${PN}-sd8801 = " \
458 ${nonarch_base_libdir}/firmware/mrvl/sd8801_uapsta.bin \ 458 ${nonarch_base_libdir}/firmware/mrvl/sd8801_uapsta.bin \
459" 459"
460FILES_${PN}-sd8887 = " \ 460FILES:${PN}-sd8887 = " \
461 ${nonarch_base_libdir}/firmware/mrvl/sd8887_uapsta.bin \ 461 ${nonarch_base_libdir}/firmware/mrvl/sd8887_uapsta.bin \
462" 462"
463FILES_${PN}-sd8897 = " \ 463FILES:${PN}-sd8897 = " \
464 ${nonarch_base_libdir}/firmware/mrvl/sd8897_uapsta.bin \ 464 ${nonarch_base_libdir}/firmware/mrvl/sd8897_uapsta.bin \
465" 465"
466do_install_append() { 466do_install:append() {
467 # The kernel 5.6.x driver still uses the old name, provide a symlink for 467 # The kernel 5.6.x driver still uses the old name, provide a symlink for
468 # older kernels 468 # older kernels
469 ln -fs sdsd8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin 469 ln -fs sdsd8997_combo_v4.bin ${D}${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin
470} 470}
471FILES_${PN}-sd8997 = " \ 471FILES:${PN}-sd8997 = " \
472 ${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin \ 472 ${nonarch_base_libdir}/firmware/mrvl/sd8997_uapsta.bin \
473 ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin \ 473 ${nonarch_base_libdir}/firmware/mrvl/sdsd8997_combo_v4.bin \
474" 474"
475FILES_${PN}-usb8997 = " \ 475FILES:${PN}-usb8997 = " \
476 ${nonarch_base_libdir}/firmware/mrvl/usbusb8997_combo_v4.bin \ 476 ${nonarch_base_libdir}/firmware/mrvl/usbusb8997_combo_v4.bin \
477" 477"
478 478
479RDEPENDS_${PN}-sd8686 += "${PN}-marvell-license" 479RDEPENDS:${PN}-sd8686 += "${PN}-marvell-license"
480RDEPENDS_${PN}-sd8688 += "${PN}-marvell-license" 480RDEPENDS:${PN}-sd8688 += "${PN}-marvell-license"
481RDEPENDS_${PN}-sd8787 += "${PN}-marvell-license" 481RDEPENDS:${PN}-sd8787 += "${PN}-marvell-license"
482RDEPENDS_${PN}-sd8797 += "${PN}-marvell-license" 482RDEPENDS:${PN}-sd8797 += "${PN}-marvell-license"
483RDEPENDS_${PN}-sd8801 += "${PN}-marvell-license" 483RDEPENDS:${PN}-sd8801 += "${PN}-marvell-license"
484RDEPENDS_${PN}-sd8887 += "${PN}-marvell-license" 484RDEPENDS:${PN}-sd8887 += "${PN}-marvell-license"
485RDEPENDS_${PN}-sd8897 += "${PN}-marvell-license" 485RDEPENDS:${PN}-sd8897 += "${PN}-marvell-license"
486RDEPENDS_${PN}-sd8997 += "${PN}-marvell-license" 486RDEPENDS:${PN}-sd8997 += "${PN}-marvell-license"
487RDEPENDS_${PN}-usb8997 += "${PN}-marvell-license" 487RDEPENDS:${PN}-usb8997 += "${PN}-marvell-license"
488 488
489# For netronome 489# For netronome
490LICENSE_${PN}-netronome = "Firmware-netronome" 490LICENSE:${PN}-netronome = "Firmware-netronome"
491 491
492FILES_${PN}-netronome-license = " \ 492FILES:${PN}-netronome-license = " \
493 ${nonarch_base_libdir}/firmware/LICENCE.Netronome \ 493 ${nonarch_base_libdir}/firmware/LICENCE.Netronome \
494" 494"
495FILES_${PN}-netronome = " \ 495FILES:${PN}-netronome = " \
496 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0081*.nffw \ 496 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0081*.nffw \
497 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0096*.nffw \ 497 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0096*.nffw \
498 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0097*.nffw \ 498 ${nonarch_base_libdir}/firmware/netronome/nic_AMDA0097*.nffw \
@@ -506,90 +506,90 @@ FILES_${PN}-netronome = " \
506 ${nonarch_base_libdir}/firmware/netronome/nic-sriov \ 506 ${nonarch_base_libdir}/firmware/netronome/nic-sriov \
507" 507"
508 508
509RDEPENDS_${PN}-netronome += "${PN}-netronome-license" 509RDEPENDS:${PN}-netronome += "${PN}-netronome-license"
510 510
511# For Nvidia 511# For Nvidia
512LICENSE_${PN}-nvidia-gpu = "Firmware-nvidia" 512LICENSE:${PN}-nvidia-gpu = "Firmware-nvidia"
513LICENSE_${PN}-nvidia-tegra = "Firmware-nvidia" 513LICENSE:${PN}-nvidia-tegra = "Firmware-nvidia"
514LICENSE_${PN}-nvidia-tegra-k1 = "Firmware-nvidia" 514LICENSE:${PN}-nvidia-tegra-k1 = "Firmware-nvidia"
515LICENSE_${PN}-nvidia-license = "Firmware-nvidia" 515LICENSE:${PN}-nvidia-license = "Firmware-nvidia"
516 516
517FILES_${PN}-nvidia-gpu = "${nonarch_base_libdir}/firmware/nvidia" 517FILES:${PN}-nvidia-gpu = "${nonarch_base_libdir}/firmware/nvidia"
518FILES_${PN}-nvidia-tegra = " \ 518FILES:${PN}-nvidia-tegra = " \
519 ${nonarch_base_libdir}/firmware/nvidia/tegra* \ 519 ${nonarch_base_libdir}/firmware/nvidia/tegra* \
520 ${nonarch_base_libdir}/firmware/nvidia/gm20b \ 520 ${nonarch_base_libdir}/firmware/nvidia/gm20b \
521 ${nonarch_base_libdir}/firmware/nvidia/gp10b \ 521 ${nonarch_base_libdir}/firmware/nvidia/gp10b \
522" 522"
523FILES_${PN}-nvidia-tegra-k1 = " \ 523FILES:${PN}-nvidia-tegra-k1 = " \
524 ${nonarch_base_libdir}/firmware/nvidia/tegra124 \ 524 ${nonarch_base_libdir}/firmware/nvidia/tegra124 \
525 ${nonarch_base_libdir}/firmware/nvidia/gk20a \ 525 ${nonarch_base_libdir}/firmware/nvidia/gk20a \
526" 526"
527FILES_${PN}-nvidia-license = "${nonarch_base_libdir}/firmware/LICENCE.nvidia" 527FILES:${PN}-nvidia-license = "${nonarch_base_libdir}/firmware/LICENCE.nvidia"
528 528
529RDEPENDS_${PN}-nvidia-gpu += "${PN}-nvidia-license" 529RDEPENDS:${PN}-nvidia-gpu += "${PN}-nvidia-license"
530RDEPENDS_${PN}-nvidia-tegra += "${PN}-nvidia-license" 530RDEPENDS:${PN}-nvidia-tegra += "${PN}-nvidia-license"
531RDEPENDS_${PN}-nvidia-tegra-k1 += "${PN}-nvidia-license" 531RDEPENDS:${PN}-nvidia-tegra-k1 += "${PN}-nvidia-license"
532 532
533# For RSI RS911x WiFi 533# For RSI RS911x WiFi
534LICENSE_${PN}-rs9113 = "WHENCE" 534LICENSE:${PN}-rs9113 = "WHENCE"
535LICENSE_${PN}-rs9116 = "WHENCE" 535LICENSE:${PN}-rs9116 = "WHENCE"
536 536
537FILES_${PN}-rs9113 = " ${nonarch_base_libdir}/firmware/rsi/rs9113*.rps " 537FILES:${PN}-rs9113 = " ${nonarch_base_libdir}/firmware/rsi/rs9113*.rps "
538FILES_${PN}-rs9116 = " ${nonarch_base_libdir}/firmware/rsi/rs9116*.rps " 538FILES:${PN}-rs9116 = " ${nonarch_base_libdir}/firmware/rsi/rs9116*.rps "
539 539
540RDEPENDS_${PN}-rs9113 += "${PN}-whence-license" 540RDEPENDS:${PN}-rs9113 += "${PN}-whence-license"
541RDEPENDS_${PN}-rs9116 += "${PN}-whence-license" 541RDEPENDS:${PN}-rs9116 += "${PN}-whence-license"
542 542
543# For rtl 543# For rtl
544LICENSE_${PN}-rtl8188 = "Firmware-rtlwifi_firmware" 544LICENSE:${PN}-rtl8188 = "Firmware-rtlwifi_firmware"
545LICENSE_${PN}-rtl8192cu = "Firmware-rtlwifi_firmware" 545LICENSE:${PN}-rtl8192cu = "Firmware-rtlwifi_firmware"
546LICENSE_${PN}-rtl8192ce = "Firmware-rtlwifi_firmware" 546LICENSE:${PN}-rtl8192ce = "Firmware-rtlwifi_firmware"
547LICENSE_${PN}-rtl8192su = "Firmware-rtlwifi_firmware" 547LICENSE:${PN}-rtl8192su = "Firmware-rtlwifi_firmware"
548LICENSE_${PN}-rtl8723 = "Firmware-rtlwifi_firmware" 548LICENSE:${PN}-rtl8723 = "Firmware-rtlwifi_firmware"
549LICENSE_${PN}-rtl8821 = "Firmware-rtlwifi_firmware" 549LICENSE:${PN}-rtl8821 = "Firmware-rtlwifi_firmware"
550LICENSE_${PN}-rtl-license = "Firmware-rtlwifi_firmware" 550LICENSE:${PN}-rtl-license = "Firmware-rtlwifi_firmware"
551LICENSE_${PN}-rtl8168 = "WHENCE" 551LICENSE:${PN}-rtl8168 = "WHENCE"
552 552
553FILES_${PN}-rtl-license = " \ 553FILES:${PN}-rtl-license = " \
554 ${nonarch_base_libdir}/firmware/LICENCE.rtlwifi_firmware.txt \ 554 ${nonarch_base_libdir}/firmware/LICENCE.rtlwifi_firmware.txt \
555" 555"
556FILES_${PN}-rtl8188 = " \ 556FILES:${PN}-rtl8188 = " \
557 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8188*.bin \ 557 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8188*.bin \
558" 558"
559FILES_${PN}-rtl8192cu = " \ 559FILES:${PN}-rtl8192cu = " \
560 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cufw*.bin \ 560 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cufw*.bin \
561" 561"
562FILES_${PN}-rtl8192ce = " \ 562FILES:${PN}-rtl8192ce = " \
563 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cfw*.bin \ 563 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8192cfw*.bin \
564" 564"
565FILES_${PN}-rtl8192su = " \ 565FILES:${PN}-rtl8192su = " \
566 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8712u.bin \ 566 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8712u.bin \
567" 567"
568FILES_${PN}-rtl8723 = " \ 568FILES:${PN}-rtl8723 = " \
569 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8723*.bin \ 569 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8723*.bin \
570" 570"
571FILES_${PN}-rtl8821 = " \ 571FILES:${PN}-rtl8821 = " \
572 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin \ 572 ${nonarch_base_libdir}/firmware/rtlwifi/rtl8821*.bin \
573" 573"
574FILES_${PN}-rtl8168 = " \ 574FILES:${PN}-rtl8168 = " \
575 ${nonarch_base_libdir}/firmware/rtl_nic/rtl8168*.fw \ 575 ${nonarch_base_libdir}/firmware/rtl_nic/rtl8168*.fw \
576" 576"
577 577
578RDEPENDS_${PN}-rtl8188 += "${PN}-rtl-license" 578RDEPENDS:${PN}-rtl8188 += "${PN}-rtl-license"
579RDEPENDS_${PN}-rtl8192ce += "${PN}-rtl-license" 579RDEPENDS:${PN}-rtl8192ce += "${PN}-rtl-license"
580RDEPENDS_${PN}-rtl8192cu += "${PN}-rtl-license" 580RDEPENDS:${PN}-rtl8192cu += "${PN}-rtl-license"
581RDEPENDS_${PN}-rtl8192su = "${PN}-rtl-license" 581RDEPENDS:${PN}-rtl8192su = "${PN}-rtl-license"
582RDEPENDS_${PN}-rtl8723 += "${PN}-rtl-license" 582RDEPENDS:${PN}-rtl8723 += "${PN}-rtl-license"
583RDEPENDS_${PN}-rtl8821 += "${PN}-rtl-license" 583RDEPENDS:${PN}-rtl8821 += "${PN}-rtl-license"
584RDEPENDS_${PN}-rtl8168 += "${PN}-whence-license" 584RDEPENDS:${PN}-rtl8168 += "${PN}-whence-license"
585 585
586# For ti-connectivity 586# For ti-connectivity
587LICENSE_${PN}-wlcommon = "Firmware-ti-connectivity" 587LICENSE:${PN}-wlcommon = "Firmware-ti-connectivity"
588LICENSE_${PN}-wl12xx = "Firmware-ti-connectivity" 588LICENSE:${PN}-wl12xx = "Firmware-ti-connectivity"
589LICENSE_${PN}-wl18xx = "Firmware-ti-connectivity" 589LICENSE:${PN}-wl18xx = "Firmware-ti-connectivity"
590LICENSE_${PN}-ti-connectivity-license = "Firmware-ti-connectivity" 590LICENSE:${PN}-ti-connectivity-license = "Firmware-ti-connectivity"
591 591
592FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity" 592FILES:${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.ti-connectivity"
593# wl18xx optionally needs wl1271-nvs.bin (which itself is a symlink to 593# wl18xx optionally needs wl1271-nvs.bin (which itself is a symlink to
594# wl127x-nvs.bin) - see linux/drivers/net/wireless/ti/wlcore/sdio.c 594# wl127x-nvs.bin) - see linux/drivers/net/wireless/ti/wlcore/sdio.c
595# and drivers/net/wireless/ti/wlcore/spi.c. 595# and drivers/net/wireless/ti/wlcore/spi.c.
@@ -597,389 +597,389 @@ FILES_${PN}-ti-connectivity-license = "${nonarch_base_libdir}/firmware/LICENCE.t
597# address on wl18xx, driver loading will delay (by udev timout - 60s) 597# address on wl18xx, driver loading will delay (by udev timout - 60s)
598# if not there. So let's make it available always. Because it's a 598# if not there. So let's make it available always. Because it's a
599# symlink, both need to go to wlcommon. 599# symlink, both need to go to wlcommon.
600FILES_${PN}-wlcommon = " \ 600FILES:${PN}-wlcommon = " \
601 ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \ 601 ${nonarch_base_libdir}/firmware/ti-connectivity/TI* \
602 ${nonarch_base_libdir}/firmware/ti-connectivity/wl127x-nvs.bin \ 602 ${nonarch_base_libdir}/firmware/ti-connectivity/wl127x-nvs.bin \
603 ${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin \ 603 ${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin \
604" 604"
605FILES_${PN}-wl12xx = " \ 605FILES:${PN}-wl12xx = " \
606 ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \ 606 ${nonarch_base_libdir}/firmware/ti-connectivity/wl12* \
607" 607"
608FILES_${PN}-wl18xx = " \ 608FILES:${PN}-wl18xx = " \
609 ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \ 609 ${nonarch_base_libdir}/firmware/ti-connectivity/wl18* \
610" 610"
611 611
612RDEPENDS_${PN}-wl12xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" 612RDEPENDS:${PN}-wl12xx = "${PN}-ti-connectivity-license ${PN}-wlcommon"
613RDEPENDS_${PN}-wl18xx = "${PN}-ti-connectivity-license ${PN}-wlcommon" 613RDEPENDS:${PN}-wl18xx = "${PN}-ti-connectivity-license ${PN}-wlcommon"
614 614
615# For vt6656 615# For vt6656
616LICENSE_${PN}-vt6656 = "Firmware-via_vt6656" 616LICENSE:${PN}-vt6656 = "Firmware-via_vt6656"
617LICENSE_${PN}-vt6656-license = "Firmware-via_vt6656" 617LICENSE:${PN}-vt6656-license = "Firmware-via_vt6656"
618 618
619FILES_${PN}-vt6656-license = "${nonarch_base_libdir}/firmware/LICENCE.via_vt6656" 619FILES:${PN}-vt6656-license = "${nonarch_base_libdir}/firmware/LICENCE.via_vt6656"
620FILES_${PN}-vt6656 = " \ 620FILES:${PN}-vt6656 = " \
621 ${nonarch_base_libdir}/firmware/vntwusb.fw \ 621 ${nonarch_base_libdir}/firmware/vntwusb.fw \
622" 622"
623 623
624RDEPENDS_${PN}-vt6656 = "${PN}-vt6656-license" 624RDEPENDS:${PN}-vt6656 = "${PN}-vt6656-license"
625 625
626# For broadcom 626# For broadcom
627 627
628# for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e " \${PN}-$pkg \\"; done | sort -u 628# for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e " \${PN}-$pkg \\"; done | sort -u
629 629
630LICENSE_${PN}-broadcom-license = "Firmware-broadcom_bcm43xx" 630LICENSE:${PN}-broadcom-license = "Firmware-broadcom_bcm43xx"
631FILES_${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx" 631FILES:${PN}-broadcom-license = "${nonarch_base_libdir}/firmware/LICENCE.broadcom_bcm43xx"
632 632
633# for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo "$i - $pkg"; echo -e "FILES_\${PN}-$pkg = \"\${nonarch_base_libdir}/firmware/brcm/$i\""; done | grep ^FILES 633# for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo "$i - $pkg"; echo -e "FILES:\${PN}-$pkg = \"\${nonarch_base_libdir}/firmware/brcm/$i\""; done | grep ^FILES
634 634
635FILES_${PN}-bcm43xx = "${nonarch_base_libdir}/firmware/brcm/bcm43xx-0.fw" 635FILES:${PN}-bcm43xx = "${nonarch_base_libdir}/firmware/brcm/bcm43xx-0.fw"
636FILES_${PN}-bcm43xx-hdr = "${nonarch_base_libdir}/firmware/brcm/bcm43xx_hdr-0.fw" 636FILES:${PN}-bcm43xx-hdr = "${nonarch_base_libdir}/firmware/brcm/bcm43xx_hdr-0.fw"
637FILES_${PN}-bcm4329-fullmac = "${nonarch_base_libdir}/firmware/brcm/bcm4329-fullmac-4.bin" 637FILES:${PN}-bcm4329-fullmac = "${nonarch_base_libdir}/firmware/brcm/bcm4329-fullmac-4.bin"
638FILES_${PN}-bcm43236b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43236b.bin" 638FILES:${PN}-bcm43236b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43236b.bin"
639FILES_${PN}-bcm4329 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4329-sdio.bin" 639FILES:${PN}-bcm4329 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4329-sdio.bin"
640FILES_${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.*" 640FILES:${PN}-bcm4330 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4330-sdio.*"
641FILES_${PN}-bcm4334 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin" 641FILES:${PN}-bcm4334 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4334-sdio.bin"
642FILES_${PN}-bcm4335 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4335-sdio.bin" 642FILES:${PN}-bcm4335 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4335-sdio.bin"
643FILES_${PN}-bcm4339 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin \ 643FILES:${PN}-bcm4339 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4339-sdio.bin \
644 ${nonarch_base_libdir}/firmware/cypress/cyfmac4339-sdio.bin \ 644 ${nonarch_base_libdir}/firmware/cypress/cyfmac4339-sdio.bin \
645" 645"
646FILES_${PN}-bcm43241b0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b0-sdio.bin" 646FILES:${PN}-bcm43241b0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b0-sdio.bin"
647FILES_${PN}-bcm43241b4 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b4-sdio.bin" 647FILES:${PN}-bcm43241b4 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b4-sdio.bin"
648FILES_${PN}-bcm43241b5 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b5-sdio.bin" 648FILES:${PN}-bcm43241b5 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43241b5-sdio.bin"
649FILES_${PN}-bcm43242a = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43242a.bin" 649FILES:${PN}-bcm43242a = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43242a.bin"
650FILES_${PN}-bcm43143 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43143.bin \ 650FILES:${PN}-bcm43143 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43143.bin \
651 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43143-sdio.bin \ 651 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43143-sdio.bin \
652" 652"
653FILES_${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.*" 653FILES:${PN}-bcm43430a0 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430a0-sdio.*"
654FILES_${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.* \ 654FILES:${PN}-bcm43455 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43455-sdio.* \
655 ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio.* \ 655 ${nonarch_base_libdir}/firmware/cypress/cyfmac43455-sdio.* \
656" 656"
657FILES_${PN}-bcm4350c2 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350c2-pcie.bin" 657FILES:${PN}-bcm4350c2 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350c2-pcie.bin"
658FILES_${PN}-bcm4350 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350-pcie.bin" 658FILES:${PN}-bcm4350 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4350-pcie.bin"
659FILES_${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.* \ 659FILES:${PN}-bcm4356 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-sdio.* \
660 ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-sdio.* \ 660 ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-sdio.* \
661" 661"
662FILES_${PN}-bcm43569 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43569.bin" 662FILES:${PN}-bcm43569 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43569.bin"
663FILES_${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.bin \ 663FILES:${PN}-bcm43570 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43570-pcie.bin \
664 ${nonarch_base_libdir}/firmware/cypress/cyfmac43570-pcie.bin \ 664 ${nonarch_base_libdir}/firmware/cypress/cyfmac43570-pcie.bin \
665" 665"
666FILES_${PN}-bcm4358 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4358-pcie.bin" 666FILES:${PN}-bcm4358 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4358-pcie.bin"
667FILES_${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.bin \ 667FILES:${PN}-bcm43602 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.bin \
668 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.ap.bin \ 668 ${nonarch_base_libdir}/firmware/brcm/brcmfmac43602-pcie.ap.bin \
669" 669"
670FILES_${PN}-bcm4366b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366b-pcie.bin" 670FILES:${PN}-bcm4366b = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366b-pcie.bin"
671FILES_${PN}-bcm4366c = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366c-pcie.bin" 671FILES:${PN}-bcm4366c = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4366c-pcie.bin"
672FILES_${PN}-bcm4371 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4371-pcie.bin" 672FILES:${PN}-bcm4371 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4371-pcie.bin"
673 673
674# for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e "LICENSE_\${PN}-$pkg = \"Firmware-broadcom_bcm43xx\"\nRDEPENDS_\${PN}-$pkg += \"\${PN}-broadcom-license\""; done 674# for i in `grep brcm WHENCE | grep ^File | sed 's/File: brcm.//g'`; do pkg=`echo $i | sed 's/-[sp40].*//g; s/\.bin//g; s/brcmfmac/bcm/g; s/_hdr/-hdr/g; s/BCM/bcm-0bb4-0306/g'`; echo -e "LICENSE:\${PN}-$pkg = \"Firmware-broadcom_bcm43xx\"\nRDEPENDS_\${PN}-$pkg += \"\${PN}-broadcom-license\""; done
675# Currently 1st one and last 6 have cypress LICENSE 675# Currently 1st one and last 6 have cypress LICENSE
676 676
677LICENSE_${PN}-bcm43xx = "Firmware-broadcom_bcm43xx" 677LICENSE:${PN}-bcm43xx = "Firmware-broadcom_bcm43xx"
678RDEPENDS_${PN}-bcm43xx += "${PN}-broadcom-license" 678RDEPENDS:${PN}-bcm43xx += "${PN}-broadcom-license"
679LICENSE_${PN}-bcm43xx-hdr = "Firmware-broadcom_bcm43xx" 679LICENSE:${PN}-bcm43xx-hdr = "Firmware-broadcom_bcm43xx"
680RDEPENDS_${PN}-bcm43xx-hdr += "${PN}-broadcom-license" 680RDEPENDS:${PN}-bcm43xx-hdr += "${PN}-broadcom-license"
681LICENSE_${PN}-bcm4329-fullmac = "Firmware-broadcom_bcm43xx" 681LICENSE:${PN}-bcm4329-fullmac = "Firmware-broadcom_bcm43xx"
682RDEPENDS_${PN}-bcm4329-fullmac += "${PN}-broadcom-license" 682RDEPENDS:${PN}-bcm4329-fullmac += "${PN}-broadcom-license"
683LICENSE_${PN}-bcm43236b = "Firmware-broadcom_bcm43xx" 683LICENSE:${PN}-bcm43236b = "Firmware-broadcom_bcm43xx"
684RDEPENDS_${PN}-bcm43236b += "${PN}-broadcom-license" 684RDEPENDS:${PN}-bcm43236b += "${PN}-broadcom-license"
685LICENSE_${PN}-bcm4329 = "Firmware-broadcom_bcm43xx" 685LICENSE:${PN}-bcm4329 = "Firmware-broadcom_bcm43xx"
686RDEPENDS_${PN}-bcm4329 += "${PN}-broadcom-license" 686RDEPENDS:${PN}-bcm4329 += "${PN}-broadcom-license"
687LICENSE_${PN}-bcm4330 = "Firmware-broadcom_bcm43xx" 687LICENSE:${PN}-bcm4330 = "Firmware-broadcom_bcm43xx"
688RDEPENDS_${PN}-bcm4330 += "${PN}-broadcom-license" 688RDEPENDS:${PN}-bcm4330 += "${PN}-broadcom-license"
689LICENSE_${PN}-bcm4334 = "Firmware-broadcom_bcm43xx" 689LICENSE:${PN}-bcm4334 = "Firmware-broadcom_bcm43xx"
690RDEPENDS_${PN}-bcm4334 += "${PN}-broadcom-license" 690RDEPENDS:${PN}-bcm4334 += "${PN}-broadcom-license"
691LICENSE_${PN}-bcm4335 = "Firmware-broadcom_bcm43xx" 691LICENSE:${PN}-bcm4335 = "Firmware-broadcom_bcm43xx"
692RDEPENDS_${PN}-bcm4335 += "${PN}-broadcom-license" 692RDEPENDS:${PN}-bcm4335 += "${PN}-broadcom-license"
693LICENSE_${PN}-bcm4339 = "Firmware-broadcom_bcm43xx" 693LICENSE:${PN}-bcm4339 = "Firmware-broadcom_bcm43xx"
694RDEPENDS_${PN}-bcm4339 += "${PN}-broadcom-license" 694RDEPENDS:${PN}-bcm4339 += "${PN}-broadcom-license"
695LICENSE_${PN}-bcm43241b0 = "Firmware-broadcom_bcm43xx" 695LICENSE:${PN}-bcm43241b0 = "Firmware-broadcom_bcm43xx"
696RDEPENDS_${PN}-bcm43241b0 += "${PN}-broadcom-license" 696RDEPENDS:${PN}-bcm43241b0 += "${PN}-broadcom-license"
697LICENSE_${PN}-bcm43241b4 = "Firmware-broadcom_bcm43xx" 697LICENSE:${PN}-bcm43241b4 = "Firmware-broadcom_bcm43xx"
698RDEPENDS_${PN}-bcm43241b4 += "${PN}-broadcom-license" 698RDEPENDS:${PN}-bcm43241b4 += "${PN}-broadcom-license"
699LICENSE_${PN}-bcm43241b5 = "Firmware-broadcom_bcm43xx" 699LICENSE:${PN}-bcm43241b5 = "Firmware-broadcom_bcm43xx"
700RDEPENDS_${PN}-bcm43241b5 += "${PN}-broadcom-license" 700RDEPENDS:${PN}-bcm43241b5 += "${PN}-broadcom-license"
701LICENSE_${PN}-bcm43242a = "Firmware-broadcom_bcm43xx" 701LICENSE:${PN}-bcm43242a = "Firmware-broadcom_bcm43xx"
702RDEPENDS_${PN}-bcm43242a += "${PN}-broadcom-license" 702RDEPENDS:${PN}-bcm43242a += "${PN}-broadcom-license"
703LICENSE_${PN}-bcm43143 = "Firmware-broadcom_bcm43xx" 703LICENSE:${PN}-bcm43143 = "Firmware-broadcom_bcm43xx"
704RDEPENDS_${PN}-bcm43143 += "${PN}-broadcom-license" 704RDEPENDS:${PN}-bcm43143 += "${PN}-broadcom-license"
705LICENSE_${PN}-bcm43430a0 = "Firmware-broadcom_bcm43xx" 705LICENSE:${PN}-bcm43430a0 = "Firmware-broadcom_bcm43xx"
706RDEPENDS_${PN}-bcm43430a0 += "${PN}-broadcom-license" 706RDEPENDS:${PN}-bcm43430a0 += "${PN}-broadcom-license"
707LICENSE_${PN}-bcm43455 = "Firmware-broadcom_bcm43xx" 707LICENSE:${PN}-bcm43455 = "Firmware-broadcom_bcm43xx"
708RDEPENDS_${PN}-bcm43455 += "${PN}-broadcom-license" 708RDEPENDS:${PN}-bcm43455 += "${PN}-broadcom-license"
709LICENSE_${PN}-bcm4350c2 = "Firmware-broadcom_bcm43xx" 709LICENSE:${PN}-bcm4350c2 = "Firmware-broadcom_bcm43xx"
710RDEPENDS_${PN}-bcm4350c2 += "${PN}-broadcom-license" 710RDEPENDS:${PN}-bcm4350c2 += "${PN}-broadcom-license"
711LICENSE_${PN}-bcm4350 = "Firmware-broadcom_bcm43xx" 711LICENSE:${PN}-bcm4350 = "Firmware-broadcom_bcm43xx"
712RDEPENDS_${PN}-bcm4350 += "${PN}-broadcom-license" 712RDEPENDS:${PN}-bcm4350 += "${PN}-broadcom-license"
713LICENSE_${PN}-bcm4356 = "Firmware-broadcom_bcm43xx" 713LICENSE:${PN}-bcm4356 = "Firmware-broadcom_bcm43xx"
714RDEPENDS_${PN}-bcm4356 += "${PN}-broadcom-license" 714RDEPENDS:${PN}-bcm4356 += "${PN}-broadcom-license"
715LICENSE_${PN}-bcm43569 = "Firmware-broadcom_bcm43xx" 715LICENSE:${PN}-bcm43569 = "Firmware-broadcom_bcm43xx"
716RDEPENDS_${PN}-bcm43569 += "${PN}-broadcom-license" 716RDEPENDS:${PN}-bcm43569 += "${PN}-broadcom-license"
717LICENSE_${PN}-bcm43570 = "Firmware-broadcom_bcm43xx" 717LICENSE:${PN}-bcm43570 = "Firmware-broadcom_bcm43xx"
718RDEPENDS_${PN}-bcm43570 += "${PN}-broadcom-license" 718RDEPENDS:${PN}-bcm43570 += "${PN}-broadcom-license"
719LICENSE_${PN}-bcm4358 = "Firmware-broadcom_bcm43xx" 719LICENSE:${PN}-bcm4358 = "Firmware-broadcom_bcm43xx"
720RDEPENDS_${PN}-bcm4358 += "${PN}-broadcom-license" 720RDEPENDS:${PN}-bcm4358 += "${PN}-broadcom-license"
721LICENSE_${PN}-bcm43602 = "Firmware-broadcom_bcm43xx" 721LICENSE:${PN}-bcm43602 = "Firmware-broadcom_bcm43xx"
722RDEPENDS_${PN}-bcm43602 += "${PN}-broadcom-license" 722RDEPENDS:${PN}-bcm43602 += "${PN}-broadcom-license"
723LICENSE_${PN}-bcm4366b = "Firmware-broadcom_bcm43xx" 723LICENSE:${PN}-bcm4366b = "Firmware-broadcom_bcm43xx"
724RDEPENDS_${PN}-bcm4366b += "${PN}-broadcom-license" 724RDEPENDS:${PN}-bcm4366b += "${PN}-broadcom-license"
725LICENSE_${PN}-bcm4366c = "Firmware-broadcom_bcm43xx" 725LICENSE:${PN}-bcm4366c = "Firmware-broadcom_bcm43xx"
726RDEPENDS_${PN}-bcm4366c += "${PN}-broadcom-license" 726RDEPENDS:${PN}-bcm4366c += "${PN}-broadcom-license"
727LICENSE_${PN}-bcm4371 = "Firmware-broadcom_bcm43xx" 727LICENSE:${PN}-bcm4371 = "Firmware-broadcom_bcm43xx"
728RDEPENDS_${PN}-bcm4371 += "${PN}-broadcom-license" 728RDEPENDS:${PN}-bcm4371 += "${PN}-broadcom-license"
729 729
730# For broadcom cypress 730# For broadcom cypress
731 731
732LICENSE_${PN}-cypress-license = "Firmware-cypress" 732LICENSE:${PN}-cypress-license = "Firmware-cypress"
733FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress" 733FILES:${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress"
734 734
735FILES_${PN}-bcm-0bb4-0306 = "${nonarch_base_libdir}/firmware/brcm/BCM-0bb4-0306.hcd" 735FILES:${PN}-bcm-0bb4-0306 = "${nonarch_base_libdir}/firmware/brcm/BCM-0bb4-0306.hcd"
736FILES_${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.* \ 736FILES:${PN}-bcm43340 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43340-sdio.* \
737 ${nonarch_base_libdir}/firmware/cypress/cyfmac43340-sdio.*" 737 ${nonarch_base_libdir}/firmware/cypress/cyfmac43340-sdio.*"
738FILES_${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.* \ 738FILES:${PN}-bcm43362 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43362-sdio.* \
739 ${nonarch_base_libdir}/firmware/cypress/cyfmac43362-sdio.*" 739 ${nonarch_base_libdir}/firmware/cypress/cyfmac43362-sdio.*"
740FILES_${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.* \ 740FILES:${PN}-bcm43430 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.* \
741 ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.*" 741 ${nonarch_base_libdir}/firmware/cypress/cyfmac43430-sdio.*"
742FILES_${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin \ 742FILES:${PN}-bcm4354 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4354-sdio.bin \
743 ${nonarch_base_libdir}/firmware/cypress/cyfmac4354-sdio.bin \ 743 ${nonarch_base_libdir}/firmware/cypress/cyfmac4354-sdio.bin \
744" 744"
745FILES_${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.* \ 745FILES:${PN}-bcm4356-pcie = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4356-pcie.* \
746 ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-pcie.* \ 746 ${nonarch_base_libdir}/firmware/cypress/cyfmac4356-pcie.* \
747" 747"
748FILES_${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \ 748FILES:${PN}-bcm4373 = "${nonarch_base_libdir}/firmware/brcm/brcmfmac4373-sdio.bin \
749 ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \ 749 ${nonarch_base_libdir}/firmware/brcm/brcmfmac4373.bin \
750 ${nonarch_base_libdir}/firmware/cypress/cyfmac4373-sdio.bin \ 750 ${nonarch_base_libdir}/firmware/cypress/cyfmac4373-sdio.bin \
751" 751"
752 752
753LICENSE_${PN}-bcm-0bb4-0306 = "Firmware-cypress" 753LICENSE:${PN}-bcm-0bb4-0306 = "Firmware-cypress"
754RDEPENDS_${PN}-bcm-0bb4-0306 += "${PN}-cypress-license" 754RDEPENDS:${PN}-bcm-0bb4-0306 += "${PN}-cypress-license"
755LICENSE_${PN}-bcm43340 = "Firmware-cypress" 755LICENSE:${PN}-bcm43340 = "Firmware-cypress"
756RDEPENDS_${PN}-bcm43340 += "${PN}-cypress-license" 756RDEPENDS:${PN}-bcm43340 += "${PN}-cypress-license"
757LICENSE_${PN}-bcm43362 = "Firmware-cypress" 757LICENSE:${PN}-bcm43362 = "Firmware-cypress"
758RDEPENDS_${PN}-bcm43362 += "${PN}-cypress-license" 758RDEPENDS:${PN}-bcm43362 += "${PN}-cypress-license"
759LICENSE_${PN}-bcm43430 = "Firmware-cypress" 759LICENSE:${PN}-bcm43430 = "Firmware-cypress"
760RDEPENDS_${PN}-bcm43430 += "${PN}-cypress-license" 760RDEPENDS:${PN}-bcm43430 += "${PN}-cypress-license"
761LICENSE_${PN}-bcm4354 = "Firmware-cypress" 761LICENSE:${PN}-bcm4354 = "Firmware-cypress"
762RDEPENDS_${PN}-bcm4354 += "${PN}-cypress-license" 762RDEPENDS:${PN}-bcm4354 += "${PN}-cypress-license"
763LICENSE_${PN}-bcm4356-pcie = "Firmware-cypress" 763LICENSE:${PN}-bcm4356-pcie = "Firmware-cypress"
764RDEPENDS_${PN}-bcm4356-pcie += "${PN}-cypress-license" 764RDEPENDS:${PN}-bcm4356-pcie += "${PN}-cypress-license"
765LICENSE_${PN}-bcm4373 = "Firmware-cypress" 765LICENSE:${PN}-bcm4373 = "Firmware-cypress"
766RDEPENDS_${PN}-bcm4373 += "${PN}-cypress-license" 766RDEPENDS:${PN}-bcm4373 += "${PN}-cypress-license"
767 767
768# For Broadcom bnx2-mips 768# For Broadcom bnx2-mips
769# 769#
770# which is a separate case to the other Broadcom firmwares since its 770# which is a separate case to the other Broadcom firmwares since its
771# license is contained in the shared WHENCE file. 771# license is contained in the shared WHENCE file.
772 772
773LICENSE_${PN}-bnx2-mips = "WHENCE" 773LICENSE:${PN}-bnx2-mips = "WHENCE"
774LICENSE_${PN}-whence-license = "WHENCE" 774LICENSE:${PN}-whence-license = "WHENCE"
775 775
776FILES_${PN}-bnx2-mips = "${nonarch_base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw" 776FILES:${PN}-bnx2-mips = "${nonarch_base_libdir}/firmware/bnx2/bnx2-mips-09-6.2.1b.fw"
777FILES_${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE" 777FILES:${PN}-whence-license = "${nonarch_base_libdir}/firmware/WHENCE"
778 778
779RDEPENDS_${PN}-bnx2-mips += "${PN}-whence-license" 779RDEPENDS:${PN}-bnx2-mips += "${PN}-whence-license"
780 780
781# For imx-sdma 781# For imx-sdma
782LICENSE_${PN}-imx-sdma-imx6q = "Firmware-imx-sdma_firmware" 782LICENSE:${PN}-imx-sdma-imx6q = "Firmware-imx-sdma_firmware"
783LICENSE_${PN}-imx-sdma-imx7d = "Firmware-imx-sdma_firmware" 783LICENSE:${PN}-imx-sdma-imx7d = "Firmware-imx-sdma_firmware"
784LICENSE_${PN}-imx-sdma-license = "Firmware-imx-sdma_firmware" 784LICENSE:${PN}-imx-sdma-license = "Firmware-imx-sdma_firmware"
785 785
786FILES_${PN}-imx-sdma-imx6q = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin" 786FILES:${PN}-imx-sdma-imx6q = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin"
787 787
788RPROVIDES_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" 788RPROVIDES:${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q"
789RREPLACES_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" 789RREPLACES:${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q"
790RCONFLICTS_${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q" 790RCONFLICTS:${PN}-imx-sdma-imx6q = "firmware-imx-sdma-imx6q"
791 791
792FILES_${PN}-imx-sdma-imx7d = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin" 792FILES:${PN}-imx-sdma-imx7d = "${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin"
793 793
794FILES_${PN}-imx-sdma-license = "${nonarch_base_libdir}/firmware/LICENSE.sdma_firmware" 794FILES:${PN}-imx-sdma-license = "${nonarch_base_libdir}/firmware/LICENSE.sdma_firmware"
795 795
796RDEPENDS_${PN}-imx-sdma-imx6q += "${PN}-imx-sdma-license" 796RDEPENDS:${PN}-imx-sdma-imx6q += "${PN}-imx-sdma-license"
797RDEPENDS_${PN}-imx-sdma-imx7d += "${PN}-imx-sdma-license" 797RDEPENDS:${PN}-imx-sdma-imx7d += "${PN}-imx-sdma-license"
798 798
799# For iwlwifi 799# For iwlwifi
800LICENSE_${PN}-iwlwifi = "Firmware-iwlwifi_firmware" 800LICENSE:${PN}-iwlwifi = "Firmware-iwlwifi_firmware"
801LICENSE_${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware" 801LICENSE:${PN}-iwlwifi-135-6 = "Firmware-iwlwifi_firmware"
802LICENSE_${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware" 802LICENSE:${PN}-iwlwifi-3160-7 = "Firmware-iwlwifi_firmware"
803LICENSE_${PN}-iwlwifi-3160-8 = "Firmware-iwlwifi_firmware" 803LICENSE:${PN}-iwlwifi-3160-8 = "Firmware-iwlwifi_firmware"
804LICENSE_${PN}-iwlwifi-3160-9 = "Firmware-iwlwifi_firmware" 804LICENSE:${PN}-iwlwifi-3160-9 = "Firmware-iwlwifi_firmware"
805LICENSE_${PN}-iwlwifi-3160-10 = "Firmware-iwlwifi_firmware" 805LICENSE:${PN}-iwlwifi-3160-10 = "Firmware-iwlwifi_firmware"
806LICENSE_${PN}-iwlwifi-3160-12 = "Firmware-iwlwifi_firmware" 806LICENSE:${PN}-iwlwifi-3160-12 = "Firmware-iwlwifi_firmware"
807LICENSE_${PN}-iwlwifi-3160-13 = "Firmware-iwlwifi_firmware" 807LICENSE:${PN}-iwlwifi-3160-13 = "Firmware-iwlwifi_firmware"
808LICENSE_${PN}-iwlwifi-3160-16 = "Firmware-iwlwifi_firmware" 808LICENSE:${PN}-iwlwifi-3160-16 = "Firmware-iwlwifi_firmware"
809LICENSE_${PN}-iwlwifi-3160-17 = "Firmware-iwlwifi_firmware" 809LICENSE:${PN}-iwlwifi-3160-17 = "Firmware-iwlwifi_firmware"
810LICENSE_${PN}-iwlwifi-6000-4 = "Firmware-iwlwifi_firmware" 810LICENSE:${PN}-iwlwifi-6000-4 = "Firmware-iwlwifi_firmware"
811LICENSE_${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware" 811LICENSE:${PN}-iwlwifi-6000g2a-5 = "Firmware-iwlwifi_firmware"
812LICENSE_${PN}-iwlwifi-6000g2a-6 = "Firmware-iwlwifi_firmware" 812LICENSE:${PN}-iwlwifi-6000g2a-6 = "Firmware-iwlwifi_firmware"
813LICENSE_${PN}-iwlwifi-6000g2b-5 = "Firmware-iwlwifi_firmware" 813LICENSE:${PN}-iwlwifi-6000g2b-5 = "Firmware-iwlwifi_firmware"
814LICENSE_${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware" 814LICENSE:${PN}-iwlwifi-6000g2b-6 = "Firmware-iwlwifi_firmware"
815LICENSE_${PN}-iwlwifi-6050-4 = "Firmware-iwlwifi_firmware" 815LICENSE:${PN}-iwlwifi-6050-4 = "Firmware-iwlwifi_firmware"
816LICENSE_${PN}-iwlwifi-6050-5 = "Firmware-iwlwifi_firmware" 816LICENSE:${PN}-iwlwifi-6050-5 = "Firmware-iwlwifi_firmware"
817LICENSE_${PN}-iwlwifi-7260 = "Firmware-iwlwifi_firmware" 817LICENSE:${PN}-iwlwifi-7260 = "Firmware-iwlwifi_firmware"
818LICENSE_${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware" 818LICENSE:${PN}-iwlwifi-7265 = "Firmware-iwlwifi_firmware"
819LICENSE_${PN}-iwlwifi-7265d = "Firmware-iwlwifi_firmware" 819LICENSE:${PN}-iwlwifi-7265d = "Firmware-iwlwifi_firmware"
820LICENSE_${PN}-iwlwifi-8000c = "Firmware-iwlwifi_firmware" 820LICENSE:${PN}-iwlwifi-8000c = "Firmware-iwlwifi_firmware"
821LICENSE_${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware" 821LICENSE:${PN}-iwlwifi-8265 = "Firmware-iwlwifi_firmware"
822LICENSE_${PN}-iwlwifi-9000 = "Firmware-iwlwifi_firmware" 822LICENSE:${PN}-iwlwifi-9000 = "Firmware-iwlwifi_firmware"
823LICENSE_${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware" 823LICENSE:${PN}-iwlwifi-misc = "Firmware-iwlwifi_firmware"
824LICENSE_${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware" 824LICENSE:${PN}-iwlwifi-license = "Firmware-iwlwifi_firmware"
825 825
826 826
827FILES_${PN}-iwlwifi-license = "${nonarch_base_libdir}/firmware/LICENCE.iwlwifi_firmware" 827FILES:${PN}-iwlwifi-license = "${nonarch_base_libdir}/firmware/LICENCE.iwlwifi_firmware"
828FILES_${PN}-iwlwifi-135-6 = "${nonarch_base_libdir}/firmware/iwlwifi-135-6.ucode" 828FILES:${PN}-iwlwifi-135-6 = "${nonarch_base_libdir}/firmware/iwlwifi-135-6.ucode"
829FILES_${PN}-iwlwifi-3160-7 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-7.ucode" 829FILES:${PN}-iwlwifi-3160-7 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-7.ucode"
830FILES_${PN}-iwlwifi-3160-8 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-8.ucode" 830FILES:${PN}-iwlwifi-3160-8 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-8.ucode"
831FILES_${PN}-iwlwifi-3160-9 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-9.ucode" 831FILES:${PN}-iwlwifi-3160-9 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-9.ucode"
832FILES_${PN}-iwlwifi-3160-10 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-10.ucode" 832FILES:${PN}-iwlwifi-3160-10 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-10.ucode"
833FILES_${PN}-iwlwifi-3160-12 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-12.ucode" 833FILES:${PN}-iwlwifi-3160-12 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-12.ucode"
834FILES_${PN}-iwlwifi-3160-13 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-13.ucode" 834FILES:${PN}-iwlwifi-3160-13 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-13.ucode"
835FILES_${PN}-iwlwifi-3160-16 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-16.ucode" 835FILES:${PN}-iwlwifi-3160-16 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-16.ucode"
836FILES_${PN}-iwlwifi-3160-17 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-17.ucode" 836FILES:${PN}-iwlwifi-3160-17 = "${nonarch_base_libdir}/firmware/iwlwifi-3160-17.ucode"
837FILES_${PN}-iwlwifi-6000-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6000-4.ucode" 837FILES:${PN}-iwlwifi-6000-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6000-4.ucode"
838FILES_${PN}-iwlwifi-6000g2a-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-5.ucode" 838FILES:${PN}-iwlwifi-6000g2a-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-5.ucode"
839FILES_${PN}-iwlwifi-6000g2a-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-6.ucode" 839FILES:${PN}-iwlwifi-6000g2a-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2a-6.ucode"
840FILES_${PN}-iwlwifi-6000g2b-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-5.ucode" 840FILES:${PN}-iwlwifi-6000g2b-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-5.ucode"
841FILES_${PN}-iwlwifi-6000g2b-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-6.ucode" 841FILES:${PN}-iwlwifi-6000g2b-6 = "${nonarch_base_libdir}/firmware/iwlwifi-6000g2b-6.ucode"
842FILES_${PN}-iwlwifi-6050-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-4.ucode" 842FILES:${PN}-iwlwifi-6050-4 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-4.ucode"
843FILES_${PN}-iwlwifi-6050-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.ucode" 843FILES:${PN}-iwlwifi-6050-5 = "${nonarch_base_libdir}/firmware/iwlwifi-6050-5.ucode"
844FILES_${PN}-iwlwifi-7260 = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode" 844FILES:${PN}-iwlwifi-7260 = "${nonarch_base_libdir}/firmware/iwlwifi-7260-*.ucode"
845FILES_${PN}-iwlwifi-7265 = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode" 845FILES:${PN}-iwlwifi-7265 = "${nonarch_base_libdir}/firmware/iwlwifi-7265-*.ucode"
846FILES_${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode" 846FILES:${PN}-iwlwifi-7265d = "${nonarch_base_libdir}/firmware/iwlwifi-7265D-*.ucode"
847FILES_${PN}-iwlwifi-8000c = "${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode" 847FILES:${PN}-iwlwifi-8000c = "${nonarch_base_libdir}/firmware/iwlwifi-8000C-*.ucode"
848FILES_${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode" 848FILES:${PN}-iwlwifi-8265 = "${nonarch_base_libdir}/firmware/iwlwifi-8265-*.ucode"
849FILES_${PN}-iwlwifi-9000 = "${nonarch_base_libdir}/firmware/iwlwifi-9000-*.ucode" 849FILES:${PN}-iwlwifi-9000 = "${nonarch_base_libdir}/firmware/iwlwifi-9000-*.ucode"
850FILES_${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode" 850FILES:${PN}-iwlwifi-misc = "${nonarch_base_libdir}/firmware/iwlwifi-*.ucode"
851 851
852RDEPENDS_${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license" 852RDEPENDS:${PN}-iwlwifi-135-6 = "${PN}-iwlwifi-license"
853RDEPENDS_${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license" 853RDEPENDS:${PN}-iwlwifi-3160-7 = "${PN}-iwlwifi-license"
854RDEPENDS_${PN}-iwlwifi-3160-8 = "${PN}-iwlwifi-license" 854RDEPENDS:${PN}-iwlwifi-3160-8 = "${PN}-iwlwifi-license"
855RDEPENDS_${PN}-iwlwifi-3160-9 = "${PN}-iwlwifi-license" 855RDEPENDS:${PN}-iwlwifi-3160-9 = "${PN}-iwlwifi-license"
856RDEPENDS_${PN}-iwlwifi-3160-10 = "${PN}-iwlwifi-license" 856RDEPENDS:${PN}-iwlwifi-3160-10 = "${PN}-iwlwifi-license"
857RDEPENDS_${PN}-iwlwifi-3160-12 = "${PN}-iwlwifi-license" 857RDEPENDS:${PN}-iwlwifi-3160-12 = "${PN}-iwlwifi-license"
858RDEPENDS_${PN}-iwlwifi-3160-13 = "${PN}-iwlwifi-license" 858RDEPENDS:${PN}-iwlwifi-3160-13 = "${PN}-iwlwifi-license"
859RDEPENDS_${PN}-iwlwifi-3160-16 = "${PN}-iwlwifi-license" 859RDEPENDS:${PN}-iwlwifi-3160-16 = "${PN}-iwlwifi-license"
860RDEPENDS_${PN}-iwlwifi-3160-17 = "${PN}-iwlwifi-license" 860RDEPENDS:${PN}-iwlwifi-3160-17 = "${PN}-iwlwifi-license"
861RDEPENDS_${PN}-iwlwifi-6000-4 = "${PN}-iwlwifi-license" 861RDEPENDS:${PN}-iwlwifi-6000-4 = "${PN}-iwlwifi-license"
862RDEPENDS_${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license" 862RDEPENDS:${PN}-iwlwifi-6000g2a-5 = "${PN}-iwlwifi-license"
863RDEPENDS_${PN}-iwlwifi-6000g2a-6 = "${PN}-iwlwifi-license" 863RDEPENDS:${PN}-iwlwifi-6000g2a-6 = "${PN}-iwlwifi-license"
864RDEPENDS_${PN}-iwlwifi-6000g2b-5 = "${PN}-iwlwifi-license" 864RDEPENDS:${PN}-iwlwifi-6000g2b-5 = "${PN}-iwlwifi-license"
865RDEPENDS_${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license" 865RDEPENDS:${PN}-iwlwifi-6000g2b-6 = "${PN}-iwlwifi-license"
866RDEPENDS_${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license" 866RDEPENDS:${PN}-iwlwifi-6050-4 = "${PN}-iwlwifi-license"
867RDEPENDS_${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license" 867RDEPENDS:${PN}-iwlwifi-6050-5 = "${PN}-iwlwifi-license"
868RDEPENDS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-license" 868RDEPENDS:${PN}-iwlwifi-7260 = "${PN}-iwlwifi-license"
869RDEPENDS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license" 869RDEPENDS:${PN}-iwlwifi-7265 = "${PN}-iwlwifi-license"
870RDEPENDS_${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license" 870RDEPENDS:${PN}-iwlwifi-7265d = "${PN}-iwlwifi-license"
871RDEPENDS_${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license" 871RDEPENDS:${PN}-iwlwifi-8000c = "${PN}-iwlwifi-license"
872RDEPENDS_${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license" 872RDEPENDS:${PN}-iwlwifi-8265 = "${PN}-iwlwifi-license"
873RDEPENDS_${PN}-iwlwifi-9000 = "${PN}-iwlwifi-license" 873RDEPENDS:${PN}-iwlwifi-9000 = "${PN}-iwlwifi-license"
874RDEPENDS_${PN}-iwlwifi-misc = "${PN}-iwlwifi-license" 874RDEPENDS:${PN}-iwlwifi-misc = "${PN}-iwlwifi-license"
875 875
876# -iwlwifi-misc is a "catch all" package that includes all the iwlwifi 876# -iwlwifi-misc is a "catch all" package that includes all the iwlwifi
877# firmwares that are not already included in other -iwlwifi- packages. 877# firmwares that are not already included in other -iwlwifi- packages.
878# -iwlwifi is a virtual package that depends upon all iwlwifi packages. 878# -iwlwifi is a virtual package that depends upon all iwlwifi packages.
879# These are distinct in order to allow the -misc firmwares to be installed 879# These are distinct in order to allow the -misc firmwares to be installed
880# without pulling in every other iwlwifi package. 880# without pulling in every other iwlwifi package.
881ALLOW_EMPTY_${PN}-iwlwifi = "1" 881ALLOW_EMPTY:${PN}-iwlwifi = "1"
882ALLOW_EMPTY_${PN}-iwlwifi-misc = "1" 882ALLOW_EMPTY:${PN}-iwlwifi-misc = "1"
883 883
884# Handle package updating for the newly merged iwlwifi groupings 884# Handle package updating for the newly merged iwlwifi groupings
885RPROVIDES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" 885RPROVIDES:${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9"
886RREPLACES_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" 886RREPLACES:${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9"
887RCONFLICTS_${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9" 887RCONFLICTS:${PN}-iwlwifi-7265 = "${PN}-iwlwifi-7265-8 ${PN}-iwlwifi-7265-9"
888 888
889RPROVIDES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" 889RPROVIDES:${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9"
890RREPLACES_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" 890RREPLACES:${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9"
891RCONFLICTS_${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9" 891RCONFLICTS:${PN}-iwlwifi-7260 = "${PN}-iwlwifi-7260-7 ${PN}-iwlwifi-7260-8 ${PN}-iwlwifi-7260-9"
892 892
893# For ibt 893# For ibt
894LICENSE_${PN}-ibt-license = "Firmware-ibt_firmware" 894LICENSE:${PN}-ibt-license = "Firmware-ibt_firmware"
895LICENSE_${PN}-ibt-hw-37-7 = "Firmware-ibt_firmware" 895LICENSE:${PN}-ibt-hw-37-7 = "Firmware-ibt_firmware"
896LICENSE_${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware" 896LICENSE:${PN}-ibt-hw-37-8 = "Firmware-ibt_firmware"
897LICENSE_${PN}-ibt-11-5 = "Firmware-ibt_firmware" 897LICENSE:${PN}-ibt-11-5 = "Firmware-ibt_firmware"
898LICENSE_${PN}-ibt-12-16 = "Firmware-ibt_firmware" 898LICENSE:${PN}-ibt-12-16 = "Firmware-ibt_firmware"
899LICENSE_${PN}-ibt-17 = "Firmware-ibt_firmware" 899LICENSE:${PN}-ibt-17 = "Firmware-ibt_firmware"
900LICENSE_${PN}-ibt-20 = "Firmware-ibt_firmware" 900LICENSE:${PN}-ibt-20 = "Firmware-ibt_firmware"
901LICENSE_${PN}-ibt-misc = "Firmware-ibt_firmware" 901LICENSE:${PN}-ibt-misc = "Firmware-ibt_firmware"
902 902
903FILES_${PN}-ibt-license = "${nonarch_base_libdir}/firmware/LICENCE.ibt_firmware" 903FILES:${PN}-ibt-license = "${nonarch_base_libdir}/firmware/LICENCE.ibt_firmware"
904FILES_${PN}-ibt-hw-37-7 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.7*.bseq" 904FILES:${PN}-ibt-hw-37-7 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.7*.bseq"
905FILES_${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bseq" 905FILES:${PN}-ibt-hw-37-8 = "${nonarch_base_libdir}/firmware/intel/ibt-hw-37.8*.bseq"
906FILES_${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc" 906FILES:${PN}-ibt-11-5 = "${nonarch_base_libdir}/firmware/intel/ibt-11-5.sfi ${nonarch_base_libdir}/firmware/intel/ibt-11-5.ddc"
907FILES_${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc" 907FILES:${PN}-ibt-12-16 = "${nonarch_base_libdir}/firmware/intel/ibt-12-16.sfi ${nonarch_base_libdir}/firmware/intel/ibt-12-16.ddc"
908FILES_${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc" 908FILES:${PN}-ibt-17 = "${nonarch_base_libdir}/firmware/intel/ibt-17-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-17-*.ddc"
909FILES_${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc" 909FILES:${PN}-ibt-20 = "${nonarch_base_libdir}/firmware/intel/ibt-20-*.sfi ${nonarch_base_libdir}/firmware/intel/ibt-20-*.ddc"
910FILES_${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*" 910FILES:${PN}-ibt-misc = "${nonarch_base_libdir}/firmware/intel/ibt-*"
911 911
912RDEPENDS_${PN}-ibt-hw-37-7 = "${PN}-ibt-license" 912RDEPENDS:${PN}-ibt-hw-37-7 = "${PN}-ibt-license"
913RDEPENDS_${PN}-ibt-hw-37.8 = "${PN}-ibt-license" 913RDEPENDS:${PN}-ibt-hw-37.8 = "${PN}-ibt-license"
914RDEPENDS_${PN}-ibt-11-5 = "${PN}-ibt-license" 914RDEPENDS:${PN}-ibt-11-5 = "${PN}-ibt-license"
915RDEPENDS_${PN}-ibt-12-16 = "${PN}-ibt-license" 915RDEPENDS:${PN}-ibt-12-16 = "${PN}-ibt-license"
916RDEPENDS_${PN}-ibt-17 = "${PN}-ibt-license" 916RDEPENDS:${PN}-ibt-17 = "${PN}-ibt-license"
917RDEPENDS_${PN}-ibt-20 = "${PN}-ibt-license" 917RDEPENDS:${PN}-ibt-20 = "${PN}-ibt-license"
918RDEPENDS_${PN}-ibt-misc = "${PN}-ibt-license" 918RDEPENDS:${PN}-ibt-misc = "${PN}-ibt-license"
919 919
920ALLOW_EMPTY_${PN}-ibt= "1" 920ALLOW_EMPTY:${PN}-ibt= "1"
921ALLOW_EMPTY_${PN}-ibt-misc = "1" 921ALLOW_EMPTY:${PN}-ibt-misc = "1"
922 922
923LICENSE_${PN}-i915 = "Firmware-i915" 923LICENSE:${PN}-i915 = "Firmware-i915"
924LICENSE_${PN}-i915-license = "Firmware-i915" 924LICENSE:${PN}-i915-license = "Firmware-i915"
925FILES_${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915" 925FILES:${PN}-i915-license = "${nonarch_base_libdir}/firmware/LICENSE.i915"
926FILES_${PN}-i915 = "${nonarch_base_libdir}/firmware/i915" 926FILES:${PN}-i915 = "${nonarch_base_libdir}/firmware/i915"
927RDEPENDS_${PN}-i915 = "${PN}-i915-license" 927RDEPENDS:${PN}-i915 = "${PN}-i915-license"
928 928
929LICENSE_${PN}-ice = "Firmware-ice" 929LICENSE:${PN}-ice = "Firmware-ice"
930LICENSE_${PN}-ice-license = "Firmware-ice" 930LICENSE:${PN}-ice-license = "Firmware-ice"
931FILES_${PN}-ice-license = "${nonarch_base_libdir}/firmware/LICENSE.ice" 931FILES:${PN}-ice-license = "${nonarch_base_libdir}/firmware/LICENSE.ice"
932FILES_${PN}-ice = "${nonarch_base_libdir}/firmware/intel/ice" 932FILES:${PN}-ice = "${nonarch_base_libdir}/firmware/intel/ice"
933RDEPENDS_${PN}-ice = "${PN}-ice-license" 933RDEPENDS:${PN}-ice = "${PN}-ice-license"
934 934
935FILES_${PN}-adsp-sst-license = "${nonarch_base_libdir}/firmware/LICENCE.adsp_sst" 935FILES:${PN}-adsp-sst-license = "${nonarch_base_libdir}/firmware/LICENCE.adsp_sst"
936LICENSE_${PN}-adsp-sst = "Firmware-adsp_sst" 936LICENSE:${PN}-adsp-sst = "Firmware-adsp_sst"
937LICENSE_${PN}-adsp-sst-license = "Firmware-adsp_sst" 937LICENSE:${PN}-adsp-sst-license = "Firmware-adsp_sst"
938FILES_${PN}-adsp-sst = "${nonarch_base_libdir}/firmware/intel/dsp_fw*" 938FILES:${PN}-adsp-sst = "${nonarch_base_libdir}/firmware/intel/dsp_fw*"
939RDEPENDS_${PN}-adsp-sst = "${PN}-adsp-sst-license" 939RDEPENDS:${PN}-adsp-sst = "${PN}-adsp-sst-license"
940 940
941# For QAT 941# For QAT
942LICENSE_${PN}-qat = "Firmware-qat" 942LICENSE:${PN}-qat = "Firmware-qat"
943LICENSE_${PN}-qat-license = "Firmware-qat" 943LICENSE:${PN}-qat-license = "Firmware-qat"
944FILES_${PN}-qat-license = "${nonarch_base_libdir}/firmware/LICENCE.qat_firmware" 944FILES:${PN}-qat-license = "${nonarch_base_libdir}/firmware/LICENCE.qat_firmware"
945FILES_${PN}-qat = "${nonarch_base_libdir}/firmware/qat*.bin" 945FILES:${PN}-qat = "${nonarch_base_libdir}/firmware/qat*.bin"
946RDEPENDS_${PN}-qat = "${PN}-qat-license" 946RDEPENDS:${PN}-qat = "${PN}-qat-license"
947 947
948# For QCOM VPU/GPU and SDM845 948# For QCOM VPU/GPU and SDM845
949LICENSE_${PN}-qcom-license = "Firmware-qcom" 949LICENSE:${PN}-qcom-license = "Firmware-qcom"
950FILES_${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt" 950FILES:${PN}-qcom-license = "${nonarch_base_libdir}/firmware/LICENSE.qcom ${nonarch_base_libdir}/firmware/qcom/NOTICE.txt"
951FILES_${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*" 951FILES:${PN}-qcom-venus-1.8 = "${nonarch_base_libdir}/firmware/qcom/venus-1.8/*"
952FILES_${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*" 952FILES:${PN}-qcom-venus-4.2 = "${nonarch_base_libdir}/firmware/qcom/venus-4.2/*"
953FILES_${PN}-qcom-venus-5.2 = "${nonarch_base_libdir}/firmware/qcom/venus-5.2/*" 953FILES:${PN}-qcom-venus-5.2 = "${nonarch_base_libdir}/firmware/qcom/venus-5.2/*"
954FILES_${PN}-qcom-venus-5.4 = "${nonarch_base_libdir}/firmware/qcom/venus-5.4/*" 954FILES:${PN}-qcom-venus-5.4 = "${nonarch_base_libdir}/firmware/qcom/venus-5.4/*"
955FILES_${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw" 955FILES:${PN}-qcom-adreno-a3xx = "${nonarch_base_libdir}/firmware/qcom/a300_*.fw ${nonarch_base_libdir}/firmware/a300_*.fw"
956FILES_${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*" 956FILES:${PN}-qcom-adreno-a530 = "${nonarch_base_libdir}/firmware/qcom/a530*.*"
957FILES_${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*" 957FILES:${PN}-qcom-adreno-a630 = "${nonarch_base_libdir}/firmware/qcom/a630*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/a630*.*"
958FILES_${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*" 958FILES:${PN}-qcom-sdm845-audio = "${nonarch_base_libdir}/firmware/qcom/sdm845/adsp*.*"
959FILES_${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*" 959FILES:${PN}-qcom-sdm845-compute = "${nonarch_base_libdir}/firmware/qcom/sdm845/cdsp*.*"
960FILES_${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn" 960FILES:${PN}-qcom-sdm845-modem = "${nonarch_base_libdir}/firmware/qcom/sdm845/mba.mbn ${nonarch_base_libdir}/firmware/qcom/sdm845/modem*.* ${nonarch_base_libdir}/firmware/qcom/sdm845/wlanmdsp.mbn"
961RDEPENDS_${PN}-qcom-venus-1.8 = "${PN}-qcom-license" 961RDEPENDS:${PN}-qcom-venus-1.8 = "${PN}-qcom-license"
962RDEPENDS_${PN}-qcom-venus-4.2 = "${PN}-qcom-license" 962RDEPENDS:${PN}-qcom-venus-4.2 = "${PN}-qcom-license"
963RDEPENDS_${PN}-qcom-venus-5.2 = "${PN}-qcom-license" 963RDEPENDS:${PN}-qcom-venus-5.2 = "${PN}-qcom-license"
964RDEPENDS_${PN}-qcom-venus-5.4 = "${PN}-qcom-license" 964RDEPENDS:${PN}-qcom-venus-5.4 = "${PN}-qcom-license"
965RDEPENDS_${PN}-qcom-adreno-a3xx = "${PN}-qcom-license" 965RDEPENDS:${PN}-qcom-adreno-a3xx = "${PN}-qcom-license"
966RDEPENDS_${PN}-qcom-adreno-a530 = "${PN}-qcom-license" 966RDEPENDS:${PN}-qcom-adreno-a530 = "${PN}-qcom-license"
967RDEPENDS_${PN}-qcom-adreno-a630 = "${PN}-qcom-license" 967RDEPENDS:${PN}-qcom-adreno-a630 = "${PN}-qcom-license"
968RDEPENDS_${PN}-qcom-sdm845-audio = "${PN}-qcom-license" 968RDEPENDS:${PN}-qcom-sdm845-audio = "${PN}-qcom-license"
969RDEPENDS_${PN}-qcom-sdm845-compute = "${PN}-qcom-license" 969RDEPENDS:${PN}-qcom-sdm845-compute = "${PN}-qcom-license"
970RDEPENDS_${PN}-qcom-sdm845-modem = "${PN}-qcom-license" 970RDEPENDS:${PN}-qcom-sdm845-modem = "${PN}-qcom-license"
971 971
972FILES_${PN}-liquidio = "${nonarch_base_libdir}/firmware/liquidio" 972FILES:${PN}-liquidio = "${nonarch_base_libdir}/firmware/liquidio"
973 973
974# For Amlogic VDEC 974# For Amlogic VDEC
975LICENSE_${PN}-amlogic-vdec = "Firmware-amlogic_vdec" 975LICENSE:${PN}-amlogic-vdec = "Firmware-amlogic_vdec"
976FILES_${PN}-amlogic-vdec-license = "${nonarch_base_libdir}/firmware/LICENSE.amlogic_vdec" 976FILES:${PN}-amlogic-vdec-license = "${nonarch_base_libdir}/firmware/LICENSE.amlogic_vdec"
977FILES_${PN}-amlogic-vdec = "${nonarch_base_libdir}/firmware/meson/vdec/*" 977FILES:${PN}-amlogic-vdec = "${nonarch_base_libdir}/firmware/meson/vdec/*"
978RDEPENDS_${PN}-amlogic-vdec = "${PN}-amlogic-vdec-license" 978RDEPENDS:${PN}-amlogic-vdec = "${PN}-amlogic-vdec-license"
979 979
980# For other firmwares 980# For other firmwares
981# Maybe split out to separate packages when needed. 981# Maybe split out to separate packages when needed.
982LICENSE_${PN} = "\ 982LICENSE:${PN} = "\
983 Firmware-Abilis \ 983 Firmware-Abilis \
984 & Firmware-agere \ 984 & Firmware-agere \
985 & Firmware-amdgpu \ 985 & Firmware-amdgpu \
@@ -1028,23 +1028,23 @@ LICENSE_${PN} = "\
1028 & WHENCE \ 1028 & WHENCE \
1029" 1029"
1030 1030
1031FILES_${PN}-license += "${nonarch_base_libdir}/firmware/LICEN*" 1031FILES:${PN}-license += "${nonarch_base_libdir}/firmware/LICEN*"
1032FILES_${PN} += "${nonarch_base_libdir}/firmware/*" 1032FILES:${PN} += "${nonarch_base_libdir}/firmware/*"
1033RDEPENDS_${PN} += "${PN}-license" 1033RDEPENDS:${PN} += "${PN}-license"
1034RDEPENDS_${PN} += "${PN}-whence-license" 1034RDEPENDS:${PN} += "${PN}-whence-license"
1035 1035
1036# Make linux-firmware depend on all of the split-out packages. 1036# Make linux-firmware depend on all of the split-out packages.
1037# Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages. 1037# Make linux-firmware-iwlwifi depend on all of the split-out iwlwifi packages.
1038# Make linux-firmware-ibt depend on all of the split-out ibt packages. 1038# Make linux-firmware-ibt depend on all of the split-out ibt packages.
1039python populate_packages_prepend () { 1039python populate_packages:prepend () {
1040 firmware_pkgs = oe.utils.packages_filter_out_system(d) 1040 firmware_pkgs = oe.utils.packages_filter_out_system(d)
1041 d.appendVar('RRECOMMENDS_linux-firmware', ' ' + ' '.join(firmware_pkgs)) 1041 d.appendVar('RRECOMMENDS:linux-firmware', ' ' + ' '.join(firmware_pkgs))
1042 1042
1043 iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs) 1043 iwlwifi_pkgs = filter(lambda x: x.find('-iwlwifi-') != -1, firmware_pkgs)
1044 d.appendVar('RRECOMMENDS_linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs)) 1044 d.appendVar('RRECOMMENDS:linux-firmware-iwlwifi', ' ' + ' '.join(iwlwifi_pkgs))
1045 1045
1046 ibt_pkgs = filter(lambda x: x.find('-ibt-') != -1, firmware_pkgs) 1046 ibt_pkgs = filter(lambda x: x.find('-ibt-') != -1, firmware_pkgs)
1047 d.appendVar('RRECOMMENDS_linux-firmware-ibt', ' ' + ' '.join(ibt_pkgs)) 1047 d.appendVar('RRECOMMENDS:linux-firmware-ibt', ' ' + ' '.join(ibt_pkgs))
1048} 1048}
1049 1049
1050# Firmware files are generally not ran on the CPU, so they can be 1050# Firmware files are generally not ran on the CPU, so they can be
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
index 175b2d1819..3867d09d08 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
@@ -75,15 +75,15 @@ do_install() {
75 find ${D}${includedir} -name ..install.cmd | xargs rm -f 75 find ${D}${includedir} -name ..install.cmd | xargs rm -f
76} 76}
77 77
78do_install_append_aarch64 () { 78do_install:append:aarch64 () {
79 do_install_armmultilib 79 do_install_armmultilib
80} 80}
81 81
82do_install_append_arm () { 82do_install:append:arm () {
83 do_install_armmultilib 83 do_install_armmultilib
84} 84}
85 85
86do_install_append_armeb () { 86do_install:append:armeb () {
87 do_install_armmultilib 87 do_install_armmultilib
88} 88}
89 89
@@ -103,8 +103,8 @@ do_install_armmultilib () {
103 103
104BBCLASSEXTEND = "nativesdk" 104BBCLASSEXTEND = "nativesdk"
105 105
106RDEPENDS_${PN}-dev = "" 106RDEPENDS:${PN}-dev = ""
107RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" 107RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
108 108
109INHIBIT_DEFAULT_DEPS = "1" 109INHIBIT_DEFAULT_DEPS = "1"
110DEPENDS += "unifdef-native bison-native rsync-native" 110DEPENDS += "unifdef-native bison-native rsync-native"
diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
index 251d00440d..556ca07f2c 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers_5.13.bb
@@ -1,13 +1,13 @@
1require linux-libc-headers.inc 1require linux-libc-headers.inc
2 2
3SRC_URI_append_libc-musl = "\ 3SRC_URI:append:libc-musl = "\
4 file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \ 4 file://0001-libc-compat.h-fix-some-issues-arising-from-in6.h.patch \
5 file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \ 5 file://0003-remove-inclusion-of-sysinfo.h-in-kernel.h.patch \
6 file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \ 6 file://0001-libc-compat.h-musl-_does_-define-IFF_LOWER_UP-DORMAN.patch \
7 file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \ 7 file://0001-include-linux-stddef.h-in-swab.h-uapi-header.patch \
8 " 8 "
9 9
10SRC_URI_append = "\ 10SRC_URI:append = "\
11 file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \ 11 file://0001-scripts-Use-fixed-input-and-output-files-instead-of-.patch \
12 file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \ 12 file://0001-kbuild-install_headers.sh-Strip-_UAPI-from-if-define.patch \
13" 13"
diff --git a/meta/recipes-kernel/linux/kernel-devsrc.bb b/meta/recipes-kernel/linux/kernel-devsrc.bb
index 21b42833ba..3b5fdda773 100644
--- a/meta/recipes-kernel/linux/kernel-devsrc.bb
+++ b/meta/recipes-kernel/linux/kernel-devsrc.bb
@@ -315,17 +315,17 @@ do_install() {
315# Ensure we don't race against "make scripts" during cpio 315# Ensure we don't race against "make scripts" during cpio
316do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock" 316do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
317 317
318FILES_${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}" 318FILES:${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}"
319FILES_${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*" 319FILES:${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*"
320 320
321RDEPENDS_${PN} = "bc python3 flex bison ${TCLIBC}-utils" 321RDEPENDS:${PN} = "bc python3 flex bison ${TCLIBC}-utils"
322# 4.15+ needs these next two RDEPENDS 322# 4.15+ needs these next two RDEPENDS
323RDEPENDS_${PN} += "openssl-dev util-linux" 323RDEPENDS:${PN} += "openssl-dev util-linux"
324# and x86 needs a bit more for 4.15+ 324# and x86 needs a bit more for 4.15+
325RDEPENDS_${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}" 325RDEPENDS:${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}"
326# 5.8+ needs gcc-plugins libmpc-dev 326# 5.8+ needs gcc-plugins libmpc-dev
327RDEPENDS_${PN} += "gcc-plugins libmpc-dev" 327RDEPENDS:${PN} += "gcc-plugins libmpc-dev"
328# 5.13+ needs awk for arm64 328# 5.13+ needs awk for arm64
329RDEPENDS_${PN}_append_aarch64 = " gawk" 329RDEPENDS:${PN}:append:aarch64 = " gawk"
330# 5.13+ needs grep for powerpc 330# 5.13+ needs grep for powerpc
331RDEPENDS_${PN}_append_powerpc = " grep" 331RDEPENDS:${PN}:append:powerpc = " grep"
diff --git a/meta/recipes-kernel/linux/linux-dummy.bb b/meta/recipes-kernel/linux/linux-dummy.bb
index c56f8990de..175e660687 100644
--- a/meta/recipes-kernel/linux/linux-dummy.bb
+++ b/meta/recipes-kernel/linux/linux-dummy.bb
@@ -16,12 +16,12 @@ PACKAGES_DYNAMIC += "^kernel-image-.*"
16PACKAGES_DYNAMIC += "^kernel-firmware-.*" 16PACKAGES_DYNAMIC += "^kernel-firmware-.*"
17 17
18PACKAGES += "kernel-modules kernel-vmlinux" 18PACKAGES += "kernel-modules kernel-vmlinux"
19FILES_kernel-modules = "" 19FILES:kernel-modules = ""
20ALLOW_EMPTY_kernel-modules = "1" 20ALLOW_EMPTY:kernel-modules = "1"
21DESCRIPTION_kernel-modules = "Kernel modules meta package" 21DESCRIPTION:kernel-modules = "Kernel modules meta package"
22FILES_kernel-vmlinux = "" 22FILES:kernel-vmlinux = ""
23ALLOW_EMPTY_kernel-vmlinux = "1" 23ALLOW_EMPTY:kernel-vmlinux = "1"
24DESCRIPTION_kernel-vmlinux = "Kernel vmlinux meta package" 24DESCRIPTION:kernel-vmlinux = "Kernel vmlinux meta package"
25 25
26 26
27INHIBIT_DEFAULT_DEPS = "1" 27INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta/recipes-kernel/linux/linux-yocto-dev.bb b/meta/recipes-kernel/linux/linux-yocto-dev.bb
index f407882316..28a255a0c0 100644
--- a/meta/recipes-kernel/linux/linux-yocto-dev.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-dev.bb
@@ -41,16 +41,16 @@ DEPENDS += "openssl-native util-linux-native"
41 41
42COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)" 42COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)"
43 43
44KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 44KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
45 45
46# Functionality flags 46# Functionality flags
47KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" 47KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
48KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 48KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
49KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" 49KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
50KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" 50KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
51KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" 51KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
52KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" 52KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
53KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" 53KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
54KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" 54KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
55 55
56KERNEL_VERSION_SANITY_SKIP = "1" 56KERNEL_VERSION_SANITY_SKIP = "1"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 133b1f6fe3..d404659992 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -33,13 +33,13 @@ LINUX_KERNEL_TYPE = "preempt-rt"
33 33
34COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" 34COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)"
35 35
36KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 36KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
37 37
38# Functionality flags 38# Functionality flags
39KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" 39KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
40KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 40KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
41KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" 41KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
42KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" 42KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
43KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" 43KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
44KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" 44KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
45KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" 45KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb
index adcc84bd4a..d7916a5679 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb
@@ -33,13 +33,13 @@ LINUX_KERNEL_TYPE = "preempt-rt"
33 33
34COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" 34COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)"
35 35
36KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 36KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
37 37
38# Functionality flags 38# Functionality flags
39KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" 39KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
40KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 40KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
41KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" 41KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
42KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" 42KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
43KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" 43KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
44KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" 44KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
45KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" 45KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
index a975004d76..2e55e28397 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb
@@ -33,13 +33,13 @@ LINUX_KERNEL_TYPE = "preempt-rt"
33 33
34COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" 34COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)"
35 35
36KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 36KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
37 37
38# Functionality flags 38# Functionality flags
39KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" 39KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc"
40KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 40KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
41KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" 41KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
42KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" 42KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
43KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" 43KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
44KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" 44KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
45KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" 45KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 238123a42f..c66d5072f4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -1,5 +1,5 @@
1KBRANCH ?= "v5.10/standard/tiny/base" 1KBRANCH ?= "v5.10/standard/tiny/base"
2KBRANCH_qemuarm ?= "v5.10/standard/tiny/arm-versatile-926ejs" 2KBRANCH:qemuarm ?= "v5.10/standard/tiny/arm-versatile-926ejs"
3 3
4LINUX_KERNEL_TYPE = "tiny" 4LINUX_KERNEL_TYPE = "tiny"
5KCONFIG_MODE = "--allnoconfig" 5KCONFIG_MODE = "--allnoconfig"
@@ -15,7 +15,7 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "faa3b7802d0ee1fe0217283ecaf2c54c9503fa20" 18SRCREV_machine:qemuarm ?= "faa3b7802d0ee1fe0217283ecaf2c54c9503fa20"
19SRCREV_machine ?= "240422889570d39c3f7d63808159c8e743117a1d" 19SRCREV_machine ?= "240422889570d39c3f7d63808159c8e743117a1d"
20SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" 20SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736"
21 21
@@ -29,4 +29,4 @@ COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
29# Functionality flags 29# Functionality flags
30KERNEL_FEATURES = "" 30KERNEL_FEATURES = ""
31 31
32KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 32KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb
index 6598684bbb..2f9478baa9 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb
@@ -1,5 +1,5 @@
1KBRANCH ?= "v5.13/standard/tiny/base" 1KBRANCH ?= "v5.13/standard/tiny/base"
2KBRANCH_qemuarm ?= "v5.13/standard/tiny/arm-versatile-926ejs" 2KBRANCH:qemuarm ?= "v5.13/standard/tiny/arm-versatile-926ejs"
3 3
4LINUX_KERNEL_TYPE = "tiny" 4LINUX_KERNEL_TYPE = "tiny"
5KCONFIG_MODE = "--allnoconfig" 5KCONFIG_MODE = "--allnoconfig"
@@ -15,7 +15,7 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "e394a72e8bc77484bf7bae8c842c75b23cc3dd63" 18SRCREV_machine:qemuarm ?= "e394a72e8bc77484bf7bae8c842c75b23cc3dd63"
19SRCREV_machine ?= "7275d462cec720120d1767e277a2525d88901c80" 19SRCREV_machine ?= "7275d462cec720120d1767e277a2525d88901c80"
20SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d" 20SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d"
21 21
@@ -29,4 +29,4 @@ COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
29# Functionality flags 29# Functionality flags
30KERNEL_FEATURES = "" 30KERNEL_FEATURES = ""
31 31
32KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 32KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
index 95ead533d1..9914986822 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb
@@ -1,5 +1,5 @@
1KBRANCH ?= "v5.4/standard/tiny/base" 1KBRANCH ?= "v5.4/standard/tiny/base"
2KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" 2KBRANCH:qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs"
3 3
4LINUX_KERNEL_TYPE = "tiny" 4LINUX_KERNEL_TYPE = "tiny"
5KCONFIG_MODE = "--allnoconfig" 5KCONFIG_MODE = "--allnoconfig"
@@ -15,7 +15,7 @@ DEPENDS += "openssl-native util-linux-native"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "86c31c51c87557af60e4d4dbee73f18618bc4c92" 18SRCREV_machine:qemuarm ?= "86c31c51c87557af60e4d4dbee73f18618bc4c92"
19SRCREV_machine ?= "bf89a54b3f77fbac15dd0194870db288aee5c8b7" 19SRCREV_machine ?= "bf89a54b3f77fbac15dd0194870db288aee5c8b7"
20SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" 20SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3"
21 21
@@ -29,4 +29,4 @@ COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5"
29# Functionality flags 29# Functionality flags
30KERNEL_FEATURES = "" 30KERNEL_FEATURES = ""
31 31
32KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 32KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index eb3081ee31..331727d62c 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -19,22 +19,22 @@ python () {
19} 19}
20 20
21DEPENDS += "xz-native bc-native" 21DEPENDS += "xz-native bc-native"
22DEPENDS_append_aarch64 = " libgcc" 22DEPENDS:append:aarch64 = " libgcc"
23KERNEL_CC_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" 23KERNEL_CC:append:aarch64 = " ${TOOLCHAIN_OPTIONS}"
24KERNEL_LD_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" 24KERNEL_LD:append:aarch64 = " ${TOOLCHAIN_OPTIONS}"
25 25
26DEPENDS_append_nios2 = " libgcc" 26DEPENDS:append:nios2 = " libgcc"
27KERNEL_CC_append_nios2 = " ${TOOLCHAIN_OPTIONS}" 27KERNEL_CC:append:nios2 = " ${TOOLCHAIN_OPTIONS}"
28KERNEL_LD_append_nios2 = " ${TOOLCHAIN_OPTIONS}" 28KERNEL_LD:append:nios2 = " ${TOOLCHAIN_OPTIONS}"
29 29
30DEPENDS_append_arc = " libgcc" 30DEPENDS:append:arc = " libgcc"
31KERNEL_CC_append_arc = " ${TOOLCHAIN_OPTIONS}" 31KERNEL_CC:append:arc = " ${TOOLCHAIN_OPTIONS}"
32KERNEL_LD_append_arc = " ${TOOLCHAIN_OPTIONS}" 32KERNEL_LD:append:arc = " ${TOOLCHAIN_OPTIONS}"
33 33
34KERNEL_FEATURES_append_qemuall=" features/debug/printk.scc" 34KERNEL_FEATURES:append:qemuall=" features/debug/printk.scc"
35 35
36KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'features/numa/numa.scc', '', d)}" 36KERNEL_FEATURES:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'features/numa/numa.scc', '', d)}"
37KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vfat', 'cfg/fs/vfat.scc', '', d)}" 37KERNEL_FEATURES:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vfat', 'cfg/fs/vfat.scc', '', d)}"
38 38
39# A KMACHINE is the mapping of a yocto $MACHINE to what is built 39# A KMACHINE is the mapping of a yocto $MACHINE to what is built
40# by the kernel. This is typically the branch that should be built, 40# by the kernel. This is typically the branch that should be built,
@@ -49,11 +49,11 @@ inherit kernel-yocto
49 49
50B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build" 50B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build"
51 51
52do_install_append(){ 52do_install:append(){
53 if [ -n "${KMETA}" ]; then 53 if [ -n "${KMETA}" ]; then
54 rm -rf ${STAGING_KERNEL_DIR}/${KMETA} 54 rm -rf ${STAGING_KERNEL_DIR}/${KMETA}
55 fi 55 fi
56} 56}
57 57
58# enable kernel-sample for oeqa/runtime/cases's ksample.py test 58# enable kernel-sample for oeqa/runtime/cases's ksample.py test
59KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" 59KERNEL_FEATURES:append:qemuall=" features/kernel-sample/kernel-sample.scc"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 40a2a5e3b2..ca4aff8b42 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -3,30 +3,30 @@ KBRANCH ?= "v5.10/standard/base"
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5# board specific branches 5# board specific branches
6KBRANCH_qemuarm ?= "v5.10/standard/arm-versatile-926ejs" 6KBRANCH:qemuarm ?= "v5.10/standard/arm-versatile-926ejs"
7KBRANCH_qemuarm64 ?= "v5.10/standard/qemuarm64" 7KBRANCH:qemuarm64 ?= "v5.10/standard/qemuarm64"
8KBRANCH_qemumips ?= "v5.10/standard/mti-malta32" 8KBRANCH:qemumips ?= "v5.10/standard/mti-malta32"
9KBRANCH_qemuppc ?= "v5.10/standard/qemuppc" 9KBRANCH:qemuppc ?= "v5.10/standard/qemuppc"
10KBRANCH_qemuriscv64 ?= "v5.10/standard/base" 10KBRANCH:qemuriscv64 ?= "v5.10/standard/base"
11KBRANCH_qemuriscv32 ?= "v5.10/standard/base" 11KBRANCH:qemuriscv32 ?= "v5.10/standard/base"
12KBRANCH_qemux86 ?= "v5.10/standard/base" 12KBRANCH:qemux86 ?= "v5.10/standard/base"
13KBRANCH_qemux86-64 ?= "v5.10/standard/base" 13KBRANCH:qemux86-64 ?= "v5.10/standard/base"
14KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" 14KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64"
15 15
16SRCREV_machine_qemuarm ?= "96a6083817785461bcabad63f3872d0a08b21c29" 16SRCREV_machine:qemuarm ?= "96a6083817785461bcabad63f3872d0a08b21c29"
17SRCREV_machine_qemuarm64 ?= "c8d8b20a749f476020d0844d76f63cd9e4cca644" 17SRCREV_machine:qemuarm64 ?= "c8d8b20a749f476020d0844d76f63cd9e4cca644"
18SRCREV_machine_qemumips ?= "acdebd5080a846f3906ba1d5343d5af5c4b76522" 18SRCREV_machine:qemumips ?= "acdebd5080a846f3906ba1d5343d5af5c4b76522"
19SRCREV_machine_qemuppc ?= "afd31d567447f4693b7c9af35f09bb37cc0c0fa4" 19SRCREV_machine:qemuppc ?= "afd31d567447f4693b7c9af35f09bb37cc0c0fa4"
20SRCREV_machine_qemuriscv64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" 20SRCREV_machine:qemuriscv64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd"
21SRCREV_machine_qemuriscv32 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" 21SRCREV_machine:qemuriscv32 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd"
22SRCREV_machine_qemux86 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" 22SRCREV_machine:qemux86 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd"
23SRCREV_machine_qemux86-64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" 23SRCREV_machine:qemux86-64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd"
24SRCREV_machine_qemumips64 ?= "efad0ca4150cddffa6d052ffb53fec0553de4da8" 24SRCREV_machine:qemumips64 ?= "efad0ca4150cddffa6d052ffb53fec0553de4da8"
25SRCREV_machine ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" 25SRCREV_machine ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd"
26SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" 26SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736"
27 27
28# remap qemuarm to qemuarma15 for the 5.8 kernel 28# remap qemuarm to qemuarma15 for the 5.8 kernel
29# KMACHINE_qemuarm ?= "qemuarma15" 29# KMACHINE:qemuarm ?= "qemuarma15"
30 30
31SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 31SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
32 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" 32 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
@@ -43,16 +43,16 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
43KMETA = "kernel-meta" 43KMETA = "kernel-meta"
44KCONF_BSP_AUDIT_LEVEL = "1" 44KCONF_BSP_AUDIT_LEVEL = "1"
45 45
46KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 46KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
47 47
48COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32" 48COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32"
49 49
50# Functionality flags 50# Functionality flags
51KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" 51KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
52KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 52KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
53KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" 53KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
54KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" 54KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
55KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" 55KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
56KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" 56KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
57KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" 57KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
58KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" 58KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.13.bb b/meta/recipes-kernel/linux/linux-yocto_5.13.bb
index 497c3307d5..f4c7f31c1e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.13.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.13.bb
@@ -3,25 +3,25 @@ KBRANCH ?= "v5.13/standard/base"
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5# board specific branches 5# board specific branches
6KBRANCH_qemuarm ?= "v5.13/standard/arm-versatile-926ejs" 6KBRANCH:qemuarm ?= "v5.13/standard/arm-versatile-926ejs"
7KBRANCH_qemuarm64 ?= "v5.13/standard/qemuarm64" 7KBRANCH:qemuarm64 ?= "v5.13/standard/qemuarm64"
8KBRANCH_qemumips ?= "v5.13/standard/mti-malta32" 8KBRANCH:qemumips ?= "v5.13/standard/mti-malta32"
9KBRANCH_qemuppc ?= "v5.13/standard/qemuppc" 9KBRANCH:qemuppc ?= "v5.13/standard/qemuppc"
10KBRANCH_qemuriscv64 ?= "v5.13/standard/base" 10KBRANCH:qemuriscv64 ?= "v5.13/standard/base"
11KBRANCH_qemuriscv32 ?= "v5.13/standard/base" 11KBRANCH:qemuriscv32 ?= "v5.13/standard/base"
12KBRANCH_qemux86 ?= "v5.13/standard/base" 12KBRANCH:qemux86 ?= "v5.13/standard/base"
13KBRANCH_qemux86-64 ?= "v5.13/standard/base" 13KBRANCH:qemux86-64 ?= "v5.13/standard/base"
14KBRANCH_qemumips64 ?= "v5.13/standard/mti-malta64" 14KBRANCH:qemumips64 ?= "v5.13/standard/mti-malta64"
15 15
16SRCREV_machine_qemuarm ?= "dc19ba17f4d43a220ae8129312703add02d03d1e" 16SRCREV_machine:qemuarm ?= "dc19ba17f4d43a220ae8129312703add02d03d1e"
17SRCREV_machine_qemuarm64 ?= "1e086c08b65e8bd1f45f01fd8026599a62deb6c0" 17SRCREV_machine:qemuarm64 ?= "1e086c08b65e8bd1f45f01fd8026599a62deb6c0"
18SRCREV_machine_qemumips ?= "4dd19bc8178a6100a2cb9ffd8364e359230253c8" 18SRCREV_machine:qemumips ?= "4dd19bc8178a6100a2cb9ffd8364e359230253c8"
19SRCREV_machine_qemuppc ?= "73c8e406db9beb3a99a5dd3ea67824f0e3c0d7a8" 19SRCREV_machine:qemuppc ?= "73c8e406db9beb3a99a5dd3ea67824f0e3c0d7a8"
20SRCREV_machine_qemuriscv64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" 20SRCREV_machine:qemuriscv64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068"
21SRCREV_machine_qemuriscv32 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" 21SRCREV_machine:qemuriscv32 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068"
22SRCREV_machine_qemux86 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" 22SRCREV_machine:qemux86 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068"
23SRCREV_machine_qemux86-64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" 23SRCREV_machine:qemux86-64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068"
24SRCREV_machine_qemumips64 ?= "0632623fd488acc7c78a4f48d4630caba5e6044e" 24SRCREV_machine:qemumips64 ?= "0632623fd488acc7c78a4f48d4630caba5e6044e"
25SRCREV_machine ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" 25SRCREV_machine ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068"
26SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d" 26SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d"
27 27
@@ -30,13 +30,13 @@ SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d"
30# meta SRCREV as the linux-yocto-standard builds. Select your version using the 30# meta SRCREV as the linux-yocto-standard builds. Select your version using the
31# normal PREFERRED_VERSION settings. 31# normal PREFERRED_VERSION settings.
32BBCLASSEXTEND = "devupstream:target" 32BBCLASSEXTEND = "devupstream:target"
33DEFAULT_PREFERENCE_class-devupstream = "-1" 33DEFAULT_PREFERENCE:class-devupstream = "-1"
34SRCREV_machine_class-devupstream ?= "64376a981a0e2e57c46efa63197c2ebb7dab35df" 34SRCREV_machine:class-devupstream ?= "64376a981a0e2e57c46efa63197c2ebb7dab35df"
35PN_class-devupstream = "linux-yocto-upstream" 35PN:class-devupstream = "linux-yocto-upstream"
36KBRANCH_class-devupstream = "v5.13/base" 36KBRANCH:class-devupstream = "v5.13/base"
37 37
38# remap qemuarm to qemuarma15 for the 5.8 kernel 38# remap qemuarm to qemuarma15 for the 5.8 kernel
39# KMACHINE_qemuarm ?= "qemuarma15" 39# KMACHINE:qemuarm ?= "qemuarma15"
40 40
41SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 41SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
42 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.13;destsuffix=${KMETA}" 42 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.13;destsuffix=${KMETA}"
@@ -53,16 +53,16 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
53KMETA = "kernel-meta" 53KMETA = "kernel-meta"
54KCONF_BSP_AUDIT_LEVEL = "1" 54KCONF_BSP_AUDIT_LEVEL = "1"
55 55
56KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 56KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
57 57
58COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32" 58COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32"
59 59
60# Functionality flags 60# Functionality flags
61KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" 61KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
62KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 62KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
63KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" 63KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
64KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" 64KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
65KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" 65KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
66KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" 66KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
67KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" 67KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
68KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" 68KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
index 90a557bb63..a6bcc81726 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb
@@ -3,28 +3,28 @@ KBRANCH ?= "v5.4/standard/base"
3require recipes-kernel/linux/linux-yocto.inc 3require recipes-kernel/linux/linux-yocto.inc
4 4
5# board specific branches 5# board specific branches
6KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" 6KBRANCH:qemuarm ?= "v5.4/standard/arm-versatile-926ejs"
7KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" 7KBRANCH:qemuarm64 ?= "v5.4/standard/qemuarm64"
8KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" 8KBRANCH:qemumips ?= "v5.4/standard/mti-malta32"
9KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" 9KBRANCH:qemuppc ?= "v5.4/standard/qemuppc"
10KBRANCH_qemuriscv64 ?= "v5.4/standard/base" 10KBRANCH:qemuriscv64 ?= "v5.4/standard/base"
11KBRANCH_qemux86 ?= "v5.4/standard/base" 11KBRANCH:qemux86 ?= "v5.4/standard/base"
12KBRANCH_qemux86-64 ?= "v5.4/standard/base" 12KBRANCH:qemux86-64 ?= "v5.4/standard/base"
13KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" 13KBRANCH:qemumips64 ?= "v5.4/standard/mti-malta64"
14 14
15SRCREV_machine_qemuarm ?= "bea52ab7529ef152f99a0f6ebd97cc7e904e5360" 15SRCREV_machine:qemuarm ?= "bea52ab7529ef152f99a0f6ebd97cc7e904e5360"
16SRCREV_machine_qemuarm64 ?= "8a29c9de0fc366bd89ce6954685dce0e330dbabe" 16SRCREV_machine:qemuarm64 ?= "8a29c9de0fc366bd89ce6954685dce0e330dbabe"
17SRCREV_machine_qemumips ?= "b15816ccad0762d27c78c269e7a1986504e60c63" 17SRCREV_machine:qemumips ?= "b15816ccad0762d27c78c269e7a1986504e60c63"
18SRCREV_machine_qemuppc ?= "906f9509a8d2f842ec8766bf81287f8939ff1fa8" 18SRCREV_machine:qemuppc ?= "906f9509a8d2f842ec8766bf81287f8939ff1fa8"
19SRCREV_machine_qemuriscv64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" 19SRCREV_machine:qemuriscv64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc"
20SRCREV_machine_qemux86 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" 20SRCREV_machine:qemux86 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc"
21SRCREV_machine_qemux86-64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" 21SRCREV_machine:qemux86-64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc"
22SRCREV_machine_qemumips64 ?= "152e33a0782920e9707c36ccacf53585a8911e9f" 22SRCREV_machine:qemumips64 ?= "152e33a0782920e9707c36ccacf53585a8911e9f"
23SRCREV_machine ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" 23SRCREV_machine ?= "dd8a64a523fb714a98328441e0de72cde115a6fc"
24SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" 24SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3"
25 25
26# remap qemuarm to qemuarma15 for the 5.4 kernel 26# remap qemuarm to qemuarma15 for the 5.4 kernel
27# KMACHINE_qemuarm ?= "qemuarma15" 27# KMACHINE:qemuarm ?= "qemuarma15"
28 28
29SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 29SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \
30 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" 30 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}"
@@ -40,16 +40,16 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
40KMETA = "kernel-meta" 40KMETA = "kernel-meta"
41KCONF_BSP_AUDIT_LEVEL = "1" 41KCONF_BSP_AUDIT_LEVEL = "1"
42 42
43KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" 43KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb"
44 44
45COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" 45COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64"
46 46
47# Functionality flags 47# Functionality flags
48KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" 48KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc"
49KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" 49KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}"
50KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" 50KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc"
51KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" 51KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc"
52KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" 52KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc"
53KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" 53KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}"
54KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" 54KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}"
55KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" 55KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}"
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb
index 7fb524eeb0..2aafe81734 100644
--- a/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.4.bb
@@ -24,12 +24,12 @@ EXTRA_OECONF = "--disable-debug-info"
24PACKAGECONFIG ??= "manpages" 24PACKAGECONFIG ??= "manpages"
25PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native" 25PACKAGECONFIG[manpages] = ", --disable-man-pages, asciidoc-native xmlto-native"
26 26
27FILES_${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a" 27FILES:${PN}-staticdev += "${libdir}/babeltrace2/plugins/*.a"
28FILES_${PN} += "${libdir}/babeltrace2/plugins/*.so" 28FILES:${PN} += "${libdir}/babeltrace2/plugins/*.so"
29 29
30ASNEEDED = "" 30ASNEEDED = ""
31 31
32RDEPENDS_${PN}-ptest += "bash gawk python3" 32RDEPENDS:${PN}-ptest += "bash gawk python3"
33 33
34do_compile_ptest () { 34do_compile_ptest () {
35 make -C tests all 35 make -C tests all
diff --git a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb
index 9e5d3a7a97..9f8b035128 100644
--- a/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb
+++ b/meta/recipes-kernel/lttng/babeltrace_1.5.8.bb
@@ -21,7 +21,7 @@ EXTRA_OECONF = "--disable-debug-info"
21 21
22ASNEEDED = "" 22ASNEEDED = ""
23 23
24RDEPENDS_${PN}-ptest += "bash gawk" 24RDEPENDS:${PN}-ptest += "bash gawk"
25 25
26addtask do_patch_ptest_path after do_patch before do_configure 26addtask do_patch_ptest_path after do_patch before do_configure
27do_patch_ptest_path () { 27do_patch_ptest_path () {
diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb b/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb
index 94e849de59..c46faaee58 100644
--- a/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb
+++ b/meta/recipes-kernel/lttng/lttng-modules_2.12.6.bb
@@ -19,24 +19,24 @@ export INSTALL_MOD_DIR="kernel/lttng-modules"
19 19
20EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'" 20EXTRA_OEMAKE += "KERNELDIR='${STAGING_KERNEL_DIR}'"
21 21
22do_install_append() { 22do_install:append() {
23 # Delete empty directories to avoid QA failures if no modules were built 23 # Delete empty directories to avoid QA failures if no modules were built
24 find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \; 24 find ${D}/${nonarch_base_libdir} -depth -type d -empty -exec rmdir {} \;
25} 25}
26 26
27python do_package_prepend() { 27python do_package:prepend() {
28 if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')): 28 if not os.path.exists(os.path.join(d.getVar('D'), d.getVar('nonarch_base_libdir')[1:], 'modules')):
29 bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN')) 29 bb.warn("%s: no modules were created; this may be due to CONFIG_TRACEPOINTS not being enabled in your kernel." % d.getVar('PN'))
30} 30}
31 31
32BBCLASSEXTEND = "devupstream:target" 32BBCLASSEXTEND = "devupstream:target"
33LIC_FILES_CHKSUM_class-devupstream = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4" 33LIC_FILES_CHKSUM:class-devupstream = "file://LICENSE;md5=0464cff101a009c403cd2ed65d01d4c4"
34DEFAULT_PREFERENCE_class-devupstream = "-1" 34DEFAULT_PREFERENCE:class-devupstream = "-1"
35SRC_URI_class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13 \ 35SRC_URI:class-devupstream = "git://git.lttng.org/lttng-modules;branch=stable-2.13 \
36 file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \ 36 file://0001-src-Kbuild-change-missing-CONFIG_TRACEPOINTS-to-warn.patch \
37 " 37 "
38 38
39SRCREV_class-devupstream = "f982b51a98a29cb4aaf607cb9bbf2b509d8e6933" 39SRCREV:class-devupstream = "f982b51a98a29cb4aaf607cb9bbf2b509d8e6933"
40PV_class-devupstream = "2.13.0-rc2+git${SRCPV}" 40PV:class-devupstream = "2.13.0-rc2+git${SRCPV}"
41S_class-devupstream = "${WORKDIR}/git" 41S:class-devupstream = "${WORKDIR}/git"
42SRCREV_FORMAT ?= "lttng_git" 42SRCREV_FORMAT ?= "lttng_git"
diff --git a/meta/recipes-kernel/lttng/lttng-platforms.inc b/meta/recipes-kernel/lttng/lttng-platforms.inc
index aa8220bbb4..933c65d85d 100644
--- a/meta/recipes-kernel/lttng/lttng-platforms.inc
+++ b/meta/recipes-kernel/lttng/lttng-platforms.inc
@@ -2,16 +2,16 @@
2# Whether the platform supports kernel tracing 2# Whether the platform supports kernel tracing
3# 3#
4LTTNGMODULES = "lttng-modules" 4LTTNGMODULES = "lttng-modules"
5LTTNGMODULES_arc = "" 5LTTNGMODULES:arc = ""
6LTTNGMODULES_riscv64 = "" 6LTTNGMODULES:riscv64 = ""
7 7
8COMPATIBLE_HOST_riscv64_pn-lttng-modules = "null" 8COMPATIBLE_HOST:riscv64:pn-lttng-modules = "null"
9COMPATIBLE_HOST_arc_pn-lttng-modules = "null" 9COMPATIBLE_HOST:arc:pn-lttng-modules = "null"
10 10
11# Whether the platform supports userspace tracing 11# Whether the platform supports userspace tracing
12# lttng-ust uses sched_getcpu() which is not there on for some platforms. 12# lttng-ust uses sched_getcpu() which is not there on for some platforms.
13LTTNGUST = "lttng-ust" 13LTTNGUST = "lttng-ust"
14LTTNGUST_arc = "" 14LTTNGUST:arc = ""
15 15
16COMPATIBLE_HOST_arc_pn-lttng-ust = "null" 16COMPATIBLE_HOST:arc:pn-lttng-ust = "null"
17 17
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
index 133d7561b8..dc2e1f3248 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.12.4.bb
@@ -13,13 +13,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=40ef17463fbd6f377db3c47b1cbaded8 \
13include lttng-platforms.inc 13include lttng-platforms.inc
14 14
15DEPENDS = "liburcu popt libxml2 util-linux" 15DEPENDS = "liburcu popt libxml2 util-linux"
16RDEPENDS_${PN} = "libgcc" 16RDEPENDS:${PN} = "libgcc"
17RRECOMMENDS_${PN} += "${LTTNGMODULES}" 17RRECOMMENDS:${PN} += "${LTTNGMODULES}"
18RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep" 18RDEPENDS:${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod ${LTTNGMODULES} sed python3-core grep"
19RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils" 19RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils"
20RDEPENDS_${PN}-ptest_append_libc-musl = " musl-utils" 20RDEPENDS:${PN}-ptest:append:libc-musl = " musl-utils"
21# babelstats.pl wants getopt-long 21# babelstats.pl wants getopt-long
22RDEPENDS_${PN}-ptest += "perl-module-getopt-long" 22RDEPENDS:${PN}-ptest += "perl-module-getopt-long"
23 23
24PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \ 24PYTHON_OPTION = "am_cv_python_pyexecdir='${PYTHON_SITEPACKAGES_DIR}' \
25 am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \ 25 am_cv_python_pythondir='${PYTHON_SITEPACKAGES_DIR}' \
@@ -43,26 +43,26 @@ SRC_URI[sha256sum] = "d729f8c2373a41194f171aeb0da0a9bb35ac181f31afa7e260786d19a5
43 43
44inherit autotools ptest pkgconfig useradd python3-dir manpages systemd 44inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
45 45
46SYSTEMD_SERVICE_${PN} = "lttng-sessiond.service" 46SYSTEMD_SERVICE:${PN} = "lttng-sessiond.service"
47SYSTEMD_AUTO_ENABLE = "disable" 47SYSTEMD_AUTO_ENABLE = "disable"
48 48
49USERADD_PACKAGES = "${PN}" 49USERADD_PACKAGES = "${PN}"
50GROUPADD_PARAM_${PN} = "tracing" 50GROUPADD_PARAM:${PN} = "tracing"
51 51
52FILES_${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \ 52FILES:${PN} += "${libdir}/lttng/libexec/* ${datadir}/xml/lttng \
53 ${PYTHON_SITEPACKAGES_DIR}/*" 53 ${PYTHON_SITEPACKAGES_DIR}/*"
54FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" 54FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a"
55FILES_${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la" 55FILES:${PN}-dev += "${PYTHON_SITEPACKAGES_DIR}/*.la"
56 56
57# Since files are installed into ${libdir}/lttng/libexec we match 57# Since files are installed into ${libdir}/lttng/libexec we match
58# the libexec insane test so skip it. 58# the libexec insane test so skip it.
59# Python module needs to keep _lttng.so 59# Python module needs to keep _lttng.so
60INSANE_SKIP_${PN} = "libexec dev-so" 60INSANE_SKIP:${PN} = "libexec dev-so"
61INSANE_SKIP_${PN}-dbg = "libexec" 61INSANE_SKIP:${PN}-dbg = "libexec"
62 62
63PRIVATE_LIBS_${PN}-ptest = "libfoo.so" 63PRIVATE_LIBS:${PN}-ptest = "libfoo.so"
64 64
65do_install_append () { 65do_install:append () {
66 # install systemd unit file 66 # install systemd unit file
67 install -d ${D}${systemd_unitdir}/system 67 install -d ${D}${systemd_unitdir}/system
68 install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_unitdir}/system 68 install -m 0644 ${WORKDIR}/lttng-sessiond.service ${D}${systemd_unitdir}/system
diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb b/meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb
index e340ff3460..54a473d2cb 100644
--- a/meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb
+++ b/meta/recipes-kernel/lttng/lttng-ust_2.12.2.bb
@@ -20,12 +20,12 @@ include lttng-platforms.inc
20EXTRA_OECONF = "--disable-numa" 20EXTRA_OECONF = "--disable-numa"
21 21
22DEPENDS = "liburcu util-linux" 22DEPENDS = "liburcu util-linux"
23RDEPENDS_${PN}-bin = "python3-core" 23RDEPENDS:${PN}-bin = "python3-core"
24 24
25# For backwards compatibility after rename 25# For backwards compatibility after rename
26RPROVIDES_${PN} = "lttng2-ust" 26RPROVIDES:${PN} = "lttng2-ust"
27RREPLACES_${PN} = "lttng2-ust" 27RREPLACES:${PN} = "lttng2-ust"
28RCONFLICTS_${PN} = "lttng2-ust" 28RCONFLICTS:${PN} = "lttng2-ust"
29 29
30PE = "2" 30PE = "2"
31 31
@@ -41,11 +41,11 @@ PACKAGECONFIG[examples] = "--enable-examples, --disable-examples,"
41PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native" 41PACKAGECONFIG[manpages] = "--enable-man-pages, --disable-man-pages, asciidoc-native xmlto-native libxslt-native"
42PACKAGECONFIG[python3-agent] = "--enable-python-agent ${PYTHON_OPTION}, --disable-python-agent, python3, python3" 42PACKAGECONFIG[python3-agent] = "--enable-python-agent ${PYTHON_OPTION}, --disable-python-agent, python3, python3"
43 43
44FILES_${PN} += " ${PYTHON_SITEPACKAGES_DIR}/*" 44FILES:${PN} += " ${PYTHON_SITEPACKAGES_DIR}/*"
45FILES_${PN}-staticdev += " ${PYTHON_SITEPACKAGES_DIR}/*.a" 45FILES:${PN}-staticdev += " ${PYTHON_SITEPACKAGES_DIR}/*.a"
46FILES_${PN}-dev += " ${PYTHON_SITEPACKAGES_DIR}/*.la" 46FILES:${PN}-dev += " ${PYTHON_SITEPACKAGES_DIR}/*.la"
47 47
48do_install_append() { 48do_install:append() {
49 # Patch python tools to use Python 3; they should be source compatible, but 49 # Patch python tools to use Python 3; they should be source compatible, but
50 # still refer to Python 2 in the shebang 50 # still refer to Python 2 in the shebang
51 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/lttng-gen-tp 51 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${bindir}/lttng-gen-tp
diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
index b2b50b9bcf..e5a1628898 100644
--- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
+++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}"
13do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot" 13do_configure[depends] += "virtual/kernel:do_shared_workdir openssl-native:do_populate_sysroot"
14do_compile[depends] += "virtual/kernel:do_compile_kernelmodules" 14do_compile[depends] += "virtual/kernel:do_compile_kernelmodules"
15 15
16RDEPENDS_${PN}-dev = "" 16RDEPENDS:${PN}-dev = ""
17 17
18DEPENDS += "bc-native bison-native" 18DEPENDS += "bc-native bison-native"
19DEPENDS += "gmp-native" 19DEPENDS += "gmp-native"
diff --git a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
index 97b4ddb88b..aa71309126 100644
--- a/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
+++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb
@@ -22,8 +22,8 @@ do_install () {
22 install -m 0755 ${WORKDIR}/modutils.sh ${D}${sysconfdir}/init.d/ 22 install -m 0755 ${WORKDIR}/modutils.sh ${D}${sysconfdir}/init.d/
23} 23}
24 24
25PACKAGE_WRITE_DEPS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" 25PACKAGE_WRITE_DEPS:append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
26pkg_postinst_${PN} () { 26pkg_postinst:${PN} () {
27 if type systemctl >/dev/null 2>/dev/null; then 27 if type systemctl >/dev/null 2>/dev/null; then
28 if [ -n "$D" ]; then 28 if [ -n "$D" ]; then
29 OPTS="--root=$D" 29 OPTS="--root=$D"
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index 99808d636b..8ebd7d7cb5 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -30,9 +30,9 @@ PACKAGECONFIG[cap] = ",,libcap"
30PACKAGECONFIG[coresight] = "CORESIGHT=1,,opencsd" 30PACKAGECONFIG[coresight] = "CORESIGHT=1,,opencsd"
31 31
32# libunwind is not yet ported for some architectures 32# libunwind is not yet ported for some architectures
33PACKAGECONFIG_remove_arc = "libunwind" 33PACKAGECONFIG:remove:arc = "libunwind"
34PACKAGECONFIG_remove_riscv64 = "libunwind" 34PACKAGECONFIG:remove:riscv64 = "libunwind"
35PACKAGECONFIG_remove_riscv32 = "libunwind" 35PACKAGECONFIG:remove:riscv32 = "libunwind"
36 36
37DEPENDS = " \ 37DEPENDS = " \
38 virtual/${MLPREFIX}libc \ 38 virtual/${MLPREFIX}libc \
@@ -110,7 +110,7 @@ EXTRA_OEMAKE += "\
110# that it has to be done this way rather than by passing -j1, since 110# that it has to be done this way rather than by passing -j1, since
111# perf's build system by default ignores any -j argument, but does 111# perf's build system by default ignores any -j argument, but does
112# honour a JOBS variable. 112# honour a JOBS variable.
113EXTRA_OEMAKE_append_task-configure = " JOBS=1" 113EXTRA_OEMAKE:append_task-configure = " JOBS=1"
114 114
115PERF_SRC ?= "Makefile \ 115PERF_SRC ?= "Makefile \
116 tools/arch \ 116 tools/arch \
@@ -127,8 +127,8 @@ PERF_SRC ?= "Makefile \
127PERF_EXTRA_LDFLAGS = "" 127PERF_EXTRA_LDFLAGS = ""
128 128
129# MIPS N32 129# MIPS N32
130PERF_EXTRA_LDFLAGS_mipsarchn32eb = "-m elf32btsmipn32" 130PERF_EXTRA_LDFLAGS:mipsarchn32eb = "-m elf32btsmipn32"
131PERF_EXTRA_LDFLAGS_mipsarchn32el = "-m elf32ltsmipn32" 131PERF_EXTRA_LDFLAGS:mipsarchn32el = "-m elf32ltsmipn32"
132 132
133do_compile() { 133do_compile() {
134 # Linux kernel build system is expected to do the right thing 134 # Linux kernel build system is expected to do the right thing
@@ -166,7 +166,7 @@ python copy_perf_source_from_kernel() {
166 bb.utils.copyfile(src, dest) 166 bb.utils.copyfile(src, dest)
167} 167}
168 168
169do_configure_prepend () { 169do_configure:prepend () {
170 # If building a multlib based perf, the incorrect library path will be 170 # If building a multlib based perf, the incorrect library path will be
171 # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit 171 # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit
172 # build, with a 64 bit multilib, the arch won't match and the detection of a 172 # build, with a 64 bit multilib, the arch won't match and the detection of a
@@ -311,7 +311,7 @@ do_configure_prepend () {
311 done 311 done
312} 312}
313 313
314python do_package_prepend() { 314python do_package:prepend() {
315 d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0]) 315 d.setVar('PKGV', d.getVar("KERNEL_VERSION").split("-")[0])
316} 316}
317 317
@@ -320,25 +320,25 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
320 320
321PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python" 321PACKAGES =+ "${PN}-archive ${PN}-tests ${PN}-perl ${PN}-python"
322 322
323RDEPENDS_${PN} += "elfutils bash" 323RDEPENDS:${PN} += "elfutils bash"
324RDEPENDS_${PN}-archive =+ "bash" 324RDEPENDS:${PN}-archive =+ "bash"
325RDEPENDS_${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}" 325RDEPENDS:${PN}-python =+ "bash python3 python3-modules ${@bb.utils.contains('PACKAGECONFIG', 'audit', 'audit-python', '', d)}"
326RDEPENDS_${PN}-perl =+ "bash perl perl-modules" 326RDEPENDS:${PN}-perl =+ "bash perl perl-modules"
327RDEPENDS_${PN}-tests =+ "python3 bash" 327RDEPENDS:${PN}-tests =+ "python3 bash"
328 328
329RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}-perl ${PN}-python', '',d)}" 329RSUGGESTS_SCRIPTING = "${@bb.utils.contains('PACKAGECONFIG', 'scripting', '${PN}-perl ${PN}-python', '',d)}"
330RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" 330RSUGGESTS:${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}"
331 331
332FILES_SOLIBSDEV = "" 332FILES_SOLIBSDEV = ""
333FILES_${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent ${libdir}/libperf-jvmti.so" 333FILES:${PN} += "${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent ${libdir}/libperf-jvmti.so"
334FILES_${PN}-archive = "${libdir}/perf/perf-core/perf-archive" 334FILES:${PN}-archive = "${libdir}/perf/perf-core/perf-archive"
335FILES_${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests" 335FILES:${PN}-tests = "${libdir}/perf/perf-core/tests ${libexecdir}/perf-core/tests"
336FILES_${PN}-python = " \ 336FILES:${PN}-python = " \
337 ${PYTHON_SITEPACKAGES_DIR} \ 337 ${PYTHON_SITEPACKAGES_DIR} \
338 ${libexecdir}/perf-core/scripts/python \ 338 ${libexecdir}/perf-core/scripts/python \
339 " 339 "
340FILES_${PN}-perl = "${libexecdir}/perf-core/scripts/perl" 340FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl"
341 341
342 342
343INHIBIT_PACKAGE_DEBUG_SPLIT="1" 343INHIBIT_PACKAGE_DEBUG_SPLIT="1"
344DEBUG_OPTIMIZATION_append = " -Wno-error=maybe-uninitialized" 344DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized"
diff --git a/meta/recipes-kernel/powertop/powertop_2.14.bb b/meta/recipes-kernel/powertop/powertop_2.14.bb
index cb7f3c4dc1..c176cba388 100644
--- a/meta/recipes-kernel/powertop/powertop_2.14.bb
+++ b/meta/recipes-kernel/powertop/powertop_2.14.bb
@@ -13,12 +13,12 @@ SRCREV = "52f022f9bbe6e060fba11701d657a8d9762702ba"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15
16LDFLAGS_append = " -pthread" 16LDFLAGS:append = " -pthread"
17 17
18inherit autotools gettext pkgconfig bash-completion 18inherit autotools gettext pkgconfig bash-completion
19 19
20inherit update-alternatives 20inherit update-alternatives
21ALTERNATIVE_${PN} = "powertop" 21ALTERNATIVE:${PN} = "powertop"
22ALTERNATIVE_TARGET[powertop] = "${sbindir}/powertop" 22ALTERNATIVE_TARGET[powertop] = "${sbindir}/powertop"
23ALTERNATIVE_LINK_NAME[powertop] = "${sbindir}/powertop" 23ALTERNATIVE_LINK_NAME[powertop] = "${sbindir}/powertop"
24ALTERNATIVE_PRIORITY = "100" 24ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
index 6ee0be5e3e..2181e45a8d 100644
--- a/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap-uprobes_git.bb
@@ -5,13 +5,13 @@ require systemtap_git.inc
5DEPENDS = "systemtap virtual/kernel" 5DEPENDS = "systemtap virtual/kernel"
6 6
7# On systems without CONFIG_UTRACE, this package is empty. 7# On systems without CONFIG_UTRACE, this package is empty.
8ALLOW_EMPTY_${PN} = "1" 8ALLOW_EMPTY:${PN} = "1"
9 9
10inherit module-base gettext 10inherit module-base gettext
11 11
12FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:" 12FILESEXTRAPATHS =. "${FILE_DIRNAME}/systemtap:"
13 13
14FILES_${PN} += "${datadir}/systemtap/runtime/uprobes" 14FILES:${PN} += "${datadir}/systemtap/runtime/uprobes"
15 15
16# Compile and install the uprobes kernel module on machines with utrace 16# Compile and install the uprobes kernel module on machines with utrace
17# support. Note that staprun expects it in the systemtap/runtime directory, 17# support. Note that staprun expects it in the systemtap/runtime directory,
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index c4a6eef59a..8161a448c8 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -33,46 +33,46 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3-probes', 'distutils3-base
33 33
34# exporter comes with python3-probes 34# exporter comes with python3-probes
35PACKAGES =+ "${PN}-exporter" 35PACKAGES =+ "${PN}-exporter"
36FILES_${PN}-exporter = "${sysconfdir}/stap-exporter/* \ 36FILES:${PN}-exporter = "${sysconfdir}/stap-exporter/* \
37 ${sysconfdir}/sysconfig/stap-exporter \ 37 ${sysconfdir}/sysconfig/stap-exporter \
38 ${systemd_unitdir}/system/stap-exporter.service \ 38 ${systemd_unitdir}/system/stap-exporter.service \
39 ${sbindir}/stap-exporter" 39 ${sbindir}/stap-exporter"
40RDEPENDS_${PN}-exporter = "${PN} python3-core python3-netclient" 40RDEPENDS:${PN}-exporter = "${PN} python3-core python3-netclient"
41SYSTEMD_SERVICE_${PN}-exporter = "stap-exporter.service" 41SYSTEMD_SERVICE:${PN}-exporter = "stap-exporter.service"
42 42
43PACKAGES =+ "${PN}-runtime" 43PACKAGES =+ "${PN}-runtime"
44FILES_${PN}-runtime = "\ 44FILES:${PN}-runtime = "\
45 ${bindir}/staprun \ 45 ${bindir}/staprun \
46 ${bindir}/stap-merge \ 46 ${bindir}/stap-merge \
47 ${bindir}/stapsh \ 47 ${bindir}/stapsh \
48 ${libexecdir}/${BPN}/stapio \ 48 ${libexecdir}/${BPN}/stapio \
49" 49"
50RDEPENDS_${PN}_class-target += "${PN}-runtime" 50RDEPENDS:${PN}:class-target += "${PN}-runtime"
51 51
52PACKAGES =+ "${PN}-examples" 52PACKAGES =+ "${PN}-examples"
53FILES_${PN}-examples = "${datadir}/${BPN}/examples/" 53FILES:${PN}-examples = "${datadir}/${BPN}/examples/"
54RDEPENDS_${PN}-examples += "${PN}" 54RDEPENDS:${PN}-examples += "${PN}"
55 55
56# don't complain that some examples involve bash, perl, php... 56# don't complain that some examples involve bash, perl, php...
57INSANE_SKIP_${PN}-examples += "file-rdeps" 57INSANE_SKIP:${PN}-examples += "file-rdeps"
58 58
59PACKAGES =+ "${PN}-python" 59PACKAGES =+ "${PN}-python"
60FILES_${PN}-python += "\ 60FILES:${PN}-python += "\
61 ${bindir}/dtrace \ 61 ${bindir}/dtrace \
62 ${libdir}/python*/ \ 62 ${libdir}/python*/ \
63 ${libexecdir}/${BPN}/python/ \ 63 ${libexecdir}/${BPN}/python/ \
64" 64"
65# python material requires sdt headers 65# python material requires sdt headers
66RDEPENDS_${PN}-python += "${PN}-dev python3-core" 66RDEPENDS:${PN}-python += "${PN}-dev python3-core"
67INSANE_SKIP_${PN}-python += "dev-deps" 67INSANE_SKIP:${PN}-python += "dev-deps"
68 68
69do_configure_prepend () { 69do_configure:prepend () {
70 # Improve reproducibility for c++ object files 70 # Improve reproducibility for c++ object files
71 reltivepath="${@os.path.relpath(d.getVar('STAGING_INCDIR'), d.getVar('S'))}" 71 reltivepath="${@os.path.relpath(d.getVar('STAGING_INCDIR'), d.getVar('S'))}"
72 sed -i "s:@RELATIVE_STAGING_INCDIR@:$reltivepath:g" ${S}/stringtable.h 72 sed -i "s:@RELATIVE_STAGING_INCDIR@:$reltivepath:g" ${S}/stringtable.h
73} 73}
74 74
75do_install_append () { 75do_install:append () {
76 if [ ! -f ${D}${bindir}/stap ]; then 76 if [ ! -f ${D}${bindir}/stap ]; then
77 # translator disabled case, need to leave only minimal runtime 77 # translator disabled case, need to leave only minimal runtime
78 rm -rf ${D}${datadir}/${PN} 78 rm -rf ${D}${datadir}/${PN}
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index dc046a679c..97d4435f82 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -11,7 +11,7 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \
11 " 11 "
12 12
13COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux' 13COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64|microblazeel|mips).*-linux'
14COMPATIBLE_HOST_libc-musl = 'null' 14COMPATIBLE_HOST:libc-musl = 'null'
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.04.21.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.04.21.bb
index f79c0b29ea..7b54d8c059 100644
--- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.04.21.bb
+++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2021.04.21.bb
@@ -24,9 +24,9 @@ do_install() {
24# For kernel <= v4.14, inherit the kernel_wireless_regdb.bbclass 24# For kernel <= v4.14, inherit the kernel_wireless_regdb.bbclass
25# (in meta-networking) in kernel's recipe. 25# (in meta-networking) in kernel's recipe.
26PACKAGES = "${PN}-static ${PN}" 26PACKAGES = "${PN}-static ${PN}"
27RCONFLICTS_${PN} = "${PN}-static" 27RCONFLICTS:${PN} = "${PN}-static"
28 28
29FILES_${PN}-static = " \ 29FILES:${PN}-static = " \
30 ${nonarch_base_libdir}/firmware/regulatory.db \ 30 ${nonarch_base_libdir}/firmware/regulatory.db \
31 ${nonarch_base_libdir}/firmware/regulatory.db.p7s \ 31 ${nonarch_base_libdir}/firmware/regulatory.db.p7s \
32" 32"
@@ -34,10 +34,10 @@ FILES_${PN}-static = " \
34# Native users might want to use the source of regulatory DB. 34# Native users might want to use the source of regulatory DB.
35# This is for example used by Linux kernel <= v4.14 and 35# This is for example used by Linux kernel <= v4.14 and
36# kernel_wireless_regdb.bbclass in meta-networking. 36# kernel_wireless_regdb.bbclass in meta-networking.
37do_install_append_class-native() { 37do_install:append:class-native() {
38 install -m 0644 -D db.txt ${D}${libdir}/crda/db.txt 38 install -m 0644 -D db.txt ${D}${libdir}/crda/db.txt
39} 39}
40 40
41RSUGGESTS_${PN} = "crda" 41RSUGGESTS:${PN} = "crda"
42 42
43BBCLASSEXTEND = "native" 43BBCLASSEXTEND = "native"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-03-01 20:36:35 +0000