[oe-commits] [openembedded-core] 02/02: sstate-diff-machines.sh: Replace MACHINE_ARCH only at the beginning and separated with dash

git at git.openembedded.org git at git.openembedded.org
Mon Jun 5 09:02:13 UTC 2017


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 136ab12c821fdfedd9ea102e6e7d6bf32dcce9d2
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: 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
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 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";

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list