commit: e43704eba87e44946cf0a36e74f97e42a2b1d7ab
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:42:52 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 16:01:23 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e43704eb
targets: Rename clst_buildpkgs -> buildpkgs
And remove the unnecessary export.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
(cherry picked from commit d1ce4b31637d143eda05472d2216db40d001169c)
targets/stage1/stage1-chroot.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index f0393893..0f2c0869 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -3,7 +3,7 @@
source /tmp/chroot-functions.sh
# We do this first, so we know our package list for --debug
-export clst_buildpkgs="$(/tmp/build.py)"
+buildpkgs="$(/tmp/build.py)"
# Setup our environment
[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
@@ -12,7 +12,7 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
## Sanity check profile
-if [ -z "${clst_buildpkgs}" ]
+if [ -z "${buildpkgs}" ]
then
echo "Your profile seems to be broken."
echo "Could not build a list of build packages."
@@ -72,7 +72,7 @@ if [ -e ${clst_make_conf} ]; then
done
fi
-run_merge "--oneshot ${clst_buildpkgs}"
+run_merge "--oneshot ${buildpkgs}"
# TODO: Drop this when locale-gen in stable glibc supports ROOT.
#
