From fadcab17a8127a635b57a6797ffeb6e8259c6baf Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sun, 15 Nov 2020 13:28:38 +0100 Subject: [PATCH] Cosmetic bugfix --- lib/distributions.sh | 2 +- lib/image-helpers.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/distributions.sh b/lib/distributions.sh index 5485920680..4bbbfaa3b3 100644 --- a/lib/distributions.sh +++ b/lib/distributions.sh @@ -243,7 +243,7 @@ install_common() UBOOT_VER=$(dpkg --info "${DEB_STORAGE}/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb" | grep Descr | awk '{print $(NF)}') install_deb_chroot "${DEB_STORAGE}/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb" else - install_deb_chroot "linux-u-boot-${BOARD}-${BRANCH}" "remote" + install_deb_chroot "linux-u-boot-${BOARD}-${BRANCH}" "remote" "yes" UPSTREM_VER=$(dpkg-deb -f "${SDCARD}"/var/cache/apt/archives/linux-u-boot-${BOARD}-${BRANCH}*_${ARCH}.deb Version) fi diff --git a/lib/image-helpers.sh b/lib/image-helpers.sh index bcc3238377..a2ecea5f1d 100644 --- a/lib/image-helpers.sh +++ b/lib/image-helpers.sh @@ -129,6 +129,7 @@ install_deb_chroot() { local package=$1 local variant=$2 + local transfer=$3 local name local desc if [[ ${variant} != remote ]]; then @@ -144,5 +145,5 @@ install_deb_chroot() [[ $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 \ $apt_extra --no-install-recommends install $name" >> "${DEST}"/debug/install.log 2>&1 - [[ ${variant} == remote ]] && rsync -rq "${SDCARD}"/var/cache/apt/archives/linux-u-boot-${BOARD}-${BRANCH}*_${ARCH}.deb ${DEB_STORAGE}/ + [[ ${variant} == remote && ${transfer} == yes ]] && rsync -rq "${SDCARD}"/var/cache/apt/archives/*.deb ${DEB_STORAGE}/ }