From 705bbd431bd2f3751c74a8a84eb4d4a4cb3a09e8 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Mon, 25 Jan 2021 13:23:39 +0100 Subject: [PATCH] Bump rootfs cache - it was recreated - tweak buil all images - add more info to the error --- lib/configuration.sh | 2 +- lib/debootstrap.sh | 2 +- lib/image-helpers.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/configuration.sh b/lib/configuration.sh index ccb0f848a3..980b2c9779 100644 --- a/lib/configuration.sh +++ b/lib/configuration.sh @@ -21,7 +21,7 @@ USEALLCORES=yes # Use all CPU cores for compiling EXIT_PATCHING_ERROR="" # exit patching if failed [[ -z $HOST ]] && HOST="$BOARD" # set hostname to the board cd "${SRC}" || exit -ROOTFSCACHE_VERSION=1 +ROOTFSCACHE_VERSION=2 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 488dcbbc14..01e24152d8 100644 --- a/lib/debootstrap.sh +++ b/lib/debootstrap.sh @@ -678,7 +678,7 @@ create_image() if [[ $COMPRESS_OUTPUTIMAGE == *xz* ]]; then display_alert "Compressing" "${FINALDEST}/${version}.img.xz" "info" # compressing consumes a lot of memory we don't have. Waiting for previous packing job to finish helps to run a lot more builds in parallel - [[ ${BUILD_ALL} == yes ]] && while [[ $(ps -uax | grep "pixz" | wc -l) -gt 1 ]]; do echo -en "#"; sleep 2; done + [[ ${BUILD_ALL} == yes ]] && while [[ $(ps -uax | grep "pixz" | wc -l) -gt 3 ]]; do echo -en "#"; sleep 2; done pixz -9 < $DESTIMG/${version}.img > ${FINALDEST}/${version}.img.xz compression_type=".xz" fi diff --git a/lib/image-helpers.sh b/lib/image-helpers.sh index bb9d4a47ed..595cabff6f 100644 --- a/lib/image-helpers.sh +++ b/lib/image-helpers.sh @@ -146,6 +146,6 @@ install_deb_chroot() # when building in bulk from remote, lets make sure we have up2date index [[ $BUILD_ALL == yes && ${variant} == remote ]] && chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get $apt_extra -yqq update" chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -yqq $apt_extra --no-install-recommends install $name" >> "${DEST}"/debug/install.log 2>&1 - [[ $? -ne 0 ]] && exit_with_error "Installation of $name failed" "@host" + [[ $? -ne 0 ]] && exit_with_error "Installation of $name failed" "${BOARD} ${RELEASE} ${BUILD_DESKTOP} ${LINUXFAMILY}" [[ ${variant} == remote && ${transfer} == yes ]] && rsync -rq "${SDCARD}"/var/cache/apt/archives/*.deb ${DEB_STORAGE}/ }