Utilize preset variable KERNEL_PACKAGE_NAME to ensure uniformity with builds if KERNEL_PACKAGE_NAME variable were to change.
Signed-off-by: Vincent Davis Jr <[email protected]> --- meta/conf/machine/include/loongarch/qemuloongarch.inc | 2 +- meta/conf/machine/include/riscv/qemuriscv.inc | 2 +- meta/conf/machine/qemuppc64.conf | 2 +- meta/conf/machine/qemux86-64.conf | 2 +- meta/conf/machine/qemux86.conf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/conf/machine/include/loongarch/qemuloongarch.inc b/meta/conf/machine/include/loongarch/qemuloongarch.inc index e1bcfabc43..9cd26fb6d0 100644 --- a/meta/conf/machine/include/loongarch/qemuloongarch.inc +++ b/meta/conf/machine/include/loongarch/qemuloongarch.inc @@ -15,7 +15,7 @@ IMAGE_FSTYPES += "ext4 wic.qcow2" WKS_FILE ?= "qemuloongarch.wks" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" +MACHINE_EXTRA_RRECOMMENDS += "${KERNEL_PACKAGE_NAME}-modules" #EXTRA_IMAGEDEPENDS += "opensbi" diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc index bac376ce5a..37d5787ee2 100644 --- a/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/meta/conf/machine/include/riscv/qemuriscv.inc @@ -15,7 +15,7 @@ IMAGE_FSTYPES += "ext4.zst wic.qcow2" WKS_FILE ?= "qemuriscv.wks" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" +MACHINE_EXTRA_RRECOMMENDS += "${KERNEL_PACKAGE_NAME}-modules" EXTRA_IMAGEDEPENDS += "opensbi" RISCV_SBI_PLAT ?= "generic" diff --git a/meta/conf/machine/qemuppc64.conf b/meta/conf/machine/qemuppc64.conf index 2fbd26a6f9..1cfdeea025 100644 --- a/meta/conf/machine/qemuppc64.conf +++ b/meta/conf/machine/qemuppc64.conf @@ -20,4 +20,4 @@ QB_KERNEL_CMDLINE_APPEND = "console=hvc0 nohugevmalloc" #QB_OPT_APPEND += "-device qemu-xhci -device usb-tablet -device usb-kbd" QB_OPT_APPEND = "-usb -device usb-tablet" -MACHINE_EXTRA_RRECOMMENDS += " kernel-modules" +MACHINE_EXTRA_RRECOMMENDS += "${KERNEL_PACKAGE_NAME}-modules" diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 8aac7634b7..f0c9a6141b 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -31,7 +31,7 @@ MACHINE_FEATURES += "x86 pci" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +MACHINE_EXTRA_RRECOMMENDS = "${KERNEL_PACKAGE_NAME}-module-snd-ens1370 ${KERNEL_PACKAGE_NAME}-module-snd-rawmidi" WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 51f080bd2a..22e2ae836e 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf @@ -27,7 +27,7 @@ MACHINE_FEATURES += "x86 pci" MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "v86d" -MACHINE_EXTRA_RRECOMMENDS = "kernel-module-snd-ens1370 kernel-module-snd-rawmidi" +MACHINE_EXTRA_RRECOMMENDS = "${KERNEL_PACKAGE_NAME}-module-snd-ens1370 ${KERNEL_PACKAGE_NAME}-module-snd-rawmidi" WKS_FILE ?= "qemux86-directdisk.wks" do_image_wic[depends] += "syslinux:do_populate_sysroot syslinux-native:do_populate_sysroot mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot" -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#240794): https://lists.openembedded.org/g/openembedded-core/message/240794 Mute This Topic: https://lists.openembedded.org/mt/120238091/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
