[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6138/8267] sstate-diff-machines.sh: Replace MACHINE_ARCH only at the beginning and separated with dash



commit c2a5d0bb800cb7df29167c137fee251d2347111a
Author: Martin Jansa <martin jansa gmail com>
Date:   Tue May 30 10:08:01 2017 +0200

    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>

 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 056aa0a..27c6a33 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";


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]