From 3145a8d2891199cb5749297aedc6d91c3c9049c2 Mon Sep 17 00:00:00 2001
From: iav <iav@iav.lv>
Date: Sun, 6 Jun 2021 21:54:22 +0300
Subject: [PATCH] Doker x64 and aarch64 2 (#2876)

* missed part from #2867. found 2 same calls need to be handled same way

* +1
---
 .../families/include/meson64_common.inc       |  4 +--
 .../families/include/rockchip64_common.inc    | 27 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc
index 42570ddf69..9ff97bc272 100644
--- a/config/sources/families/include/meson64_common.inc
+++ b/config/sources/families/include/meson64_common.inc
@@ -40,8 +40,8 @@ case $BRANCH in
 esac
 
 if [ "$(uname -m)" = "aarch64" ]; then
-	if [ "$(lsb_release -sc)" = "focal" ]; then
-		PKG_PREFIX="qemu-x86_64-static "
+	if [[ "$(lsb_release -sc)" == "focal" || "$(lsb_release -sc)" == "hirsute" ]]; then
+		PKG_PREFIX="qemu-x86_64-static -L /usr/x86_64-linux-gnu "
 	else
 		PKG_PREFIX="qemu-x86_64 "
 	fi
diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc
index 8d516fcbc0..53190da81a 100644
--- a/config/sources/families/include/rockchip64_common.inc
+++ b/config/sources/families/include/rockchip64_common.inc
@@ -12,6 +12,19 @@ BOOTBRANCH="tag:v2020.10"
 PACKAGE_LIST_FAMILY="ethtool"
 
 RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
+if [ "$(uname -m)" = "aarch64" ]; then
+	case "$(lsb_release -sc)" in
+		"focal"|"hirsute")
+			PKG_PREFIX="qemu-x86_64-static -L /usr/x86_64-linux-gnu "
+		;;
+	*)
+		PKG_PREFIX="qemu-x86_64 -L /usr/x86_64-linux-gnu "
+		;;
+	esac
+else
+	PKG_PREFIX=""
+fi
+
 
 if [[ $BOOTCONFIG == *3399* ]]; then
 
@@ -190,20 +203,6 @@ legacy_uboot_locations()
 
 uboot_custom_postprocess()
 {
-	if [ "$(uname -m)" = "aarch64" ]; then
-		case "$(lsb_release -sc)" in
-			"focal"|"hirsute")
-				PKG_PREFIX="qemu-x86_64-static -L /usr/x86_64-linux-gnu "
-			;;
-		*)
-			PKG_PREFIX="qemu-x86_64 -L /usr/x86_64-linux-gnu "
-			;;
-		esac
-	else
-		PKG_PREFIX=""
-	fi
-
-	RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
 
 	if [[ $BOOT_USE_MAINLINE_ATF == yes || $BOOT_USE_TPL_SPL_BLOB == yes ]]; then
 		: