Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, targets/support/, targets/stage2/, catalyst/, doc/
Date: Thu, 30 Apr 2020 22:56:27
Message-Id: 1588287372.bec6650faa65d734fbbde63cb5d652e45bff8cac.mattst88@gentoo
1 commit: bec6650faa65d734fbbde63cb5d652e45bff8cac
2 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 22 02:09:19 2020 +0000
4 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 30 22:56:12 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=bec6650f
7
8 catalyst: Remove repo_basedir setting
9
10 Its purpose was very confused.
11
12 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
13
14 catalyst/base/stagebase.py | 7 ++-----
15 catalyst/defaults.py | 1 -
16 doc/catalyst-config.5.txt | 4 ----
17 targets/stage2/chroot.sh | 2 +-
18 targets/support/livecdfs-update.sh | 2 +-
19 5 files changed, 4 insertions(+), 12 deletions(-)
20
21 diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py
22 index e1477bb4..1f091829 100644
23 --- a/catalyst/base/stagebase.py
24 +++ b/catalyst/base/stagebase.py
25 @@ -192,7 +192,7 @@ class StageBase(TargetBase, ClearBase, GenBase):
26 self.mount = MOUNT_DEFAULTS.copy()
27
28 self.mount['portdir']['source'] = self.snapshot
29 - self.mount['portdir']['target'] = self.settings['repo_basedir'] + '/' + self.settings['repo_name']
30 + self.mount['portdir']['target'] = self.settings['target_portdir']
31 self.mount['distdir']['source'] = self.settings['distdir']
32 self.mount["distdir"]['target'] = self.settings['target_distdir']
33
34 @@ -1054,11 +1054,8 @@ class StageBase(TargetBase, ClearBase, GenBase):
35 for hostuseexpand in myuseexpandvars:
36 myf.write(hostuseexpand + '="' +
37 ' '.join(myuseexpandvars[hostuseexpand]) + '"\n')
38 - # write out a shipable version
39 - target_portdir = normpath(self.settings["repo_basedir"] + "/" +
40 - self.settings["repo_name"])
41
42 - myf.write('PORTDIR="%s"\n' % target_portdir)
43 + myf.write('PORTDIR="%s"\n' % self.settings['target_portdir'])
44 myf.write('DISTDIR="%s"\n' % self.settings['target_distdir'])
45 myf.write('PKGDIR="%s"\n' % self.settings['target_pkgdir'])
46 if setup:
47
48 diff --git a/catalyst/defaults.py b/catalyst/defaults.py
49 index 9878b426..bbefa3a8 100644
50 --- a/catalyst/defaults.py
51 +++ b/catalyst/defaults.py
52 @@ -65,7 +65,6 @@ confdefaults = {
53 "pkgdir": "/var/cache/binpkgs",
54 "port_tmpdir": "/var/tmp/portage",
55 "PythonDir": "./catalyst",
56 - "repo_basedir": "/var/db/repos",
57 "repo_name": "gentoo",
58 "repos": "%(storedir)s/repos",
59 "sharedir": "/usr/share/catalyst",
60
61 diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
62 index c1ebe9dd..b7d493eb 100644
63 --- a/doc/catalyst-config.5.txt
64 +++ b/doc/catalyst-config.5.txt
65 @@ -108,10 +108,6 @@ Defaults to the host's DISTDIR.
66 The directory in which git repositories exist for use by the snapshot target.
67 Defaults to `${storedir}/repos`.
68
69 -*repo_basedir*::
70 -The target repository directory to contain the primary repo (gentoo repo) and
71 -any overlays. The default location is `/var/db/repos`.
72 -
73 *repo_name*::
74 The name of the main repository (e.g. gentoo). The git repository at
75 `${repos}/${repo_name}.git` will be used to produce the portdir sqfs
76
77 diff --git a/targets/stage2/chroot.sh b/targets/stage2/chroot.sh
78 index bf98d328..aac9a92d 100755
79 --- a/targets/stage2/chroot.sh
80 +++ b/targets/stage2/chroot.sh
81 @@ -9,7 +9,7 @@ export CONFIG_PROTECT="-* /etc/locale.gen"
82 echo "$locales" > /etc/locale.gen
83
84 ## START BUILD
85 -${clst_repo_basedir}/${clst_repo_name}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
86 +${clst_target_portdir}/scripts/bootstrap.sh ${bootstrap_opts} || exit 1
87
88 # Replace modified /etc/locale.gen with default
89 etc-update --automode -5
90
91 diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh
92 index b1049671..8297e60d 100755
93 --- a/targets/support/livecdfs-update.sh
94 +++ b/targets/support/livecdfs-update.sh
95 @@ -257,7 +257,7 @@ case ${clst_livecd_type} in
96 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
97
98 # This is my hack to reduce tmpfs usage
99 - cp -r ${clst_repo_basedir}/${clst_repo_name}/{profiles,eclass} /usr/livecd
100 + cp -r ${clst_target_portdir}/{profiles,eclass} /usr/livecd
101 rm -rf /usr/livecd/profiles/{co*,default-{1*,a*,b*,d*,h*,i*,m*,p*,s*,x*},g*,hardened-*,n*,x*}
102 mv -f /etc/gconf /usr/livecd
103 ln -sf /usr/livecd/gconf /etc/gconf