[PATCH v4 05/13] meta: move base-apt from deploy directory to the top

[Uladzimir Bely <ubely@ilbers.de>]

While base-apt is supposed to be always used for deboostrapping and
installing build dependencies, move it out of temporary directory.

This also allows not to change some of CI tests that completely
remove TMPDIR and underlaying DEPLOY_DIR.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 meta/conf/bitbake.conf | 4 ++--
 testsuite/citest.py    | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index bea62bb2..361bf1f0 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -98,8 +98,8 @@ REPO_ISAR_DB_DIR = "${DEPLOY_DIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/db"
 THIRD_PARTY_APT_KEYRING = "/etc/apt/trusted.gpg.d/third_party.gpg"
 
 # Base apt repository paths
-REPO_BASE_DIR = "${DEPLOY_DIR}/base-apt/${DISTRO}/apt"
-REPO_BASE_DB_DIR = "${DEPLOY_DIR}/base-apt/${DISTRO}/db"
+REPO_BASE_DIR = "${TOPDIR}/base-apt/${DISTRO}/apt"
+REPO_BASE_DB_DIR = "${TOPDIR}/base-apt/${DISTRO}/db"
 
 # Setup our default hash policy
 BB_SIGNATURE_HANDLER ?= "OEBasicHash"
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 17a90244..2393e275 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -86,9 +86,11 @@ class ReproTest(CIBaseTest):
 
         self.init()
         try:
+            self.delete_from_build_dir('base-apt')
             self.perform_repro_test(targets, signed=True)
         finally:
             self.move_in_build_dir('tmp', 'tmp_repro_signed')
+            self.move_in_build_dir('base-apt', 'base-apt_repro_signed')
 
     def test_repro_unsigned(self):
         targets = [
@@ -101,6 +103,7 @@ class ReproTest(CIBaseTest):
             self.perform_repro_test(targets, cross=False)
         finally:
             self.move_in_build_dir('tmp', 'tmp_repro_unsigned')
+            self.move_in_build_dir('base-apt', 'base-apt_repro_unsigned')
 
 class CcacheTest(CIBaseTest):
 
-- 
2.20.1