From d5222b15597b694b8e28d77bd668f15d19855280 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 25 Apr 2018 14:07:04 +0000 Subject: [PATCH] sstate-diff-machines.sh: Replace MACHINE_ARCH only at the beginning and separated with dash * I had some components where the MACHINE name was also included in PV of allarch recipe which was tripping the script into saying that they have different signatures (because for one MACHINE was the string in PV replaced with 'MACHINE' and not for other MACHINEs (From OE-Core rev: 90a8e984724c994b78639b7f16435b678bf294f8) Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/sstate-diff-machines.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/sstate-diff-machines.sh b/scripts/sstate-diff-machines.sh index 056aa0a04c..27c6a33006 100755 --- a/scripts/sstate-diff-machines.sh +++ b/scripts/sstate-diff-machines.sh @@ -118,7 +118,7 @@ for M in ${machines}; do cp -ra ${tmpdir}/stamps/* ${OUTPUT}/${M} find ${OUTPUT}/${M} -name \*sigdata\* | sed "s#${OUTPUT}/${M}/##g" | sort > ${OUTPUT}/${M}/list M_UNDERSCORE=`echo ${M} | sed 's/-/_/g'` - sed "s/${M_UNDERSCORE}/MACHINE/g; s/${M}/MACHINE/g" ${OUTPUT}/${M}/list | sort > ${OUTPUT}/${M}/list.M + sed "s/^${M_UNDERSCORE}-/MACHINE/g" ${OUTPUT}/${M}/list | sort > ${OUTPUT}/${M}/list.M find ${tmpdir}/stamps/ -name \*sigdata\* | xargs rm -f else printf "ERROR: no sigdata files were generated for MACHINE $M in ${tmpdir}/stamps\n";