enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doker x64 and aarch64 2 (#2876)

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

* +1
This commit is contained in:
iav 2021-06-06 21:54:22 +03:00 committed by GitHub
parent 57fe952c4f
commit 3145a8d289
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/sources/families/include/meson64_common.inc
View File

@ -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

27
config/sources/families/include/rockchip64_common.inc
View File

@ -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
: