public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>,
	isar-users@googlegroups.com
Subject: Re: [PATCH] meta/conf/distro: Cleanup DISTRO_APT_SOURCES
Date: Tue, 27 Oct 2020 11:14:47 +0100	[thread overview]
Message-ID: <fed381c9-db55-57d1-39cd-6d5b6eb3a7d2@siemens.com> (raw)
In-Reply-To: <20201027062657.11401-1-Vijaikumar_Kanagarajan@mentor.com>

On 27.10.20 07:26, Vijai Kumar K wrote:
> All sources list file is named based on the DISTRO name. Simplify
> the DISTRO_APT_SOURCES declaration and move it to debian-common.conf.
> 
> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> ---
>  meta/conf/distro/debian-bullseye.conf  | 1 -
>  meta/conf/distro/debian-buster.conf    | 1 -
>  meta/conf/distro/debian-common.conf    | 1 +
>  meta/conf/distro/debian-sid-ports.conf | 1 -
>  meta/conf/distro/debian-stretch.conf   | 1 -
>  5 files changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf
> index a93543c..98bd049 100644
> --- a/meta/conf/distro/debian-bullseye.conf
> +++ b/meta/conf/distro/debian-bullseye.conf
> @@ -6,7 +6,6 @@ BASE_DISTRO_CODENAME = "bullseye"
>  
>  HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}"
>  
> -DISTRO_APT_SOURCES ?= "conf/distro/debian-${BASE_DISTRO_CODENAME}.list"
>  DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
>  DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686 686-pae amd64 arm64 armmp \
>      armmp-lpae cloud-amd64 loongson-3 octeon powerpc64le rpi s390x marvell \
> diff --git a/meta/conf/distro/debian-buster.conf b/meta/conf/distro/debian-buster.conf
> index c898dba..e7c837b 100644
> --- a/meta/conf/distro/debian-buster.conf
> +++ b/meta/conf/distro/debian-buster.conf
> @@ -6,7 +6,6 @@ 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 \
>      armmp-lpae cloud-amd64 loongson-3 marvell octeon powerpc64le rpi s390x \
> diff --git a/meta/conf/distro/debian-common.conf b/meta/conf/distro/debian-common.conf
> index 582678f..51017b3 100644
> --- a/meta/conf/distro/debian-common.conf
> +++ b/meta/conf/distro/debian-common.conf
> @@ -6,6 +6,7 @@
>  BASE_DISTRO = "debian"
>  
>  HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list"
> +DISTRO_APT_SOURCES ?= "conf/distro/${DISTRO}.list"
>  
>  WIC_IMAGER_INSTALL = "parted \
>                        gdisk \
> diff --git a/meta/conf/distro/debian-sid-ports.conf b/meta/conf/distro/debian-sid-ports.conf
> index 8a8beb5..03e14b5 100644
> --- a/meta/conf/distro/debian-sid-ports.conf
> +++ b/meta/conf/distro/debian-sid-ports.conf
> @@ -12,7 +12,6 @@ HOST_DISTRO ?= "debian-sid"
>  
>  DEBIAN_PORTS_KEY = "https://www.ports.debian.org/archive_2020.key;sha256sum=d24c6d2fe55e563ff0d998666b5e55dd8058742517a6839d9c23d201b48180c8"
>  
> -DISTRO_APT_SOURCES ?= "conf/distro/debian-${BASE_DISTRO_CODENAME}-ports.list"
>  DISTRO_BOOTSTRAP_KEYS += "${DEBIAN_PORTS_KEY}"
>  DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh"
>  DISTRO_KERNELS ?= "riscv64"
> diff --git a/meta/conf/distro/debian-stretch.conf b/meta/conf/distro/debian-stretch.conf
> index 931256b..e1b9394 100644
> --- a/meta/conf/distro/debian-stretch.conf
> +++ b/meta/conf/distro/debian-stretch.conf
> @@ -7,7 +7,6 @@ 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 \
>      armmp-lpae kirkwood loongson-3 marvell octeon orion5x powerpc64le \
> 

Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux

  reply	other threads:[~2020-10-27 10:14 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-27  6:26 Vijai Kumar K
2020-10-27 10:14 ` Jan Kiszka [this message]
2020-11-18 18:55 ` Baurzhan Ismagulov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fed381c9-db55-57d1-39cd-6d5b6eb3a7d2@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=Vijaikumar_Kanagarajan@mentor.com \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox