bitbake: Move the preferred bootstrap assignment before including local.conf

Message ID 20251030030655.2765-1-liuyi@siemens.com
State New
Headers show
Series bitbake: Move the preferred bootstrap assignment before including local.conf | expand

Commit Message

Liu Yi Oct. 30, 2025, 3:06 a.m. UTC
This change relocates the assignment for the preferred providers of the
bootstrap-host and bootstrap-target to occur before including local.conf,
ensuring that these two variables in local.conf can be overwritten by the
end users.

Signed-off-by: Liu Yi <liuyi@siemens.com>
---
 meta/conf/bitbake.conf | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Jan Kiszka Oct. 30, 2025, 11:29 a.m. UTC | #1
On 30.10.25 04:06, 'Liu Yi' via isar-users wrote:
> This change relocates the assignment for the preferred providers of the
> bootstrap-host and bootstrap-target to occur before including local.conf,
> ensuring that these two variables in local.conf can be overwritten by the
> end users.
> 
> Signed-off-by: Liu Yi <liuyi@siemens.com>
> ---
>  meta/conf/bitbake.conf | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 5ab8ced7..a06ef90e 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -210,6 +210,9 @@ TASK_USE_NETWORK = "1"
>  TASK_USE_SUDO = "1"
>  TASK_USE_NETWORK_AND_SUDO = "1"
>  
> +PREFERRED_PROVIDER_bootstrap-host ??= "isar-mmdebstrap-host"
> +PREFERRED_PROVIDER_bootstrap-target ??= "isar-mmdebstrap-target"
> +
>  include conf/local.conf
>  include conf/multiconfig/${BB_CURRENT_MC}.conf
>  include conf/machine/${MACHINE}.conf
> @@ -217,5 +220,3 @@ include conf/distro/${DISTRO}.conf
>  
>  PATCHRESOLVE ?= "noop"
>  
> -PREFERRED_PROVIDER_bootstrap-host ??= "isar-mmdebstrap-host"
> -PREFERRED_PROVIDER_bootstrap-target ??= "isar-mmdebstrap-target"

Looks good.

I suppose that this comes from some out-of-tree experiments with a
non-Debian, non-Raspberry and non-Ubuntu OS? ;)

Jan

Patch

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 5ab8ced7..a06ef90e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -210,6 +210,9 @@  TASK_USE_NETWORK = "1"
 TASK_USE_SUDO = "1"
 TASK_USE_NETWORK_AND_SUDO = "1"
 
+PREFERRED_PROVIDER_bootstrap-host ??= "isar-mmdebstrap-host"
+PREFERRED_PROVIDER_bootstrap-target ??= "isar-mmdebstrap-target"
+
 include conf/local.conf
 include conf/multiconfig/${BB_CURRENT_MC}.conf
 include conf/machine/${MACHINE}.conf
@@ -217,5 +220,3 @@  include conf/distro/${DISTRO}.conf
 
 PATCHRESOLVE ?= "noop"
 
-PREFERRED_PROVIDER_bootstrap-host ??= "isar-mmdebstrap-host"
-PREFERRED_PROVIDER_bootstrap-target ??= "isar-mmdebstrap-target"