diff --git a/config/sources/arm64.conf b/config/sources/arm64.conf index 1cb1bb89c7..6d274c005c 100644 --- a/config/sources/arm64.conf +++ b/config/sources/arm64.conf @@ -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 diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc index 2a7ab08c5a..084bd2183c 100644 --- a/config/sources/families/include/meson64_common.inc +++ b/config/sources/families/include/meson64_common.inc @@ -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 diff --git a/config/sources/families/include/rockchip64_common.inc b/config/sources/families/include/rockchip64_common.inc index 1cd00a82f1..ce2c9e8ddd 100644 --- a/config/sources/families/include/rockchip64_common.inc +++ b/config/sources/families/include/rockchip64_common.inc @@ -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:]]\+.*\)_.*'` diff --git a/lib/general.sh b/lib/general.sh index 882eacbedd..b6670ba5f9 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -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 \