JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix bootsplash and move set PKG_PREFIX to arm64.conf (#3410)

Browse Source
This commit is contained in:
Oleg
2022-01-22 21:49:06 +03:00
committed by GitHub
parent d1e8c0d27b
commit e4c3b9916c
4 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/sources/arm64.conf
View File

@@ -50,3 +50,16 @@ fi
## System toolchains don't have the -none- variant, remove it
[[ "${SKIP_EXTERNAL_TOOLCHAINS}" == "yes" ]] && [[ "${UBOOT_COMPILER}" = *none* ]] && UBOOT_COMPILER="${UBOOT_COMPILER//-none-/-}"
[[ "${SKIP_EXTERNAL_TOOLCHAINS}" == "yes" ]] && [[ "${ATF_COMPILER}" = *none* ]] && ATF_COMPILER="${ATF_COMPILER//-none-/-}"
if [ "$(uname -m)" = "aarch64" ]; then
case "$(lsb_release -sc)" in
"bullseye"|"focal"|"hirsute"|"impish"|"jammy")
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

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

@@ -40,15 +40,15 @@ case $BRANCH in
esac
if [ "$(uname -m)" = "aarch64" ]; then
if [[ "$(lsb_release -sc)" == "bullseye" || "$(lsb_release -sc)" == "focal" || "$(lsb_release -sc)" == "hirsute" || "$(lsb_release -sc)" == "impish" || "$(lsb_release -sc)" == "jammy" ]]; then
PKG_PREFIX="qemu-x86_64-static -L /usr/x86_64-linux-gnu "
else
PKG_PREFIX="qemu-x86_64 "
fi
else
PKG_PREFIX=""
fi
#if [ "$(uname -m)" = "aarch64" ]; then
# if [[ "$(lsb_release -sc)" == "bullseye" || "$(lsb_release -sc)" == "focal" || "$(lsb_release -sc)" == "hirsute" || "$(lsb_release -sc)" == "impish" || "$(lsb_release -sc)" == "jammy" ]]; then
# PKG_PREFIX="qemu-x86_64-static -L /usr/x86_64-linux-gnu "
# else
# PKG_PREFIX="qemu-x86_64 "
# fi
#else
# PKG_PREFIX=""
#fi
# this helper function includes postprocess for p212 and its variants.
# $1 PATH for uboot blob repo

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

@@ -15,18 +15,18 @@ BOOTPATCHDIR="u-boot-rockchip64"
PACKAGE_LIST_FAMILY="ethtool"
RKBIN_DIR="$SRC/cache/sources/rkbin-tools"
if [ "$(uname -m)" = "aarch64" ]; then
case "$(lsb_release -sc)" in
"bullseye"|"focal"|"hirsute"|"impish"|"jammy")
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 [ "$(uname -m)" = "aarch64" ]; then
# case "$(lsb_release -sc)" in
# "bullseye"|"focal"|"hirsute"|"impish"|"jammy")
# 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
BOOT_SOC=`expr $BOOTCONFIG : '.*\(rk[[:digit:]]\+.*\)_.*'`

2
lib/general.sh
View File

@@ -705,7 +705,7 @@ display_alert "Building kernel splash logo" "$RELEASE" "info"
THROBBER_HEIGHT=$(identify $THROBBER | head -1 | cut -d " " -f 3 | cut -d x -f 2)
convert -alpha remove -background "#000000" $LOGO "${SDCARD}"/tmp/logo.rgb
convert -alpha remove -background "#000000" $THROBBER "${SDCARD}"/tmp/throbber%02d.rgb
${SRC}/packages/blobs/splash/bootsplash-packer \
$PKG_PREFIX${SRC}/packages/blobs/splash/bootsplash-packer \
--bg_red 0x00 \
--bg_green 0x00 \
--bg_blue 0x00 \