[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, targets/support/, targets/stage2/, catalyst/, doc/

[gentoo-commits] proj/catalyst:master commit in: catalyst/base/, targets/support/, targets/stage2/, catalyst/, doc/

[Matt Turner]

commit:     bec6650faa65d734fbbde63cb5d652e45bff8cac
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 22 02:09:19 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 22:56:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bec6650f

catalyst: Remove repo_basedir setting

Its purpose was very confused.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 catalyst/base/stagebase.py         | 7 ++-----
 catalyst/defaults.py               | 1 -
 doc/catalyst-config.5.txt          | 4 ----
 targets/stage2/chroot.sh           | 2 +-
 targets/support/livecdfs-update.sh | 2 +-
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
index e1477bb4..1f091829 100644
--- a/catalyst/base/stagebase.py
+++ b/catalyst/base/stagebase.py
@@ -192,7 +192,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
         self.mount = MOUNT_DEFAULTS.copy()
 
         self.mount['portdir']['source'] = self.snapshot
-        self.mount['portdir']['target'] = self.settings['repo_basedir'] + '/' + self.settings['repo_name']
+        self.mount['portdir']['target'] = self.settings['target_portdir']
         self.mount['distdir']['source'] = self.settings['distdir']
         self.mount["distdir"]['target'] = self.settings['target_distdir']
 
@@ -1054,11 +1054,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
                 for hostuseexpand in myuseexpandvars:
                     myf.write(hostuseexpand + '="' +
                               ' '.join(myuseexpandvars[hostuseexpand]) + '"\n')
-            # write out a shipable version
-            target_portdir = normpath(self.settings["repo_basedir"] + "/" +
-                                      self.settings["repo_name"])
 
-            myf.write('PORTDIR="%s"\n' % target_portdir)
+            myf.write('PORTDIR="%s"\n' % self.settings['target_portdir'])
             myf.write('DISTDIR="%s"\n' % self.settings['target_distdir'])
             myf.write('PKGDIR="%s"\n' % self.settings['target_pkgdir'])
             if setup:

diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 9878b426..bbefa3a8 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -65,7 +65,6 @@ confdefaults = {
     "pkgdir": "/var/cache/binpkgs",
     "port_tmpdir": "/var/tmp/portage",
     "PythonDir": "./catalyst",
-    "repo_basedir": "/var/db/repos",
     "repo_name": "gentoo",
     "repos": "%(storedir)s/repos",
     "sharedir": "/usr/share/catalyst",

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index c1ebe9dd..b7d493eb 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -108,10 +108,6 @@ Defaults to the host's DISTDIR.
 The directory in which git repositories exist for use by the snapshot target.
 Defaults to `${storedir}/repos`.
 
-*repo_basedir*::
-The target repository directory to contain the primary repo (gentoo repo) and
-any overlays.  The default location is `/var/db/repos`.
-
 *repo_name*::
 The name of the main repository (e.g. gentoo). The git repository at
 `${repos}/${repo_name}.git` will be used to produce the portdir sqfs

diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
index bf98d328..aac9a92d 100755
--- a/targets/stage2/chroot.sh
+++ b/targets/stage2/chroot.sh
@@ -9,7 +9,7 @@ export CONFIG_PROTECT="-* /etc/locale.gen"
 echo "$locales" > /etc/locale.gen
 
 ## START BUILD
-${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
+${clst_target_portdir}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
 
 # Replace modified /etc/locale.gen with default
 etc-update --automode -5

diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
index b1049671..8297e60d 100755
--- a/targets/support/livecdfs-update.sh
+++ b/targets/support/livecdfs-update.sh
@@ -257,7 +257,7 @@ case ${clst_livecd_type} in
 		USE="-* $(cat /var/db/pkg/sys-libs/glibc*/USE)" emerge -eqp @system | grep -e '^\[ebuild' | sed -e 's:^\[ebuild .\+\] ::' -e 's: .\+$::' > /usr/livecd/systempkgs.txt
 
 		# This is my hack to reduce tmpfs usage
-		cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd
+		cp -r ${clst_target_portdir}/{profiles,eclass} /usr/livecd
 		rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
 		mv -f /etc/gconf /usr/livecd
 		ln -sf /usr/livecd/gconf /etc/gconf