Gentoo Archives: gentoo-catalyst

From: Matt Turner <mattst88@g.o>
To: gentoo-catalyst@l.g.o
Cc: Matt Turner <mattst88@g.o>
Subject: [gentoo-catalyst] [PATCH 1/5] targets: Rename clst_buildpkgs -> buildpkgs
Date: Wed, 16 Dec 2020 03:01:46
Message-Id: 20201216030131.14158-1-mattst88@gentoo.org
1 And remove the unnecessary export.
2
3 Signed-off-by: Matt Turner <mattst88@g.o>
4 ---
5 targets/stage1/chroot.sh | 6 +++---
6 1 file changed, 3 insertions(+), 3 deletions(-)
7
8 diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
9 index 2a8dc59b..dac52dfc 100755
10 --- a/targets/stage1/chroot.sh
11 +++ b/targets/stage1/chroot.sh
12 @@ -3,7 +3,7 @@
13 source /tmp/chroot-functions.sh
14
15 # We do this first, so we know our package list for --debug
16 -export clst_buildpkgs="$(/tmp/build.py)"
17 +buildpkgs="$(/tmp/build.py)"
18
19 # Setup our environment
20 [ -n "${clst_BINDIST}" ] && BINDIST="bindist"
21 @@ -12,7 +12,7 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
22 FEATURES="${FEATURES} nodoc noman noinfo"
23
24 ## Sanity check profile
25 -if [ -z "${clst_buildpkgs}" ]
26 +if [ -z "${buildpkgs}" ]
27 then
28 echo "Your profile seems to be broken."
29 echo "Could not build a list of build packages."
30 @@ -72,7 +72,7 @@ if [ -e ${clst_make_conf} ]; then
31 done
32 fi
33
34 -run_merge "--oneshot ${clst_buildpkgs}"
35 +run_merge "--oneshot ${buildpkgs}"
36
37 # TODO: Drop this when locale-gen in stable glibc supports ROOT.
38 #
39 --
40 2.26.2

Replies