| Message ID | 20201027062657.11401-1-Vijaikumar_Kanagarajan@mentor.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | meta/conf/distro: Cleanup DISTRO_APT_SOURCES | expand |
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
On Tue, Oct 27, 2020 at 11:56:57AM +0530, 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> > Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com> Applied to next, thanks. With kind regards, Baurzhan.
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 \
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(-)