From 4055399d15ee0464e6a296aafd40cd370cb8bdad Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Mon, 18 Jul 2022 14:42:45 +0200
Subject: [PATCH] armbian-next: sources/families: meson64: gx: use `python2`
 explicitly for calling `acs_tool.pyc`; better logging

---
 .../families/include/meson64_common.inc       |  2 +-
 config/sources/families/meson-gxbb.conf       | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc
index a79ac68f53..2ff1d20ced 100644
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@@ -50,7 +50,7 @@ uboot_gxl_postprocess() {
 		$1/$2/bl301_zero.bin \
 		$1/$2/bl30_new.bin bl30
 
-	run_host_command_logged python $1/acs_tool.pyc $1/$2/bl2.bin \
+	run_host_command_logged python2 $1/acs_tool.pyc $1/$2/bl2.bin \
 		$1/$2/bl2_acs.bin \
 		$1/$2/acs.bin 0
 
diff --git a/config/sources/families/meson-gxbb.conf b/config/sources/families/meson-gxbb.conf
index 2c02fbc6d2..33e8ea9c16 100644
--- a/config/sources/families/meson-gxbb.conf
+++ b/config/sources/families/meson-gxbb.conf
@@ -4,28 +4,28 @@ if [[ $BOARD == odroidc2 ]]; then
 fi
 
 uboot_custom_postprocess() {
+	local fip_blobs_dir="$SRC/cache/sources/odroidc2-blobs/"
+
 	if [[ $BOARD == odroidc2 ]]; then
-		local fip_blobs_dir="$SRC/cache/sources/odroidc2-blobs/"
 		run_host_x86_binary_logged $fip_blobs_dir/fip_create --bl30 $fip_blobs_dir/gxb/bl30.bin \
 			--bl301 $fip_blobs_dir/gxb/bl301.bin \
 			--bl31 $fip_blobs_dir/gxb/bl31.bin \
 			--bl33 u-boot.bin \
 			fip.bin
 		run_host_x86_binary_logged $fip_blobs_dir/fip_create --dump fip.bin
-		cat $fip_blobs_dir/gxb/bl2.package fip.bin > boot_new.bin
-		rm -f u-boot.img
+		run_host_command_logged cat $fip_blobs_dir/gxb/bl2.package fip.bin ">" boot_new.bin
+		run_host_command_logged rm -fv u-boot.img
 		run_host_x86_binary_logged $fip_blobs_dir/gxb/aml_encrypt_gxb --bootsig \
 			--input boot_new.bin \
 			--output u-boot.img
-		rm -f u-boot.bin
-		dd if=u-boot.img of=u-boot.bin bs=512 skip=96 status=none
+		run_host_command_logged rm -fv u-boot.bin
+		run_host_command_logged dd if=u-boot.img of=u-boot.bin bs=512 skip=96 status=none
 	fi
 
 	if [[ $BOARD == nanopik2-s905 ]]; then
-		local fip_blobs_dir=$SRC/cache/sources/odroidc2-blobs/
-		mv u-boot.bin bl33.bin
+		run_host_command_logged mv -v u-boot.bin bl33.bin
 
-		$fip_blobs_dir/blx_fix.sh $fip_blobs_dir/k2/bl30.bin \
+		run_host_command_logged $fip_blobs_dir/blx_fix.sh $fip_blobs_dir/k2/bl30.bin \
 			$fip_blobs_dir/k2/zero_tmp \
 			$fip_blobs_dir/k2/bl30_zero.bin \
 			$fip_blobs_dir/k2/bl301.bin \
@@ -39,18 +39,18 @@ uboot_custom_postprocess() {
 
 		run_host_x86_binary_logged $fip_blobs_dir/k2/fip_create --dump $fip_blobs_dir/k2/fip.bin
 
-		python $fip_blobs_dir/acs_tool.pyc $fip_blobs_dir/k2/bl2.bin \
+		run_host_command_logged python2 $fip_blobs_dir/acs_tool.pyc $fip_blobs_dir/k2/bl2.bin \
 			$fip_blobs_dir/k2/bl2_acs.bin \
 			$fip_blobs_dir/k2/acs.bin 0
 
-		$fip_blobs_dir/blx_fix.sh $fip_blobs_dir/k2/bl2_acs.bin \
+		run_host_command_logged $fip_blobs_dir/blx_fix.sh $fip_blobs_dir/k2/bl2_acs.bin \
 			$fip_blobs_dir/k2/zero_tmp \
 			$fip_blobs_dir/k2/bl2_zero.bin \
 			$fip_blobs_dir/k2/bl21.bin \
 			$fip_blobs_dir/k2/bl21_zero.bin \
 			$fip_blobs_dir/k2/bl2_new.bin bl2
 
-		cat $fip_blobs_dir/k2/bl2_new.bin $fip_blobs_dir/k2/fip.bin > boot_new.bin
+		run_host_command_logged cat $fip_blobs_dir/k2/bl2_new.bin $fip_blobs_dir/k2/fip.bin ">" boot_new.bin
 
 		run_host_x86_binary_logged $fip_blobs_dir/k2/aml_encrypt_gxb --bootsig \
 			--input boot_new.bin \