From 4d30ba5545926e2da65a572fcb138a94d766aec6 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 27 Mar 2021 16:41:35 +0100 Subject: [PATCH] Bugfix for determining changes in patches Related to https://github.com/armbian/build/pull/2704 --- lib/build-all-ng.sh | 2 +- lib/compilation.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/build-all-ng.sh b/lib/build-all-ng.sh index 120d1dda7..354ad6d8f 100644 --- a/lib/build-all-ng.sh +++ b/lib/build-all-ng.sh @@ -212,7 +212,7 @@ function check_hash() [[ -z $LINUXFAMILY ]] && LINUXFAMILY=$BOARDFAMILY [[ -z ${KERNELPATCHDIR} ]] && KERNELPATCHDIR=$LINUXFAMILY-$BRANCH [[ -z ${LINUXCONFIG} ]] && LINUXCONFIG=linux-$LINUXFAMILY-$BRANCH - hash_watch_1=$(find "${SRC}/patch/kernel/${KERNELPATCHDIR}" -maxdepth 1 -printf '%s %P\n' 2> /dev/null | sort) + hash_watch_1=$(find "${SRC}/patch/kernel/${KERNELPATCHDIR}"/ -maxdepth 1 -printf '%s %P\n' 2> /dev/null | sort) hash_watch_2=$(cat "${SRC}/config/kernel/${LINUXCONFIG}.config" 2> /dev/null) patch_hash=$(echo "${hash_watch_1}${hash_watch_2}" | improved_git hash-object --stdin) diff --git a/lib/compilation.sh b/lib/compilation.sh index 6e1c89aae..d443d6f01 100644 --- a/lib/compilation.sh +++ b/lib/compilation.sh @@ -484,7 +484,7 @@ compile_kernel() echo "${hash}" > "${SRC}/cache/hash"$([[ ${BETA} == yes ]] && echo "-beta")"/linux-image-${BRANCH}-${LINUXFAMILY}.githash" [[ -z ${KERNELPATCHDIR} ]] && KERNELPATCHDIR=$LINUXFAMILY-$BRANCH [[ -z ${LINUXCONFIG} ]] && LINUXCONFIG=linux-$LINUXFAMILY-$BRANCH - hash_watch_1=$(find "${SRC}/patch/kernel/${KERNELPATCHDIR}" -maxdepth 1 -printf '%s %P\n' 2> /dev/null | sort) + hash_watch_1=$(find "${SRC}/patch/kernel/${KERNELPATCHDIR}/" -maxdepth 1 -printf '%s %P\n' 2> /dev/null | sort) hash_watch_2=$(cat "${SRC}/config/kernel/${LINUXCONFIG}.config") echo "${hash_watch_1}${hash_watch_2}" | improved_git hash-object --stdin >> "${SRC}/cache/hash"$([[ ${BETA} == yes ]] && echo "-beta")"/linux-image-${BRANCH}-${LINUXFAMILY}.githash" }