From 118d04ff37b70a847e0a1857cbbff568390a883b Mon Sep 17 00:00:00 2001
From: Wojciech Zmuda <wojciech.zmuda@huawei.com>
Date: Thu, 11 Mar 2021 17:45:35 +0100
Subject: [PATCH] flavours: use weak (?=) assignment for DISTRO

Strong (=) assignment makes it impossible to override DISTRO
in command line when calling bitbake e.g.:

  $ DISTRO=myCoolOS bitbake myCoolImage

With strong assignment, the local.conf DISTRO setting has
precendence over command line setting. Using weak assignment
allows user to build other DISTRO without editing local.conf.

Signed-off-by: Wojciech Zmuda <wojciech.zmuda@huawei.com>
---
 flavours/freertos/local.conf.sample | 2 +-
 flavours/linux/local.conf.sample    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flavours/freertos/local.conf.sample b/flavours/freertos/local.conf.sample
index 7a5d0cb5..ec868437 100644
--- a/flavours/freertos/local.conf.sample
+++ b/flavours/freertos/local.conf.sample
@@ -20,7 +20,7 @@ MACHINE ??= "qemuarmv5"
 #
 # Default policy config
 #
-DISTRO = "freertos"
+DISTRO ?= "freertos"
 
 #
 # Package Management configuration
diff --git a/flavours/linux/local.conf.sample b/flavours/linux/local.conf.sample
index 905e1190..e0536252 100644
--- a/flavours/linux/local.conf.sample
+++ b/flavours/linux/local.conf.sample
@@ -74,7 +74,7 @@ MACHINE ??= "qemux86-64"
 #
 # Default policy config
 #
-DISTRO = "openharmony-linux"
+DISTRO ?= "openharmony-linux"
 
 #
 # Package Management configuration
-- 
GitLab