mirror of
https://github.com/armbian/build
synced 2025-09-24 19:47:06 +07:00
armbian-next: cleanup, kill and add to-do's, remove dead code, turn down logging, squash future shortcircuit bugs
- killed `[[ $ROOTFS_TYPE != ext4 ]] && display_alert "Assuming ${BOARD} ${BRANCH} kernel supports ${ROOTFS_TYPE}" "" "wrn"`
- which definitely didn't belong in rootfs
- disable usage of run_host_command_logged_long_running for kernel-make
- stop lying about long_running stuff being any different from non-long_running versions
- stop lying about 'set -e' when there's still a bunch of pipes for "pv" and stuff all around
This commit is contained in:
@@ -50,29 +50,6 @@ function prepare_host_noninteractive() {
|
||||
export LC_ALL="en_US.UTF-8"
|
||||
export LC_MESSAGES="en_US.UTF-8"
|
||||
|
||||
# @TODO kill this
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## # armbian-next: Armbian mirrors and the download code is highly unstable; disable by default
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## # armbian-next: set `SKIP_ARMBIAN_ROOTFS_CACHE=no` to enable
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## # don't use mirrors that throws garbage on 404
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## if [[ -z ${ARMBIAN_MIRROR} && "${SKIP_ARMBIAN_REPO}" != "yes" && "${SKIP_ARMBIAN_ROOTFS_CACHE:-"yes"}" != "yes" ]]; then
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## display_alert "Determining best Armbian mirror to use" "via redirector" "debug"
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## declare -i armbian_mirror_tries=1
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## while true; do
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## display_alert "Obtaining Armbian mirror" "via https://redirect.armbian.com" "debug"
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## ARMBIAN_MIRROR=$(wget -SO- -T 1 -t 1 https://redirect.armbian.com 2>&1 | egrep -i "Location" | awk '{print $2}' | head -1)
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## if [[ ${ARMBIAN_MIRROR} != *armbian.hosthatch* ]]; then
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## display_alert "Obtained Armbian mirror OK" "${ARMBIAN_MIRROR}" "debug"
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## break
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## else
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## display_alert "Obtained Armbian mirror is invalid, retrying..." "${ARMBIAN_MIRROR}" "debug"
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## fi
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## armbian_mirror_tries=$((armbian_mirror_tries + 1))
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## if [[ $armbian_mirror_tries -ge 5 ]]; then
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## exit_with_error "Unable to obtain ARMBIAN_MIRROR after ${armbian_mirror_tries} tries. Please set ARMBIAN_MIRROR to a valid mirror manually, or avoid the automatic mirror selection by setting SKIP_ARMBIAN_REPO=yes"
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## fi
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## done
|
||||
## DEAD CODE? nothing uses ARMBIAN_MIRROR ## fi
|
||||
|
||||
declare -g USE_LOCAL_APT_DEB_CACHE=${USE_LOCAL_APT_DEB_CACHE:-yes} # Use SRC/cache/aptcache as local apt cache by default
|
||||
display_alert "Using local apt cache?" "USE_LOCAL_APT_DEB_CACHE: ${USE_LOCAL_APT_DEB_CACHE}" "debug"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user