[meta-yocto][PATCH 1/3] poky: fix typos

[meta-yocto][PATCH 1/3] poky: fix typos

[Vivien Didelot]

From: Vivien Didelot <vdidelot@pbsc.com>

Fix fromw -> from typo in poky-world-exclude.inc,
and confiruration -> configuration in poky-tiny.conf.

Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
---
 meta-poky/conf/distro/include/poky-world-exclude.inc | 2 +-
 meta-poky/conf/distro/poky-tiny.conf                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-poky/conf/distro/include/poky-world-exclude.inc b/meta-poky/conf/distro/include/poky-world-exclude.inc
index 1a2dea5..f3ac59c 100644
--- a/meta-poky/conf/distro/include/poky-world-exclude.inc
+++ b/meta-poky/conf/distro/include/poky-world-exclude.inc
@@ -1,4 +1,4 @@
 #
-# Things we exlude fromw world testing within the reference distro
+# Things we exlude from world testing within the reference distro
 #
 
diff --git a/meta-poky/conf/distro/poky-tiny.conf b/meta-poky/conf/distro/poky-tiny.conf
index 5a867b1..e4ff975 100644
--- a/meta-poky/conf/distro/poky-tiny.conf
+++ b/meta-poky/conf/distro/poky-tiny.conf
@@ -26,7 +26,7 @@
 # [ ] Drop ldconfig from the installation
 # [ ] Modify the runqemu scripts to work with ext2 parameter:
 #     runqemu qemux86 qemuparams="-nographic" bootparams="console=ttyS0,115200 root=0800"
-# [ ] Modify busybox to allow for DISTRO_FEATURES-like confiruration
+# [ ] Modify busybox to allow for DISTRO_FEATURES-like configuration
 
 require conf/distro/poky.conf
 require conf/distro/include/gcsections.inc
-- 
2.30.1

[meta-yocto][PATCH 2/3] poky: don't use space with +=

[Vivien Didelot]

From: Vivien Didelot <vdidelot@pbsc.com>

Bitbake variables are usually appended with one of:

    FOO_append = " bar"
    FOO += "bar"

While the space is mandatory in the "_append" variant, it doesn't
hurt in the "+=" variant, but it can be misleading.

Remove the space to avoid confusion.

Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
---
 meta-poky/conf/distro/poky.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf
index 623f39d..4e416c0 100644
--- a/meta-poky/conf/distro/poky.conf
+++ b/meta-poky/conf/distro/poky.conf
@@ -25,8 +25,8 @@ PREFERRED_VERSION_linux-yocto-rt ?= "5.10%"
 SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}"
 SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"
 
-DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
-DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
+DISTRO_EXTRA_RDEPENDS += "${POKY_DEFAULT_EXTRA_RDEPENDS}"
+DISTRO_EXTRA_RRECOMMENDS += "${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
 
 TCLIBCAPPEND = ""
 
-- 
2.30.1

[meta-yocto][PATCH 3/3] beaglebone-yocto: allow other virtual/bootloader

[Vivien Didelot]

From: Vivien Didelot <vdidelot@pbsc.com>

The beaglebone-yocto machine currently hardcodes "u-boot" as a
dependency for the image and the wic format, and this prevents one
from choosing a different bootloader via:

    PREFERRED_PROVIDER_virtual/bootloader = "non-u-boot-bootloader"

Depending on "virtual/bootloader" instead of "u-boot" fixes this.

Cc: Denys Dmytriyenko <denis@denix.org>
Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>
---
 meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
index f8368eb..04cbd3b 100644
--- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
+++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
@@ -9,7 +9,7 @@ XSERVER ?= "xserver-xorg \
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree"
 
-EXTRA_IMAGEDEPENDS += "u-boot"
+EXTRA_IMAGEDEPENDS += "virtual/bootloader"
 
 DEFAULTTUNE ?= "cortexa8hf-neon"
 include conf/machine/include/tune-cortexa8.inc
@@ -18,7 +18,7 @@ IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
 EXTRA_IMAGECMD_jffs2 = "-lnp "
 WKS_FILE ?= "beaglebone-yocto.wks"
 IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
-do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy"
+do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
-- 
2.30.1

Re: [poky] [meta-yocto][PATCH 3/3] beaglebone-yocto: allow other virtual/bootloader

[Denys Dmytriyenko]

On Tue, Mar 09, 2021 at 12:47:15PM -0500, Vivien Didelot wrote:
> From: Vivien Didelot <vdidelot@pbsc.com>
> 
> The beaglebone-yocto machine currently hardcodes "u-boot" as a
> dependency for the image and the wic format, and this prevents one
> from choosing a different bootloader via:
> 
>     PREFERRED_PROVIDER_virtual/bootloader = "non-u-boot-bootloader"
> 
> Depending on "virtual/bootloader" instead of "u-boot" fixes this.
> 
> Cc: Denys Dmytriyenko <denis@denix.org>
> Signed-off-by: Vivien Didelot <vdidelot@pbsc.com>

Reviewed-by: Denys Dmytriyenko <denis@denix.org>


> ---
>  meta-yocto-bsp/conf/machine/beaglebone-yocto.conf | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
> index f8368eb..04cbd3b 100644
> --- a/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
> +++ b/meta-yocto-bsp/conf/machine/beaglebone-yocto.conf
> @@ -9,7 +9,7 @@ XSERVER ?= "xserver-xorg \
>  
>  MACHINE_EXTRA_RRECOMMENDS = "kernel-modules kernel-devicetree"
>  
> -EXTRA_IMAGEDEPENDS += "u-boot"
> +EXTRA_IMAGEDEPENDS += "virtual/bootloader"
>  
>  DEFAULTTUNE ?= "cortexa8hf-neon"
>  include conf/machine/include/tune-cortexa8.inc
> @@ -18,7 +18,7 @@ IMAGE_FSTYPES += "tar.bz2 jffs2 wic wic.bmap"
>  EXTRA_IMAGECMD_jffs2 = "-lnp "
>  WKS_FILE ?= "beaglebone-yocto.wks"
>  IMAGE_INSTALL_append = " kernel-devicetree kernel-image-zimage"
> -do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot u-boot:do_deploy"
> +do_image_wic[depends] += "mtools-native:do_populate_sysroot dosfstools-native:do_populate_sysroot virtual/bootloader:do_deploy"
>  
>  SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyO0 115200;ttyAMA0"
>  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
> -- 
> 2.30.1
>