summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2018-04-25 14:06:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-15 10:01:17 (GMT)
commit3af875b26b48c24f6533dc0d57f888711362f7f2 (patch)
treeedde1193a5dffe4aff3bcae559b5115bda478074
parent5e8674104cac0222202a0e93c0109a827d304188 (diff)
downloadpoky-3af875b26b48c24f6533dc0d57f888711362f7f2.tar.gz
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: d75c28fc0b4b16eb75e9c68d9d6224a0d782607e) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/sstate-diff-machines.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/sstate-diff-machines.sh b/scripts/sstate-diff-machines.sh
index 056aa0a..27c6a33 100755
--- a/scripts/sstate-diff-machines.sh
+++ b/scripts/sstate-diff-machines.sh
@@ -118,7 +118,7 @@ for M in ${machines}; do
118 cp -ra ${tmpdir}/stamps/* ${OUTPUT}/${M} 118 cp -ra ${tmpdir}/stamps/* ${OUTPUT}/${M}
119 find ${OUTPUT}/${M} -name \*sigdata\* | sed "s#${OUTPUT}/${M}/##g" | sort > ${OUTPUT}/${M}/list 119 find ${OUTPUT}/${M} -name \*sigdata\* | sed "s#${OUTPUT}/${M}/##g" | sort > ${OUTPUT}/${M}/list
120 M_UNDERSCORE=`echo ${M} | sed 's/-/_/g'` 120 M_UNDERSCORE=`echo ${M} | sed 's/-/_/g'`
121 sed "s/${M_UNDERSCORE}/MACHINE/g; s/${M}/MACHINE/g" ${OUTPUT}/${M}/list | sort > ${OUTPUT}/${M}/list.M 121 sed "s/^${M_UNDERSCORE}-/MACHINE/g" ${OUTPUT}/${M}/list | sort > ${OUTPUT}/${M}/list.M
122 find ${tmpdir}/stamps/ -name \*sigdata\* | xargs rm -f 122 find ${tmpdir}/stamps/ -name \*sigdata\* | xargs rm -f
123 else 123 else
124 printf "ERROR: no sigdata files were generated for MACHINE $M in ${tmpdir}/stamps\n"; 124 printf "ERROR: no sigdata files were generated for MACHINE $M in ${tmpdir}/stamps\n";