Install 32bit Firefox on arm64 systems since 64bit is unstable.

This commit is contained in:
Igor Pecovnik 2016-10-07 17:56:32 +02:00
parent 533bdda2b0
commit f5cef19f48
2 changed files with 5 additions and 1 deletions

View File

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

View File

@ -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"' \