From 42344347be29f0997cc2f7636d9603b1fe1875ae Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 28 Jul 2021 23:28:15 +0100 Subject: Convert to new override syntax This is the result of automated script conversion: scripts/contrib/convert-overrides.py converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 52 ++++++++++++++-------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to 'meta/recipes-kernel/linux/linux-yocto_5.4.bb') 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" require recipes-kernel/linux/linux-yocto.inc # board specific branches -KBRANCH_qemuarm ?= "v5.4/standard/arm-versatile-926ejs" -KBRANCH_qemuarm64 ?= "v5.4/standard/qemuarm64" -KBRANCH_qemumips ?= "v5.4/standard/mti-malta32" -KBRANCH_qemuppc ?= "v5.4/standard/qemuppc" -KBRANCH_qemuriscv64 ?= "v5.4/standard/base" -KBRANCH_qemux86 ?= "v5.4/standard/base" -KBRANCH_qemux86-64 ?= "v5.4/standard/base" -KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" - -SRCREV_machine_qemuarm ?= "bea52ab7529ef152f99a0f6ebd97cc7e904e5360" -SRCREV_machine_qemuarm64 ?= "8a29c9de0fc366bd89ce6954685dce0e330dbabe" -SRCREV_machine_qemumips ?= "b15816ccad0762d27c78c269e7a1986504e60c63" -SRCREV_machine_qemuppc ?= "906f9509a8d2f842ec8766bf81287f8939ff1fa8" -SRCREV_machine_qemuriscv64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" -SRCREV_machine_qemux86 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" -SRCREV_machine_qemux86-64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" -SRCREV_machine_qemumips64 ?= "152e33a0782920e9707c36ccacf53585a8911e9f" +KBRANCH:qemuarm ?= "v5.4/standard/arm-versatile-926ejs" +KBRANCH:qemuarm64 ?= "v5.4/standard/qemuarm64" +KBRANCH:qemumips ?= "v5.4/standard/mti-malta32" +KBRANCH:qemuppc ?= "v5.4/standard/qemuppc" +KBRANCH:qemuriscv64 ?= "v5.4/standard/base" +KBRANCH:qemux86 ?= "v5.4/standard/base" +KBRANCH:qemux86-64 ?= "v5.4/standard/base" +KBRANCH:qemumips64 ?= "v5.4/standard/mti-malta64" + +SRCREV_machine:qemuarm ?= "bea52ab7529ef152f99a0f6ebd97cc7e904e5360" +SRCREV_machine:qemuarm64 ?= "8a29c9de0fc366bd89ce6954685dce0e330dbabe" +SRCREV_machine:qemumips ?= "b15816ccad0762d27c78c269e7a1986504e60c63" +SRCREV_machine:qemuppc ?= "906f9509a8d2f842ec8766bf81287f8939ff1fa8" +SRCREV_machine:qemuriscv64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" +SRCREV_machine:qemux86 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" +SRCREV_machine:qemux86-64 ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" +SRCREV_machine:qemumips64 ?= "152e33a0782920e9707c36ccacf53585a8911e9f" SRCREV_machine ?= "dd8a64a523fb714a98328441e0de72cde115a6fc" SRCREV_meta ?= "d6aec4fb69bae34f34db6f153871a0847d8198f3" # remap qemuarm to qemuarma15 for the 5.4 kernel -# KMACHINE_qemuarm ?= "qemuarma15" +# KMACHINE:qemuarm ?= "qemuarma15" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRANCH}; \ 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}" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "1" -KERNEL_DEVICETREE_qemuarmv5 = "versatile-pb.dtb" +KERNEL_DEVICETREE:qemuarmv5 = "versatile-pb.dtb" COMPATIBLE_MACHINE = "qemuarm|qemuarmv5|qemuarm64|qemux86|qemuppc|qemumips|qemumips64|qemux86-64|qemuriscv64" # Functionality flags KERNEL_EXTRA_FEATURES ?= "features/netfilter/netfilter.scc" -KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" -KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" -KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" -KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" -KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" +KERNEL_FEATURES:append = " ${KERNEL_EXTRA_FEATURES}" +KERNEL_FEATURES:append:qemuall=" cfg/virtio.scc features/drm-bochs/drm-bochs.scc" +KERNEL_FEATURES:append:qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES:append:qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES:append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "", d)}" +KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "", d)}" +KERNEL_FEATURES:append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/gpio/mockup.scc", "", d)}" -- cgit 1.2.3-korg