[PATCH] base-apt, isar-apt: Split code and configuration

[Baurzhan Ismagulov <ibr@radix50.net>]

From: Baurzhan Ismagulov <ibr@ilbers.de>

Signed-off-by: Baurzhan Ismagulov <ibr@ilbers.de>
---
 meta/classes/repository.bbclass                       | 10 ++++------
 meta/recipes-devtools/base-apt/base-apt.bb            |  3 +++
 meta/recipes-devtools/base-apt/files/distributions.in |  3 +++
 meta/recipes-devtools/isar-apt/files/distributions.in |  3 +++
 meta/recipes-devtools/isar-apt/isar-apt.bb            |  5 ++++-
 5 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 meta/recipes-devtools/base-apt/files/distributions.in
 create mode 100644 meta/recipes-devtools/isar-apt/files/distributions.in

diff --git a/meta/classes/repository.bbclass b/meta/classes/repository.bbclass
index 80502dc..c70138f 100644
--- a/meta/classes/repository.bbclass
+++ b/meta/classes/repository.bbclass
@@ -8,7 +8,8 @@ repo_create() {
     local dir="$1"
     local dbdir="$2"
     local codename="$3"
-    local keyfiles="$4"
+    local distros_in="$4"
+    local keyfiles="$5"
 
     if [ -n "${GNUPGHOME}" ]; then
         export GNUPGHOME="${GNUPGHOME}"
@@ -16,11 +17,8 @@ repo_create() {
 
     if [ ! -f "${dir}"/conf/distributions ]; then
         mkdir -p "${dir}"/conf/
-        cat <<EOF > "${dir}"/conf/distributions
-Codename: ${codename}
-Architectures: i386 armhf arm64 amd64 mipsel riscv64 source
-Components: main
-EOF
+        sed -e "s#{CODENAME}#${codename}#g" ${distros_in} \
+            >"${dir}"/conf/distributions
         if [ -n "${keyfiles}" ] ; then
 	    local option=""
 	    for key in ${keyfiles}; do
diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb
index 408dd63..da3e32e 100644
--- a/meta/recipes-devtools/base-apt/base-apt.bb
+++ b/meta/recipes-devtools/base-apt/base-apt.bb
@@ -6,6 +6,8 @@
 
 inherit repository
 
+SRC_URI = "file://distributions.in"
+
 BASE_REPO_KEY ?= ""
 KEYFILES ?= ""
 
@@ -50,6 +52,7 @@ repo() {
     repo_create "${REPO_BASE_DIR}"/"${BASE_DISTRO}" \
         "${REPO_BASE_DB_DIR}"/"${BASE_DISTRO}" \
         "${BASE_DISTRO_CODENAME}" \
+        "${WORKDIR}/distributions.in" \
         "${KEYFILES}"
 
     if [ -d '${BUILDCHROOT_HOST_DIR}/var/cache/apt' ] &&
diff --git a/meta/recipes-devtools/base-apt/files/distributions.in b/meta/recipes-devtools/base-apt/files/distributions.in
new file mode 100644
index 0000000..3cf7ea5
--- /dev/null
+++ b/meta/recipes-devtools/base-apt/files/distributions.in
@@ -0,0 +1,3 @@
+Codename: {CODENAME}
+Architectures: i386 armhf arm64 amd64 mipsel riscv64 source
+Components: main
diff --git a/meta/recipes-devtools/isar-apt/files/distributions.in b/meta/recipes-devtools/isar-apt/files/distributions.in
new file mode 100644
index 0000000..3cf7ea5
--- /dev/null
+++ b/meta/recipes-devtools/isar-apt/files/distributions.in
@@ -0,0 +1,3 @@
+Codename: {CODENAME}
+Architectures: i386 armhf arm64 amd64 mipsel riscv64 source
+Components: main
diff --git a/meta/recipes-devtools/isar-apt/isar-apt.bb b/meta/recipes-devtools/isar-apt/isar-apt.bb
index c53b01f..0458bac 100644
--- a/meta/recipes-devtools/isar-apt/isar-apt.bb
+++ b/meta/recipes-devtools/isar-apt/isar-apt.bb
@@ -6,6 +6,8 @@
 
 inherit repository
 
+SRC_URI = "file://distributions.in"
+
 do_cache_config[stamp-extra-info] = "${DISTRO}"
 do_cache_config[lockfiles] = "${REPO_ISAR_DIR}/isar.lock"
 
@@ -14,7 +16,8 @@ do_cache_config[lockfiles] = "${REPO_ISAR_DIR}/isar.lock"
 do_cache_config() {
     repo_create "${REPO_ISAR_DIR}"/"${DISTRO}" \
         "${REPO_ISAR_DB_DIR}"/"${DISTRO}" \
-        "${DEBDISTRONAME}"
+        "${DEBDISTRONAME}" \
+        "${WORKDIR}/distributions.in"
 }
 
 addtask cache_config after do_unpack before do_build
-- 
2.20.1