[gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/stage1/

[gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/stage1/

[Matt Turner]

commit:     6cc91ad95f55a7e54a627e25953414d84d9646ca
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:52:40 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 16:02:12 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=6cc91ad9

targets: Move ${buildpkgs} error checking closer

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
(cherry picked from commit 5f62563f52a81b578703f140361a5fcec96e75e5)

 targets/stage1/stage1-chroot.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index df86487e..4cd0f29f 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -5,12 +5,6 @@ source /tmp/chroot-functions.sh
 # We do this first, so we know our package list for --debug
 buildpkgs=($(/tmp/build.py))
 
-# Setup our environment
-[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
-BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
-
-FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
-
 ## Sanity check profile
 if [[ ${#buildpkgs[@]} -eq 0 ]]; then
 	echo "Your profile seems to be broken."
@@ -19,6 +13,12 @@ if [[ ${#buildpkgs[@]} -eq 0 ]]; then
 	exit 1
 fi
 
+# Setup our environment
+[ -n "${clst_BINDIST}" ] && BINDIST="bindist"
+BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
+
+FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
+
 # We need to ensure the base stage3 has USE="bindist"
 # if BINDIST is set to avoid issues with openssl / openssh
 [ -e ${clst_make_conf} ] && echo "USE=\"${BINDIST} ${USE}\"" >> ${clst_make_conf}

[gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/stage1/

[Matt Turner]

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.
 #

[gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/stage1/

[Matt Turner]

commit:     4402fa44a4a01dc6ba6f782533b380d4a096fe58
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:51:53 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 16:01:28 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=4402fa44

targets: Make ${buildpkgs} an array

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
(cherry picked from commit 0a0efebb7834f00cea0bb35d708a56ad635627a8)

 targets/stage1/stage1-chroot.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 0f2c0869..df86487e 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
-buildpkgs="$(/tmp/build.py)"
+buildpkgs=($(/tmp/build.py))
 
 # Setup our environment
 [ -n "${clst_BINDIST}" ] && BINDIST="bindist"
@@ -12,8 +12,7 @@ BOOTSTRAP_USE="$(portageq envvar BOOTSTRAP_USE)"
 FEATURES="${clst_myfeatures} nodoc noman noinfo -news"
 
 ## Sanity check profile
-if [ -z "${buildpkgs}" ]
-then
+if [[ ${#buildpkgs[@]} -eq 0 ]]; then
 	echo "Your profile seems to be broken."
 	echo "Could not build a list of build packages."
 	echo "Double check your ${clst_port_conf}/make.profile link and the 'packages' files."
@@ -72,7 +71,7 @@ if [ -e ${clst_make_conf} ]; then
 	done
 fi
 
-run_merge "--oneshot ${buildpkgs}"
+run_merge "--oneshot ${buildpkgs[@]}"
 
 # TODO: Drop this when locale-gen in stable glibc supports ROOT.
 #

[gentoo-commits] proj/catalyst:catalyst-3.0-stable commit in: targets/stage1/

[Matt Turner]

commit:     e9d00e2627bb9bc5376761f6ef26935123aa9479
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 03:29:56 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 16 16:02:26 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e9d00e26

targets: Use interpreter with portage module for build.py

Closes: https://bugs.gentoo.org/759685
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
(cherry picked from commit 37cabf5c536fe8eef16532f18790c1da566aae15)

 targets/stage1/stage1-chroot.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
index 4cd0f29f..99539886 100755
--- a/targets/stage1/stage1-chroot.sh
+++ b/targets/stage1/stage1-chroot.sh
@@ -2,8 +2,13 @@
 
 source /tmp/chroot-functions.sh
 
-# We do this first, so we know our package list for --debug
-buildpkgs=($(/tmp/build.py))
+for module_path in /usr/lib/*/site-packages/portage/__init__.py; do
+	# Find the python interpreter
+	interpreter=$(echo $module_path | cut -d/ -f4)
+
+	buildpkgs=($($interpreter /tmp/build.py 2>/dev/null))
+	[[ $? == 0 ]] && break
+done
 
 ## Sanity check profile
 if [[ ${#buildpkgs[@]} -eq 0 ]]; then