diff mbox series

[v2,1/3] Revert "meta/conf/distro: Cleanup DISTRO_APT_SOURCES"

Message ID 20210322163140.159616-2-amikan@ilbers.de
State Superseded, archived
Headers show
Series Fix DISTRO_APT_SOURCES declaration | expand

Commit Message

Anton Mikanovich March 22, 2021, 6:31 a.m. UTC 
This cleanup brakes APT sources declaration for custom distros based on
debian-buster, debian-stretch, etc, because ${DISTRO}.list do not exist.

This reverts commit f3b4f74a869a83487b3ef735b6d14948bd89084b.
---
 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, 4 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/meta/conf/distro/debian-bullseye.conf b/meta/conf/distro/debian-bullseye.conf
index 98bd049..a93543c 100644
--- a/meta/conf/distro/debian-bullseye.conf
+++ b/meta/conf/distro/debian-bullseye.conf
@@ -6,6 +6,7 @@  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 e7c837b..c898dba 100644
--- a/meta/conf/distro/debian-buster.conf
+++ b/meta/conf/distro/debian-buster.conf
@@ -6,6 +6,7 @@  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 cb7f8ed..ca33d46 100644
--- a/meta/conf/distro/debian-common.conf
+++ b/meta/conf/distro/debian-common.conf
@@ -6,7 +6,6 @@ 
 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 03e14b5..8a8beb5 100644
--- a/meta/conf/distro/debian-sid-ports.conf
+++ b/meta/conf/distro/debian-sid-ports.conf
@@ -12,6 +12,7 @@  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 e1b9394..931256b 100644
--- a/meta/conf/distro/debian-stretch.conf
+++ b/meta/conf/distro/debian-stretch.conf
@@ -7,6 +7,7 @@  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 \