[PATCH] Set HOST_DISTRO default in distro configs

[PATCH] Set HOST_DISTRO default in distro configs

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

This particularly makes scenarios simpler where a downstream layer
defines an own distro that is derived from debian-*.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/conf/distro/raspbian-stretch.conf | 2 ++
 meta-isar/conf/multiconfig/rpi-stretch.conf | 1 -
 meta/conf/distro/debian-buster.conf         | 2 ++
 meta/conf/distro/debian-stretch.conf        | 2 ++
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/meta-isar/conf/distro/raspbian-stretch.conf b/meta-isar/conf/distro/raspbian-stretch.conf
index 4c47376..9c7fa01 100644
--- a/meta-isar/conf/distro/raspbian-stretch.conf
+++ b/meta-isar/conf/distro/raspbian-stretch.conf
@@ -6,6 +6,8 @@
 BASE_DISTRO = "raspbian"
 BASE_DISTRO_CODENAME = "stretch"
 
+HOST_DISTRO ?= "debian-stretch"
+
 DISTRO_APT_SOURCES += "conf/distro/raspbian-stretch.list"
 DISTRO_BOOTSTRAP_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de"
 DISTRO_CONFIG_SCRIPT ?= "${LAYERDIR_isar}/conf/distro/raspbian-configscript.sh"
diff --git a/meta-isar/conf/multiconfig/rpi-stretch.conf b/meta-isar/conf/multiconfig/rpi-stretch.conf
index f3fac38..ec1f71d 100644
--- a/meta-isar/conf/multiconfig/rpi-stretch.conf
+++ b/meta-isar/conf/multiconfig/rpi-stretch.conf
@@ -12,7 +12,6 @@ MACHINE ?= "rpi"
 # This sets the default distribution configuration:
 DISTRO ?= "raspbian-stretch"
 DISTRO_ARCH ?= "armhf"
-HOST_DISTRO ?= "debian-stretch"
 
 KERNEL_NAME ?= "rpi-rpfv"
 
diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf
index 6b1daa3..021916b 100644
--- a/meta/conf/distro/debian-buster.conf
+++ b/meta/conf/distro/debian-buster.conf
@@ -4,6 +4,8 @@ require debian-common.conf
 
 BASE_DISTRO_CODENAME = "buster"
 
+HOST_DISTRO ?= "debian-buster"
+
 DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
 DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
diff --git a/meta/conf/distro/debian-stretch.conf b/meta/conf/distro/debian-stretch.conf
index cc9ca6e..45940e0 100644
--- a/meta/conf/distro/debian-stretch.conf
+++ b/meta/conf/distro/debian-stretch.conf
@@ -5,6 +5,8 @@ require debian-common.conf
 
 BASE_DISTRO_CODENAME = "stretch"
 
+HOST_DISTRO ?= "debian-stretch"
+
 DISTRO_APT_SOURCES += "conf/distro/debian-stretch.list"
 DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
 DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
-- 
2.16.4

Re: [PATCH] Set HOST_DISTRO default in distro configs

[Maxim Yu. Osipov]

On 5/31/19 9:30 AM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This particularly makes scenarios simpler where a downstream layer
> defines an own distro that is derived from debian-*.

Applied to the 'next'.

Regards,
Maxim.

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   meta-isar/conf/distro/raspbian-stretch.conf | 2 ++
>   meta-isar/conf/multiconfig/rpi-stretch.conf | 1 -
>   meta/conf/distro/debian-buster.conf         | 2 ++
>   meta/conf/distro/debian-stretch.conf        | 2 ++
>   4 files changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/meta-isar/conf/distro/raspbian-stretch.conf b/meta-isar/conf/distro/raspbian-stretch.conf
> index 4c47376..9c7fa01 100644
> --- a/meta-isar/conf/distro/raspbian-stretch.conf
> +++ b/meta-isar/conf/distro/raspbian-stretch.conf
> @@ -6,6 +6,8 @@
>   BASE_DISTRO = "raspbian"
>   BASE_DISTRO_CODENAME = "stretch"
>   
> +HOST_DISTRO ?= "debian-stretch"
> +
>   DISTRO_APT_SOURCES += "conf/distro/raspbian-stretch.list"
>   DISTRO_BOOTSTRAP_KEYS += "https://archive.raspbian.org/raspbian.public.key;sha256sum=ca59cd4f2bcbc3a1d41ba6815a02a8dc5c175467a59bd87edeac458f4a5345de"
>   DISTRO_CONFIG_SCRIPT ?= "${LAYERDIR_isar}/conf/distro/raspbian-configscript.sh"
> diff --git a/meta-isar/conf/multiconfig/rpi-stretch.conf b/meta-isar/conf/multiconfig/rpi-stretch.conf
> index f3fac38..ec1f71d 100644
> --- a/meta-isar/conf/multiconfig/rpi-stretch.conf
> +++ b/meta-isar/conf/multiconfig/rpi-stretch.conf
> @@ -12,7 +12,6 @@ MACHINE ?= "rpi"
>   # This sets the default distribution configuration:
>   DISTRO ?= "raspbian-stretch"
>   DISTRO_ARCH ?= "armhf"
> -HOST_DISTRO ?= "debian-stretch"
>   
>   KERNEL_NAME ?= "rpi-rpfv"
>   
> diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf
> index 6b1daa3..021916b 100644
> --- a/meta/conf/distro/debian-buster.conf
> +++ b/meta/conf/distro/debian-buster.conf
> @@ -4,6 +4,8 @@ require debian-common.conf
>   
>   BASE_DISTRO_CODENAME = "buster"
>   
> +HOST_DISTRO ?= "debian-buster"
> +
>   DISTRO_APT_SOURCES += "conf/distro/debian-buster.list"
>   DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
>   DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
> diff --git a/meta/conf/distro/debian-stretch.conf b/meta/conf/distro/debian-stretch.conf
> index cc9ca6e..45940e0 100644
> --- a/meta/conf/distro/debian-stretch.conf
> +++ b/meta/conf/distro/debian-stretch.conf
> @@ -5,6 +5,8 @@ require debian-common.conf
>   
>   BASE_DISTRO_CODENAME = "stretch"
>   
> +HOST_DISTRO ?= "debian-stretch"
> +
>   DISTRO_APT_SOURCES += "conf/distro/debian-stretch.list"
>   DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
>   DISTRO_KERNELS ?= "4kc-malta 586 5kc-malta 686 686-pae amd64 arm64 armmp \
>