diff mbox series

[1/2] initial machine configs: set PREFERRED_PROVIDERs as weaker defaults

Message ID 20221113084255.18113-1-christoph.lauer@email.de
State New
Headers show
Series [1/2] initial machine configs: set PREFERRED_PROVIDERs as weaker defaults | expand

Commit Message

Christoph Lauer Nov. 13, 2022, 8:42 a.m. UTC 
From: Christoph Lauer <christoph.lauer@xtronic.de>

This gives BSP creators the flexibility to change PREFERRED_PROVIDERs with weak defaults

Signed-off-by: Christoph Lauer <christoph.lauer@xtronic.de>
---
 meta-yocto-bsp/conf/machine/beaglebone-yocto.conf         | 6 +++---
 meta-yocto-bsp/conf/machine/edgerouter.conf               | 2 +-
 meta-yocto-bsp/conf/machine/include/genericx86-common.inc | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

--
2.17.1
diff mbox series

Patch

diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index 284559c50c..d5c5a4a2ef 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
@@ -2,7 +2,7 @@ 
 #@NAME: Beaglebone-yocto machine
 #@DESCRIPTION: Reference machine configuration for http://beagleboard.org/bone and http://beagleboard.org/black boards

-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver ??= "xserver-xorg"
 XSERVER ?= "xserver-xorg \
            xf86-video-modesetting \
            "
@@ -23,14 +23,14 @@  do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"

-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.15%"

 KERNEL_IMAGETYPE = "zImage"
 KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb am335x-bonegreen.dtb"
 KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"

-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
+PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot"

 SPL_BINARY = "MLO"
 UBOOT_SUFFIX = "img"
diff --git a/meta-yocto-bsp/conf/machine/edgerouter.conf b/meta-yocto-bsp/conf/machine/edgerouter.conf
index 249864e9ce..367d2e091a 100644
--- a/meta-yocto-bsp/conf/machine/edgerouter.conf
+++ b/meta-yocto-bsp/conf/machine/edgerouter.conf
@@ -10,7 +10,7 @@  KERNEL_IMAGETYPE = "vmlinux"
 KERNEL_ALT_IMAGETYPE = "vmlinux.bin"
 KERNEL_IMAGE_STRIP_EXTRA_SECTIONS  = ".comment"

-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
 PREFERRED_VERSION_linux-yocto ?= "5.15%"

 SERIAL_CONSOLES = "115200;ttyS0"
diff --git a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
index 8c5e5522bc..2fe34dcd47 100644
--- a/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
+++ b/meta-yocto-bsp/conf/machine/include/genericx86-common.inc
@@ -3,8 +3,8 @@  require conf/machine/include/x86/qemuboot-x86.inc
 MACHINE_FEATURES += "wifi efi pcbios"

 PREFERRED_VERSION_linux-yocto ?= "5.15%"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
+PREFERRED_PROVIDER_virtual/xserver ??= "xserver-xorg"
 XSERVER ?= "${XSERVER_X86_BASE} \
             ${XSERVER_X86_EXT} \
             ${XSERVER_X86_I915} \