diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2020-12-14 22:42:52 -0500 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2020-12-16 11:01:23 -0500 |
| commit | e43704eba87e44946cf0a36e74f97e42a2b1d7ab (patch) | |
| tree | bd79722582faf0ae67810dc26796c726eee03b39 | |
| parent | catalyst: Fix spec file USE flag parsing (diff) | |
| download | catalyst-e43704eba87e44946cf0a36e74f97e42a2b1d7ab.tar.gz catalyst-e43704eba87e44946cf0a36e74f97e42a2b1d7ab.tar.bz2 catalyst-e43704eba87e44946cf0a36e74f97e42a2b1d7ab.zip | |
targets: Rename clst_buildpkgs -> buildpkgs
And remove the unnecessary export.
Signed-off-by: Matt Turner <mattst88@gentoo.org>
(cherry picked from commit d1ce4b31637d143eda05472d2216db40d001169c)
| -rwxr-xr-x | targets/stage1/stage1-chroot.sh | 6 |
1 files 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. # |