Merge pull request #874 from kinvolk/t-lo/fix-sdk-bootstrap

fix sdk bootstrap: use python3 in catalyst chroot-functions, set cros_host USE when bootstrapping

sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-3.0.14-r1.ebuild

@@ -58,6 +58,7 @@ PATCHES=(
 	"${FILESDIR}/0002-catalyst-Remove-Maintained-by-sections.patch"
 	"${FILESDIR}/0003-catalyst-Remove-unnecessary-future-imports.patch"
 	"${FILESDIR}/0004-catalyst-Use-python3-shebangs.patch"
+	"${FILESDIR}/0005-chroot-funcs-use-python3-for-debug-output.patch"
 )
 
 python_prepare_all() {

sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/0005-chroot-funcs-use-python3-for-debug-output.patch

@@ -0,0 +1,20 @@
+diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
+index f3727d0..e1c82c1 100755
+--- a/targets/support/chroot-functions.sh
++++ b/targets/support/chroot-functions.sh
+@@ -285,13 +285,13 @@ run_merge() {
+ }
+ 
+ show_debug() {
+-	if [ "${clst_DEBUG}" = "1" ]
++	if [ -n "${clst_DEBUG}" ]
+ 	then
+ 		unset PACKAGES
+ 		echo "DEBUG:"
+ 		echo "Profile/target info:"
+ 		echo "Profile inheritance:"
+-		python -c 'import portage; print(portage.settings.profiles)'
++		python3 -c 'import portage; print(portage.settings.profiles)'
+ 		echo
+ 		# TODO: make this work on non-portage
+ 		emerge --info

sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/make.defaults

@@ -1,3 +1,7 @@
 # Enable optimizations for common x86_64 CPUs
 CFLAGS="-O2 -pipe -mtune=generic"
 CXXFLAGS="${CFLAGS}"
+
+# add cros_host to bootstrapping USE flags so SDK / toolchains bootstrapping
+# will use vim's vimrc instead of baselayouts',
+BOOTSTRAP_USE="$BOOTSTRAP_USE cros_host"