From f5cef19f483813c9398aea5e951e1edb099e4eff Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Fri, 7 Oct 2016 17:56:32 +0200 Subject: [PATCH] Install 32bit Firefox on arm64 systems since 64bit is unstable. --- configuration.sh | 3 ++- debootstrap-ng.sh | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/configuration.sh b/configuration.sh index 6002c66a47..571ec6f9f5 100644 --- a/configuration.sh +++ b/configuration.sh @@ -146,7 +146,8 @@ fi # Build final package list after possible override PACKAGE_LIST="$PACKAGE_LIST $PACKAGE_LIST_RELEASE $PACKAGE_LIST_ADDITIONAL" [[ $BUILD_DESKTOP == yes ]] && PACKAGE_LIST="$PACKAGE_LIST $PACKAGE_LIST_DESKTOP" - +[[ $ARCH == arm64 ]] && PACKAGE_LIST_DESKTOP="${PACKAGE_LIST_DESKTOP/iceweasel/iceweasel:armhf}" +[[ $ARCH == arm64 ]] && PACKAGE_LIST_DESKTOP="${PACKAGE_LIST_DESKTOP/firefox/firefox:armhf}" # debug cat <<-EOF >> $DEST/debug/output.log ## BUILD SCRIPT ENVIRONMENT diff --git a/debootstrap-ng.sh b/debootstrap-ng.sh index ce8a389211..2a97c6f0a5 100644 --- a/debootstrap-ng.sh +++ b/debootstrap-ng.sh @@ -207,6 +207,9 @@ create_rootfs_cache() ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} rm $CACHEDIR/sdcard/armbian.key + # add armhf arhitecture to arm64 + [[ $ARCH == arm64 ]] && eval 'LC_ALL=C LANG=C chroot $CACHEDIR/sdcard /bin/bash -c "dpkg --add-architecture armhf"' + # stage: update packages list display_alert "Updating package list" "$RELEASE" "info" eval 'LC_ALL=C LANG=C chroot $CACHEDIR/sdcard /bin/bash -c "apt-get -q -y $apt_extra update"' \