diff --git a/lib/configuration.sh b/lib/configuration.sh index db6e1688d8..73110c15fa 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -29,7 +29,7 @@ HOSTRELEASE=$(cat /etc/os-release | grep VERSION_CODENAME | cut -d"=" -f2) [[ -z $EXIT_PATCHING_ERROR ]] && EXIT_PATCHING_ERROR="" # exit patching if failed [[ -z $HOST ]] && HOST="$BOARD" # set hostname to the board cd "${SRC}" || exit -[[ -z "${ROOTFSCACHE_VERSION}" ]] && ROOTFSCACHE_VERSION=12 +[[ -z "${ROOTFSCACHE_VERSION}" ]] && ROOTFSCACHE_VERSION=13 [[ -z "${CHROOT_CACHE_VERSION}" ]] && CHROOT_CACHE_VERSION=7 BUILD_REPOSITORY_URL=$(improved_git remote get-url $(improved_git remote 2>/dev/null | grep origin) 2>/dev/null) BUILD_REPOSITORY_COMMIT=$(improved_git describe --match=d_e_a_d_b_e_e_f --always --dirty 2>/dev/null) diff --git a/lib/debootstrap.sh b/lib/debootstrap.sh index d291ea63d3..726d80d5ef 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -362,7 +362,7 @@ create_rootfs_cache() [[ ${EVALPIPE[0]} -ne 0 ]] && exit_with_error "Purging of residual Armbian packages failed" # stage: remove downloaded packages - chroot $SDCARD /bin/bash -c "apt-get clean" + chroot $SDCARD /bin/bash -c "apt-get -y autoremove; apt-get clean" # DEBUG: print free space local freespace=$(LC_ALL=C df -h) @@ -391,7 +391,7 @@ create_rootfs_cache() umount_chroot "$SDCARD" tar cp --xattrs --directory=$SDCARD/ --exclude='./dev/*' --exclude='./proc/*' --exclude='./run/*' --exclude='./tmp/*' \ - --exclude='./sys/*' . | pv -p -b -r -s $(du -sb $SDCARD/ | cut -f1) -N "$display_name" | lz4 -5 -c > $cache_fname + --exclude='./sys/*' --exclude='./home/*' --exclude='./root/*' . | pv -p -b -r -s $(du -sb $SDCARD/ | cut -f1) -N "$display_name" | lz4 -5 -c > $cache_fname # sign rootfs cache archive that it can be used for web cache once. Internal purposes if [[ -n "${GPG_PASS}" && "${SUDO_USER}" ]]; then