diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2017-05-30 10:08:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-06 19:02:43 +0100 |
commit | c2a5d0bb800cb7df29167c137fee251d2347111a (patch) | |
tree | 4e283393da27dfe52e6313a62260cd158c3bbac0 /scripts | |
parent | ff4a7a9a1d7898a214736933216dedc7055e3700 (diff) | |
download | poky-c2a5d0bb800cb7df29167c137fee251d2347111a.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: 36e6abf387848d8c4383b4d506340811dd371c86)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/sstate-diff-machines.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
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"; |