diff --git a/README.md b/README.md index c1e8cdc4f..58176de21 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Supported build environment is **Ubuntu Bionic 18.04 x64** ([minimal iso image]( **Execution** - apt-get -y install git + apt -y install git git clone https://github.com/armbian/build cd build ./compile.sh diff --git a/compile.sh b/compile.sh index ed5a6bdce..6257109db 100755 --- a/compile.sh +++ b/compile.sh @@ -87,8 +87,8 @@ rm $TMPFILE # Check for Vagrant if [[ "$1" == vagrant && -z "$(which vagrant)" ]]; then display_alert "Vagrant not installed." "Installing" - sudo apt-get update - sudo apt-get install -y vagrant virtualbox + sudo apt update + sudo apt install -y vagrant virtualbox fi if [[ "$1" == dockerpurge && -f /etc/debian_version ]]; then @@ -116,12 +116,12 @@ if [[ "$1" == docker && -f /etc/debian_version && -z "$(which docker)" ]]; then do [[ ! $(which $i) ]] && install_packages+=$i" " done - [[ -z $install_packages ]] && apt-get update;apt-get install -y -qq --no-install-recommends $install_packages + [[ -z $install_packages ]] && apt update;apt install -y -qq --no-install-recommends $install_packages curl -fsSL "https://download.docker.com/linux/$(lsb_release -is | awk '{print tolower($0)}')/gpg" | apt-key add -qq - > /dev/null 2>&1 export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get install -y -qq --no-install-recommends docker-ce + apt update + apt install -y -qq --no-install-recommends docker-ce display_alert "Add yourself to docker group to avoid root privileges" "" "wrn" "$SRC/compile.sh" "$@" exit $? diff --git a/lib/chroot-buildpackages.sh b/lib/chroot-buildpackages.sh index fdba393ca..c67e9b927 100644 --- a/lib/chroot-buildpackages.sh +++ b/lib/chroot-buildpackages.sh @@ -156,7 +156,7 @@ chroot_build_packages() local t=$target_dir/root/.update-timestamp if [[ ! -f $t || $(( ($(date +%s) - $(<$t)) / 86400 )) -gt 7 ]]; then display_alert "Upgrading packages" "$release/$arch" "info" - systemd-nspawn -a -q -D $target_dir /bin/bash -c "apt-get -q update; apt-get -q -y upgrade; apt-get clean" + systemd-nspawn -a -q -D $target_dir /bin/bash -c "apt -q update; apt -q -y upgrade; apt clean" date +%s > $t fi @@ -219,8 +219,8 @@ chroot_build_packages() for packet in $package_builddeps; do grep -q -x -e "\$packet" <<< "\$installed" || deps+=("\$packet"); done if [[ \${#deps[@]} -gt 0 ]]; then display_alert "Installing build dependencies" - apt-get -y -q update - apt-get -y -q --no-install-recommends --show-progress -o DPKG::Progress-Fancy=1 install "\${deps[@]}" + apt -y -q update + apt -y -q --no-install-recommends --show-progress -o DPKG::Progress-Fancy=1 install "\${deps[@]}" fi fi display_alert "Copying sources" @@ -333,17 +333,17 @@ chroot_installpackages() cat <<-EOF > "${SDCARD}"/tmp/install.sh #!/bin/bash [[ "$remote_only" != yes ]] && apt-key add /tmp/buildpkg.key - apt-get $apt_extra -q update + apt $apt_extra -q update # uncomment to debug # /bin/bash # TODO: check if package exists in case new config was added #if [[ -n "$remote_only" == yes ]]; then # for p in $install_list; do # if grep -qE "apt.armbian.com|localhost" <(apt-cache madison \$p); then - # if apt-get -s -qq install \$p; then + # if apt -s -qq install \$p; then #fi - apt-get -q $apt_extra --show-progress -o DPKG::Progress-Fancy=1 install -y $install_list - apt-get clean + apt -q $apt_extra --show-progress -o DPKG::Progress-Fancy=1 install -y $install_list + apt clean [[ "$remote_only" != yes ]] && apt-key del "925644A6" rm /etc/apt/sources.list.d/armbian-temp.list 2>/dev/null rm /etc/apt/preferences.d/90-armbian-temp.pref 2>/dev/null diff --git a/lib/configuration.sh b/lib/configuration.sh index ff310df4a..ba55de0d6 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -252,10 +252,12 @@ esac DEBIAN_MIRROR='httpredir.debian.org/debian' +DEBIAN_SECURTY='http://security.debian.org/' UBUNTU_MIRROR='ports.ubuntu.com/' if [[ $DOWNLOAD_MIRROR == china ]] ; then DEBIAN_MIRROR='mirrors.tuna.tsinghua.edu.cn/debian' + DEBIAN_SECURTY='mirrors.tuna.tsinghua.edu.cn/debian-security' UBUNTU_MIRROR='mirrors.tuna.tsinghua.edu.cn/ubuntu-ports/' fi diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh index 707b37c60..7a992f823 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -124,7 +124,7 @@ create_rootfs_cache() # stage: debootstrap base system if [[ $NO_APT_CACHER != yes ]]; then - # apt-cacher-ng apt-get proxy parameter + # apt-cacher-ng apt proxy parameter local apt_extra="-o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\"" local apt_mirror="http://${APT_PROXY_ADDR:-localhost:3142}/$APT_MIRROR" else @@ -194,7 +194,7 @@ create_rootfs_cache() # stage: update packages list display_alert "Updating package list" "$RELEASE" "info" - eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "apt-get -q -y $apt_extra update"' \ + eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "apt -q -y $apt_extra update"' \ ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'} \ ${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Updating package lists..." $TTY_Y $TTY_X'} \ ${OUTPUT_VERYSILENT:+' >/dev/null 2>/dev/null'} @@ -203,7 +203,7 @@ create_rootfs_cache() # stage: upgrade base packages from xxx-updates and xxx-backports repository branches display_alert "Upgrading base packages" "Armbian" "info" - eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -y -q \ + eval 'LC_ALL=C LANG=C chroot $SDCARD /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -y -q \ $apt_extra $apt_extra_progress upgrade"' \ ${PROGRESS_LOG_TO_FILE:+' | tee -a $DEST/debug/debootstrap.log'} \ ${OUTPUT_DIALOG:+' | dialog --backtitle "$backtitle" --progressbox "Upgrading base packages..." $TTY_Y $TTY_X'} \ @@ -222,7 +222,7 @@ create_rootfs_cache() [[ ${PIPESTATUS[0]} -ne 0 ]] && exit_with_error "Installation of Armbian packages failed" # stage: remove downloaded packages - chroot $SDCARD /bin/bash -c "apt-get clean" + chroot $SDCARD /bin/bash -c "apt clean" # DEBUG: print free space echo -e "\nFree space:" diff --git a/lib/desktop.sh b/lib/desktop.sh index 68ce71875..4a47cbbf9 100644 --- a/lib/desktop.sh +++ b/lib/desktop.sh @@ -120,18 +120,18 @@ desktop_postinstall () { # disable display manager for first run chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload disable lightdm.service >/dev/null 2>&1" + chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt update" >> "${DEST}"/debug/install.log if [[ ${FULL_DESKTOP} == yes ]]; then - chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get update" >> "${DEST}"/debug/install.log - chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get update; apt-get -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_FULL" >> "${DEST}"/debug/install.log + chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_FULL" >> "${DEST}"/debug/install.log fi if [[ -n ${PACKAGE_LIST_DESKTOP_BOARD} ]]; then - chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get update; apt-get -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_BOARD" >> "${DEST}"/debug/install.log + chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_BOARD" >> "${DEST}"/debug/install.log fi if [[ -n ${PACKAGE_LIST_DESKTOP_FAMILY} ]]; then - chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get update; apt-get -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_FAMILY" >> "${DEST}"/debug/install.log - fi + chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq --no-install-recommends install $PACKAGE_LIST_DESKTOP_FAMILY" >> "${DEST}"/debug/install.log + fi # Compile Turbo Frame buffer for sunxi if [[ $LINUXFAMILY == sun* && $BRANCH == default ]]; then diff --git a/lib/general.sh b/lib/general.sh index 10b7589d2..887f28e19 100644 --- a/lib/general.sh +++ b/lib/general.sh @@ -144,8 +144,8 @@ create_sources_list() deb http://${DEBIAN_MIRROR} ${release}-backports main contrib non-free #deb-src http://${DEBIAN_MIRROR} ${release}-backports main contrib non-free - deb http://security.debian.org/ ${release}/updates main contrib non-free - #deb-src http://security.debian.org/ ${release}/updates main contrib non-free + deb http://${DEBIAN_SECURTY} ${release}/updates main contrib non-free + #deb-src http://${DEBIAN_SECURTY} ${release}/updates main contrib non-free EOF ;; diff --git a/lib/image-helpers.sh b/lib/image-helpers.sh index dc9541dfd..7afaaa3e6 100644 --- a/lib/image-helpers.sh +++ b/lib/image-helpers.sh @@ -126,7 +126,7 @@ install_deb_chroot() cp "${package}" "${SDCARD}/root/${name}" display_alert "Installing" "$name" [[ $NO_APT_CACHER != yes ]] && local apt_extra="-o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\" -o Acquire::http::Proxy::localhost=\"DIRECT\"" - LC_ALL=C LANG=C chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -yqq \ + LC_ALL=C LANG=C chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt -yqq \ $apt_extra --no-install-recommends install ./root/$name" >> "${DEST}"/debug/install.log 2>&1 rm -f "${SDCARD}/root/${name}"