[PATCH 6/7] Move repo variables to proper conf file

[Jan Kiszka <jan.kiszka@siemens.com>]

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

These definitely do not belong to a layer.conf. Rather, they are so
essential that placing them in the custom bitbake.conf is justified.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta-isar/conf/layer.conf | 11 -----------
 meta/conf/bitbake.conf    | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta-isar/conf/layer.conf b/meta-isar/conf/layer.conf
index 5d3ae88..9939bdc 100644
--- a/meta-isar/conf/layer.conf
+++ b/meta-isar/conf/layer.conf
@@ -17,14 +17,3 @@ LAYERVERSION_isar = "3"
 LAYERSERIES_COMPAT_isar = "v0.6"
 
 LAYERDIR_isar = "${LAYERDIR}"
-
-# Codename of the repository created by the caching class
-DEBDISTRONAME = "isar"
-
-# Isar apt repository paths
-REPO_ISAR_DIR ?= "${DEPLOY_DIR}/isar-apt/apt"
-REPO_ISAR_DB_DIR ?= "${DEPLOY_DIR}/isar-apt/db"
-
-# Base apt repository paths
-REPO_BASE_DIR ?= "${DL_DIR}/base-apt/apt"
-REPO_BASE_DB_DIR ?= "${DL_DIR}/base-apt/db"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 7e8dea1..b067a0d 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -55,6 +55,17 @@ BUILDCHROOT_HOST_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-host
 BUILDCHROOT_TARGET_DIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/buildchroot-target/rootfs"
 CACHE = "${TMPDIR}/cache"
 
+# Codename of the repository created by the caching class
+DEBDISTRONAME = "isar"
+
+# Isar apt repository paths
+REPO_ISAR_DIR = "${DEPLOY_DIR}/isar-apt/apt"
+REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/db"
+
+# Base apt repository paths
+REPO_BASE_DIR = "${DL_DIR}/base-apt/apt"
+REPO_BASE_DB_DIR = "${DL_DIR}/base-apt/db"
+
 OVERRIDES_append = ":${DISTRO}:${DISTRO_ARCH}"
 
 BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH BBSERVER DL_DIR \
-- 
2.16.4