From aa4355cdb5d84af064b9f1c94939bb0d8fdb71db Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Tue, 2 Mar 2021 13:49:53 +0100 Subject: [PATCH] dev-util/catalyst: use python3 in chroot-functions for portage dbg output Signed-off-by: Thilo Fromm --- .../catalyst/catalyst-3.0.14-r1.ebuild | 1 + ...t-funcs-use-python3-for-debug-output.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/0005-chroot-funcs-use-python3-for-debug-output.patch diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-3.0.14-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-3.0.14-r1.ebuild index 6191682d61..0b485d2078 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/catalyst-3.0.14-r1.ebuild +++ b/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() { diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/0005-chroot-funcs-use-python3-for-debug-output.patch b/sdk_container/src/third_party/coreos-overlay/dev-util/catalyst/files/0005-chroot-funcs-use-python3-for-debug-output.patch new file mode 100644 index 0000000000..19385f05cd --- /dev/null +++ b/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