diff --git a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb index fcf4b7fd60f964fa8e7fdd56440a5fc8eed1344e..1c15921d9736ea449e1039fea4849137085486f2 100644 --- a/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb +++ b/meta-oniro-core/recipes-kernel/linux/linux-oniro_5.10.bb @@ -8,9 +8,9 @@ KMETA = "kernel-meta" require recipes-kernel/linux/linux-yocto.inc # board-specific branches -KBRANCH_qemuarm ?= "oniro/v5.10/hw/qemuarm" +KBRANCH:qemuarm ?= "oniro/v5.10/hw/qemuarm" -SRCREV_machine_qemuarm ?= "b8d9461a3957dba555b1ae82481cf57f3ce9e8b1" +SRCREV_machine:qemuarm ?= "b8d9461a3957dba555b1ae82481cf57f3ce9e8b1" SRCREV_machine ?= "452ea6a15ed2ac74789b7b3513777cc94ea3b751" SRCREV_meta ?= "3b283fa8d4068ff68457b93e07d321c6c06d37e0" @@ -34,10 +34,10 @@ COMPATIBLE_MACHINE = "qemuarm|qemuarm64|qemux86|qemux86-64|qemuriscv64|qemuriscv # 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)}"