diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-kernel/linux | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-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/linux')
-rw-r--r-- | meta/recipes-kernel/linux/kernel-devsrc.bb | 16 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-dummy.bb | 12 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-dev.bb | 16 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 14 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.13.bb | 14 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 14 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.13.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto.inc | 28 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 56 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.13.bb | 62 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.4.bb | 52 |
13 files changed, 151 insertions, 151 deletions
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 |
316 | do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock" | 316 | do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock" |
317 | 317 | ||
318 | FILES_${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}" | 318 | FILES:${PN} = "${KERNEL_BUILD_ROOT} ${KERNEL_SRC_PATH}" |
319 | FILES_${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*" | 319 | FILES:${PN}-dbg += "${KERNEL_BUILD_ROOT}*/build/scripts/*/.debug/*" |
320 | 320 | ||
321 | RDEPENDS_${PN} = "bc python3 flex bison ${TCLIBC}-utils" | 321 | RDEPENDS:${PN} = "bc python3 flex bison ${TCLIBC}-utils" |
322 | # 4.15+ needs these next two RDEPENDS | 322 | # 4.15+ needs these next two RDEPENDS |
323 | RDEPENDS_${PN} += "openssl-dev util-linux" | 323 | RDEPENDS:${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+ |
325 | RDEPENDS_${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}" | 325 | RDEPENDS:${PN} += "${@bb.utils.contains('ARCH', 'x86', 'elfutils', '', d)}" |
326 | # 5.8+ needs gcc-plugins libmpc-dev | 326 | # 5.8+ needs gcc-plugins libmpc-dev |
327 | RDEPENDS_${PN} += "gcc-plugins libmpc-dev" | 327 | RDEPENDS:${PN} += "gcc-plugins libmpc-dev" |
328 | # 5.13+ needs awk for arm64 | 328 | # 5.13+ needs awk for arm64 |
329 | RDEPENDS_${PN}_append_aarch64 = " gawk" | 329 | RDEPENDS:${PN}:append:aarch64 = " gawk" |
330 | # 5.13+ needs grep for powerpc | 330 | # 5.13+ needs grep for powerpc |
331 | RDEPENDS_${PN}_append_powerpc = " grep" | 331 | RDEPENDS:${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-.*" | |||
16 | PACKAGES_DYNAMIC += "^kernel-firmware-.*" | 16 | PACKAGES_DYNAMIC += "^kernel-firmware-.*" |
17 | 17 | ||
18 | PACKAGES += "kernel-modules kernel-vmlinux" | 18 | PACKAGES += "kernel-modules kernel-vmlinux" |
19 | FILES_kernel-modules = "" | 19 | FILES:kernel-modules = "" |
20 | ALLOW_EMPTY_kernel-modules = "1" | 20 | ALLOW_EMPTY:kernel-modules = "1" |
21 | DESCRIPTION_kernel-modules = "Kernel modules meta package" | 21 | DESCRIPTION:kernel-modules = "Kernel modules meta package" |
22 | FILES_kernel-vmlinux = "" | 22 | FILES:kernel-vmlinux = "" |
23 | ALLOW_EMPTY_kernel-vmlinux = "1" | 23 | ALLOW_EMPTY:kernel-vmlinux = "1" |
24 | DESCRIPTION_kernel-vmlinux = "Kernel vmlinux meta package" | 24 | DESCRIPTION:kernel-vmlinux = "Kernel vmlinux meta package" |
25 | 25 | ||
26 | 26 | ||
27 | INHIBIT_DEFAULT_DEPS = "1" | 27 | INHIBIT_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 | ||
42 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)" | 42 | COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64)" |
43 | 43 | ||
44 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 44 | KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" |
45 | 45 | ||
46 | # Functionality flags | 46 | # Functionality flags |
47 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" | 47 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" |
48 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | 48 | KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" |
49 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | 49 | KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" |
50 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | 50 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" |
51 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | 51 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" |
52 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" | 52 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" |
53 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 53 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" |
54 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" | 54 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" |
55 | 55 | ||
56 | KERNEL_VERSION_SANITY_SKIP = "1" | 56 | KERNEL_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 | ||
34 | COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" | 34 | COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" |
35 | 35 | ||
36 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 36 | KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" |
37 | 37 | ||
38 | # Functionality flags | 38 | # Functionality flags |
39 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" | 39 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" |
40 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | 40 | KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" |
41 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | 41 | KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" |
42 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | 42 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" |
43 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | 43 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" |
44 | KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 44 | KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" |
45 | KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" | 45 | KERNEL_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 | ||
34 | COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" | 34 | COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" |
35 | 35 | ||
36 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 36 | KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" |
37 | 37 | ||
38 | # Functionality flags | 38 | # Functionality flags |
39 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" | 39 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" |
40 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | 40 | KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" |
41 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | 41 | KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" |
42 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | 42 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" |
43 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | 43 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" |
44 | KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 44 | KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" |
45 | KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" | 45 | KERNEL_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 | ||
34 | COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" | 34 | COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm|qemuarmv5|qemuarm64|qemuppc|qemumips)" |
35 | 35 | ||
36 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 36 | KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" |
37 | 37 | ||
38 | # Functionality flags | 38 | # Functionality flags |
39 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" | 39 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc features/taskstats/taskstats.scc" |
40 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | 40 | KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" |
41 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | 41 | KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" |
42 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | 42 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" |
43 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | 43 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" |
44 | KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 44 | KERNEL_FEATURES:append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" |
45 | KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" | 45 | KERNEL_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 @@ | |||
1 | KBRANCH ?= "v5.10/standard/tiny/base" | 1 | KBRANCH ?= "v5.10/standard/tiny/base" |
2 | KBRANCH_qemuarm ?= "v5.10/standard/tiny/arm-versatile-926ejs" | 2 | KBRANCH:qemuarm ?= "v5.10/standard/tiny/arm-versatile-926ejs" |
3 | 3 | ||
4 | LINUX_KERNEL_TYPE = "tiny" | 4 | LINUX_KERNEL_TYPE = "tiny" |
5 | KCONFIG_MODE = "--allnoconfig" | 5 | KCONFIG_MODE = "--allnoconfig" |
@@ -15,7 +15,7 @@ DEPENDS += "openssl-native util-linux-native" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "faa3b7802d0ee1fe0217283ecaf2c54c9503fa20" | 18 | SRCREV_machine:qemuarm ?= "faa3b7802d0ee1fe0217283ecaf2c54c9503fa20" |
19 | SRCREV_machine ?= "240422889570d39c3f7d63808159c8e743117a1d" | 19 | SRCREV_machine ?= "240422889570d39c3f7d63808159c8e743117a1d" |
20 | SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" | 20 | SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" |
21 | 21 | ||
@@ -29,4 +29,4 @@ COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" | |||
29 | # Functionality flags | 29 | # Functionality flags |
30 | KERNEL_FEATURES = "" | 30 | KERNEL_FEATURES = "" |
31 | 31 | ||
32 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 32 | KERNEL_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 @@ | |||
1 | KBRANCH ?= "v5.13/standard/tiny/base" | 1 | KBRANCH ?= "v5.13/standard/tiny/base" |
2 | KBRANCH_qemuarm ?= "v5.13/standard/tiny/arm-versatile-926ejs" | 2 | KBRANCH:qemuarm ?= "v5.13/standard/tiny/arm-versatile-926ejs" |
3 | 3 | ||
4 | LINUX_KERNEL_TYPE = "tiny" | 4 | LINUX_KERNEL_TYPE = "tiny" |
5 | KCONFIG_MODE = "--allnoconfig" | 5 | KCONFIG_MODE = "--allnoconfig" |
@@ -15,7 +15,7 @@ DEPENDS += "openssl-native util-linux-native" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "e394a72e8bc77484bf7bae8c842c75b23cc3dd63" | 18 | SRCREV_machine:qemuarm ?= "e394a72e8bc77484bf7bae8c842c75b23cc3dd63" |
19 | SRCREV_machine ?= "7275d462cec720120d1767e277a2525d88901c80" | 19 | SRCREV_machine ?= "7275d462cec720120d1767e277a2525d88901c80" |
20 | SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d" | 20 | SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d" |
21 | 21 | ||
@@ -29,4 +29,4 @@ COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" | |||
29 | # Functionality flags | 29 | # Functionality flags |
30 | KERNEL_FEATURES = "" | 30 | KERNEL_FEATURES = "" |
31 | 31 | ||
32 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 32 | KERNEL_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 @@ | |||
1 | KBRANCH ?= "v5.4/standard/tiny/base" | 1 | KBRANCH ?= "v5.4/standard/tiny/base" |
2 | KBRANCH_qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" | 2 | KBRANCH:qemuarm ?= "v5.4/standard/tiny/arm-versatile-926ejs" |
3 | 3 | ||
4 | LINUX_KERNEL_TYPE = "tiny" | 4 | LINUX_KERNEL_TYPE = "tiny" |
5 | KCONFIG_MODE = "--allnoconfig" | 5 | KCONFIG_MODE = "--allnoconfig" |
@@ -15,7 +15,7 @@ DEPENDS += "openssl-native util-linux-native" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "86c31c51c87557af60e4d4dbee73f18618bc4c92" | 18 | SRCREV_machine:qemuarm ?= "86c31c51c87557af60e4d4dbee73f18618bc4c92" |
19 | SRCREV_machine ?= "bf89a54b3f77fbac15dd0194870db288aee5c8b7" | 19 | SRCREV_machine ?= "bf89a54b3f77fbac15dd0194870db288aee5c8b7" |
20 | SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" | 20 | SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" |
21 | 21 | ||
@@ -29,4 +29,4 @@ COMPATIBLE_MACHINE = "qemux86|qemux86-64|qemuarm|qemuarmv5" | |||
29 | # Functionality flags | 29 | # Functionality flags |
30 | KERNEL_FEATURES = "" | 30 | KERNEL_FEATURES = "" |
31 | 31 | ||
32 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 32 | KERNEL_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 | ||
21 | DEPENDS += "xz-native bc-native" | 21 | DEPENDS += "xz-native bc-native" |
22 | DEPENDS_append_aarch64 = " libgcc" | 22 | DEPENDS:append:aarch64 = " libgcc" |
23 | KERNEL_CC_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" | 23 | KERNEL_CC:append:aarch64 = " ${TOOLCHAIN_OPTIONS}" |
24 | KERNEL_LD_append_aarch64 = " ${TOOLCHAIN_OPTIONS}" | 24 | KERNEL_LD:append:aarch64 = " ${TOOLCHAIN_OPTIONS}" |
25 | 25 | ||
26 | DEPENDS_append_nios2 = " libgcc" | 26 | DEPENDS:append:nios2 = " libgcc" |
27 | KERNEL_CC_append_nios2 = " ${TOOLCHAIN_OPTIONS}" | 27 | KERNEL_CC:append:nios2 = " ${TOOLCHAIN_OPTIONS}" |
28 | KERNEL_LD_append_nios2 = " ${TOOLCHAIN_OPTIONS}" | 28 | KERNEL_LD:append:nios2 = " ${TOOLCHAIN_OPTIONS}" |
29 | 29 | ||
30 | DEPENDS_append_arc = " libgcc" | 30 | DEPENDS:append:arc = " libgcc" |
31 | KERNEL_CC_append_arc = " ${TOOLCHAIN_OPTIONS}" | 31 | KERNEL_CC:append:arc = " ${TOOLCHAIN_OPTIONS}" |
32 | KERNEL_LD_append_arc = " ${TOOLCHAIN_OPTIONS}" | 32 | KERNEL_LD:append:arc = " ${TOOLCHAIN_OPTIONS}" |
33 | 33 | ||
34 | KERNEL_FEATURES_append_qemuall=" features/debug/printk.scc" | 34 | KERNEL_FEATURES:append:qemuall=" features/debug/printk.scc" |
35 | 35 | ||
36 | KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'features/numa/numa.scc', '', d)}" | 36 | KERNEL_FEATURES:append = " ${@bb.utils.contains('MACHINE_FEATURES', 'numa', 'features/numa/numa.scc', '', d)}" |
37 | KERNEL_FEATURES_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'vfat', 'cfg/fs/vfat.scc', '', d)}" | 37 | KERNEL_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 | ||
50 | B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build" | 50 | B = "${WORKDIR}/linux-${PACKAGE_ARCH}-${LINUX_KERNEL_TYPE}-build" |
51 | 51 | ||
52 | do_install_append(){ | 52 | do_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 |
59 | KERNEL_FEATURES_append_qemuall=" features/kernel-sample/kernel-sample.scc" | 59 | KERNEL_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" | |||
3 | require recipes-kernel/linux/linux-yocto.inc | 3 | require recipes-kernel/linux/linux-yocto.inc |
4 | 4 | ||
5 | # board specific branches | 5 | # board specific branches |
6 | KBRANCH_qemuarm ?= "v5.10/standard/arm-versatile-926ejs" | 6 | KBRANCH:qemuarm ?= "v5.10/standard/arm-versatile-926ejs" |
7 | KBRANCH_qemuarm64 ?= "v5.10/standard/qemuarm64" | 7 | KBRANCH:qemuarm64 ?= "v5.10/standard/qemuarm64" |
8 | KBRANCH_qemumips ?= "v5.10/standard/mti-malta32" | 8 | KBRANCH:qemumips ?= "v5.10/standard/mti-malta32" |
9 | KBRANCH_qemuppc ?= "v5.10/standard/qemuppc" | 9 | KBRANCH:qemuppc ?= "v5.10/standard/qemuppc" |
10 | KBRANCH_qemuriscv64 ?= "v5.10/standard/base" | 10 | KBRANCH:qemuriscv64 ?= "v5.10/standard/base" |
11 | KBRANCH_qemuriscv32 ?= "v5.10/standard/base" | 11 | KBRANCH:qemuriscv32 ?= "v5.10/standard/base" |
12 | KBRANCH_qemux86 ?= "v5.10/standard/base" | 12 | KBRANCH:qemux86 ?= "v5.10/standard/base" |
13 | KBRANCH_qemux86-64 ?= "v5.10/standard/base" | 13 | KBRANCH:qemux86-64 ?= "v5.10/standard/base" |
14 | KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" | 14 | KBRANCH:qemumips64 ?= "v5.10/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine_qemuarm ?= "96a6083817785461bcabad63f3872d0a08b21c29" | 16 | SRCREV_machine:qemuarm ?= "96a6083817785461bcabad63f3872d0a08b21c29" |
17 | SRCREV_machine_qemuarm64 ?= "c8d8b20a749f476020d0844d76f63cd9e4cca644" | 17 | SRCREV_machine:qemuarm64 ?= "c8d8b20a749f476020d0844d76f63cd9e4cca644" |
18 | SRCREV_machine_qemumips ?= "acdebd5080a846f3906ba1d5343d5af5c4b76522" | 18 | SRCREV_machine:qemumips ?= "acdebd5080a846f3906ba1d5343d5af5c4b76522" |
19 | SRCREV_machine_qemuppc ?= "afd31d567447f4693b7c9af35f09bb37cc0c0fa4" | 19 | SRCREV_machine:qemuppc ?= "afd31d567447f4693b7c9af35f09bb37cc0c0fa4" |
20 | SRCREV_machine_qemuriscv64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" | 20 | SRCREV_machine:qemuriscv64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" |
21 | SRCREV_machine_qemuriscv32 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" | 21 | SRCREV_machine:qemuriscv32 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" |
22 | SRCREV_machine_qemux86 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" | 22 | SRCREV_machine:qemux86 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" |
23 | SRCREV_machine_qemux86-64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" | 23 | SRCREV_machine:qemux86-64 ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" |
24 | SRCREV_machine_qemumips64 ?= "efad0ca4150cddffa6d052ffb53fec0553de4da8" | 24 | SRCREV_machine:qemumips64 ?= "efad0ca4150cddffa6d052ffb53fec0553de4da8" |
25 | SRCREV_machine ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" | 25 | SRCREV_machine ?= "c2dc854ee7392d43728093bfc206a2ade98c76dd" |
26 | SRCREV_meta ?= "c3900f83a5679b563adff82c24fdeb02096ed736" | 26 | SRCREV_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 | ||
31 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 31 | SRC_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}" | |||
43 | KMETA = "kernel-meta" | 43 | KMETA = "kernel-meta" |
44 | KCONF_BSP_AUDIT_LEVEL = "1" | 44 | KCONF_BSP_AUDIT_LEVEL = "1" |
45 | 45 | ||
46 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 46 | KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" |
47 | 47 | ||
48 | COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32" | 48 | COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32" |
49 | 49 | ||
50 | # Functionality flags | 50 | # Functionality flags |
51 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" | 51 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" |
52 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | 52 | KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" |
53 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | 53 | KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" |
54 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | 54 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" |
55 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | 55 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" |
56 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" | 56 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" |
57 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 57 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" |
58 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" | 58 | KERNEL_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" | |||
3 | require recipes-kernel/linux/linux-yocto.inc | 3 | require recipes-kernel/linux/linux-yocto.inc |
4 | 4 | ||
5 | # board specific branches | 5 | # board specific branches |
6 | KBRANCH_qemuarm ?= "v5.13/standard/arm-versatile-926ejs" | 6 | KBRANCH:qemuarm ?= "v5.13/standard/arm-versatile-926ejs" |
7 | KBRANCH_qemuarm64 ?= "v5.13/standard/qemuarm64" | 7 | KBRANCH:qemuarm64 ?= "v5.13/standard/qemuarm64" |
8 | KBRANCH_qemumips ?= "v5.13/standard/mti-malta32" | 8 | KBRANCH:qemumips ?= "v5.13/standard/mti-malta32" |
9 | KBRANCH_qemuppc ?= "v5.13/standard/qemuppc" | 9 | KBRANCH:qemuppc ?= "v5.13/standard/qemuppc" |
10 | KBRANCH_qemuriscv64 ?= "v5.13/standard/base" | 10 | KBRANCH:qemuriscv64 ?= "v5.13/standard/base" |
11 | KBRANCH_qemuriscv32 ?= "v5.13/standard/base" | 11 | KBRANCH:qemuriscv32 ?= "v5.13/standard/base" |
12 | KBRANCH_qemux86 ?= "v5.13/standard/base" | 12 | KBRANCH:qemux86 ?= "v5.13/standard/base" |
13 | KBRANCH_qemux86-64 ?= "v5.13/standard/base" | 13 | KBRANCH:qemux86-64 ?= "v5.13/standard/base" |
14 | KBRANCH_qemumips64 ?= "v5.13/standard/mti-malta64" | 14 | KBRANCH:qemumips64 ?= "v5.13/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine_qemuarm ?= "dc19ba17f4d43a220ae8129312703add02d03d1e" | 16 | SRCREV_machine:qemuarm ?= "dc19ba17f4d43a220ae8129312703add02d03d1e" |
17 | SRCREV_machine_qemuarm64 ?= "1e086c08b65e8bd1f45f01fd8026599a62deb6c0" | 17 | SRCREV_machine:qemuarm64 ?= "1e086c08b65e8bd1f45f01fd8026599a62deb6c0" |
18 | SRCREV_machine_qemumips ?= "4dd19bc8178a6100a2cb9ffd8364e359230253c8" | 18 | SRCREV_machine:qemumips ?= "4dd19bc8178a6100a2cb9ffd8364e359230253c8" |
19 | SRCREV_machine_qemuppc ?= "73c8e406db9beb3a99a5dd3ea67824f0e3c0d7a8" | 19 | SRCREV_machine:qemuppc ?= "73c8e406db9beb3a99a5dd3ea67824f0e3c0d7a8" |
20 | SRCREV_machine_qemuriscv64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" | 20 | SRCREV_machine:qemuriscv64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" |
21 | SRCREV_machine_qemuriscv32 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" | 21 | SRCREV_machine:qemuriscv32 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" |
22 | SRCREV_machine_qemux86 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" | 22 | SRCREV_machine:qemux86 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" |
23 | SRCREV_machine_qemux86-64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" | 23 | SRCREV_machine:qemux86-64 ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" |
24 | SRCREV_machine_qemumips64 ?= "0632623fd488acc7c78a4f48d4630caba5e6044e" | 24 | SRCREV_machine:qemumips64 ?= "0632623fd488acc7c78a4f48d4630caba5e6044e" |
25 | SRCREV_machine ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" | 25 | SRCREV_machine ?= "5e41c505c6057535da2c289d2cc2fec1f64a5068" |
26 | SRCREV_meta ?= "ab5f1940535350791d2e111e0e16b08be277568d" | 26 | SRCREV_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. |
32 | BBCLASSEXTEND = "devupstream:target" | 32 | BBCLASSEXTEND = "devupstream:target" |
33 | DEFAULT_PREFERENCE_class-devupstream = "-1" | 33 | DEFAULT_PREFERENCE:class-devupstream = "-1" |
34 | SRCREV_machine_class-devupstream ?= "64376a981a0e2e57c46efa63197c2ebb7dab35df" | 34 | SRCREV_machine:class-devupstream ?= "64376a981a0e2e57c46efa63197c2ebb7dab35df" |
35 | PN_class-devupstream = "linux-yocto-upstream" | 35 | PN:class-devupstream = "linux-yocto-upstream" |
36 | KBRANCH_class-devupstream = "v5.13/base" | 36 | KBRANCH: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 | ||
41 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 41 | SRC_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}" | |||
53 | KMETA = "kernel-meta" | 53 | KMETA = "kernel-meta" |
54 | KCONF_BSP_AUDIT_LEVEL = "1" | 54 | KCONF_BSP_AUDIT_LEVEL = "1" |
55 | 55 | ||
56 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 56 | KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" |
57 | 57 | ||
58 | COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32" | 58 | COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemuppc64|qemumips|qemumips64|qemux86-64|qemuriscv64|qemuriscv32" |
59 | 59 | ||
60 | # Functionality flags | 60 | # Functionality flags |
61 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" | 61 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" |
62 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | 62 | KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" |
63 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | 63 | KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" |
64 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | 64 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" |
65 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | 65 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" |
66 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" | 66 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" |
67 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 67 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" |
68 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" | 68 | KERNEL_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" | |||
3 | require recipes-kernel/linux/linux-yocto.inc | 3 | require recipes-kernel/linux/linux-yocto.inc |
4 | 4 | ||
5 | # board specific branches | 5 | # board specific branches |
6 | KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" | 6 | KBRANCH:qemuarm ?= "v5.4/standard/arm-versatile-926ejs" |
7 | KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" | 7 | KBRANCH:qemuarm64 ?= "v5.4/standard/qemuarm64" |
8 | KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" | 8 | KBRANCH:qemumips ?= "v5.4/standard/mti-malta32" |
9 | KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" | 9 | KBRANCH:qemuppc ?= "v5.4/standard/qemuppc" |
10 | KBRANCH_qemuriscv64 ?= "v5.4/standard/base" | 10 | KBRANCH:qemuriscv64 ?= "v5.4/standard/base" |
11 | KBRANCH_qemux86 ?= "v5.4/standard/base" | 11 | KBRANCH:qemux86 ?= "v5.4/standard/base" |
12 | KBRANCH_qemux86-64 ?= "v5.4/standard/base" | 12 | KBRANCH:qemux86-64 ?= "v5.4/standard/base" |
13 | KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" | 13 | KBRANCH:qemumips64 ?= "v5.4/standard/mti-malta64" |
14 | 14 | ||
15 | SRCREV_machine_qemuarm ?= "bea52ab7529ef152f99a0f6ebd97cc7e904e5360" | 15 | SRCREV_machine:qemuarm ?= "bea52ab7529ef152f99a0f6ebd97cc7e904e5360" |
16 | SRCREV_machine_qemuarm64 ?= "8a29c9de0fc366bd89ce6954685dce0e330dbabe" | 16 | SRCREV_machine:qemuarm64 ?= "8a29c9de0fc366bd89ce6954685dce0e330dbabe" |
17 | SRCREV_machine_qemumips ?= "b15816ccad0762d27c78c269e7a1986504e60c63" | 17 | SRCREV_machine:qemumips ?= "b15816ccad0762d27c78c269e7a1986504e60c63" |
18 | SRCREV_machine_qemuppc ?= "906f9509a8d2f842ec8766bf81287f8939ff1fa8" | 18 | SRCREV_machine:qemuppc ?= "906f9509a8d2f842ec8766bf81287f8939ff1fa8" |
19 | SRCREV_machine_qemuriscv64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" | 19 | SRCREV_machine:qemuriscv64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" |
20 | SRCREV_machine_qemux86 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" | 20 | SRCREV_machine:qemux86 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" |
21 | SRCREV_machine_qemux86-64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" | 21 | SRCREV_machine:qemux86-64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" |
22 | SRCREV_machine_qemumips64 ?= "152e33a0782920e9707c36ccacf53585a8911e9f" | 22 | SRCREV_machine:qemumips64 ?= "152e33a0782920e9707c36ccacf53585a8911e9f" |
23 | SRCREV_machine ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" | 23 | SRCREV_machine ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" |
24 | SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" | 24 | SRCREV_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 | ||
29 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ | 29 | SRC_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}" | |||
40 | KMETA = "kernel-meta" | 40 | KMETA = "kernel-meta" |
41 | KCONF_BSP_AUDIT_LEVEL = "1" | 41 | KCONF_BSP_AUDIT_LEVEL = "1" |
42 | 42 | ||
43 | KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" | 43 | KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" |
44 | 44 | ||
45 | COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" | 45 | COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" |
46 | 46 | ||
47 | # Functionality flags | 47 | # Functionality flags |
48 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" | 48 | KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" |
49 | KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" | 49 | KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" |
50 | KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" | 50 | KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" |
51 | KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" | 51 | KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" |
52 | KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" | 52 | KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" |
53 | KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" | 53 | KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" |
54 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" | 54 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" |
55 | KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" | 55 | KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" |