]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstate-diff-machines.sh: Replace MACHINE_ARCH only at the beginning and separated...
authorMartin Jansa <martin.jansa@gmail.com>
Wed, 25 Apr 2018 14:07:04 +0000 (14:07 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 7 May 2018 14:57:00 +0000 (15:57 +0100)
* 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
scripts/sstate-diff-machines.sh

index 056aa0a04c160ba3b45d58f68bec9c44daf4afa7..27c6a330060c5129361cbb0d0c228c8e00a6f7a1 100755 (executable)
@@ -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";