Re: [OE-core] Strange behavior in sstate-diff-machines.sh

[Chris Laplante via lists.openembedded.org]

Hi Richard,

> I've never liked that script and personally, I've always wanted to make 
> bitbake's
> owm signature "diff" as helpful as we can. There are ton of different things
> that conspire against us in doing that and whilst we've improved, it still 
> isn't
> ideal.
> 
> I'd note that the script predates hash equivalence and that can be a big 
> factor
> in things things like this. We've struggled to reconcile some of the tools 
> with
> changes like hash equivalence :(
> 
> So yes, I can imagine do_package matching between the two machines, then
> hashequiv would reuse the later tasks like do_package_write_rpm from sstate.

Thanks for the info. 

Would this be the kind of thing that is best ported to bitbake-diffsigs, maybe 
as some kind of recursive mode? (Just asking out of curiosity - I don't yet 
have a strong enough grasp of all the caching/signature stuff)

For posterity, I hacked up the script with this patch and it fixed my issue 
(whilst probably introducing other, subtler issues).

Thanks,
Chris


diff --git a/scripts/sstate-diff-machines.sh b/scripts/sstate-diff-machines.sh
index 5ed413b2ee..b536c423d0 100755
--- a/scripts/sstate-diff-machines.sh
+++ b/scripts/sstate-diff-machines.sh
@@ -121,8 +121,11 @@ for M in ${machines}; do
   if ls ${tmpdir}/stamps/* >/dev/null 2>/dev/null ; then
     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" ${OUTPUT}/${M}/list | sort > 
${OUTPUT}/${M}/list.M
+    for M2 in ${machines}; do
+      M_UNDERSCORE=`echo ${M2} | sed 's/-/_/g'`
+      printf "M_UNDERSCORE: ${M_UNDERSCORE}\n"
+      sed "s/^${M_UNDERSCORE}-/MACHINE/g" ${OUTPUT}/${M}/list | sort > 
${OUTPUT}/${M}/list.M
+    done
     find ${tmpdir}/stamps/ -name \*sigdata\* | xargs rm -f
   else
     printf "ERROR: no sigdata files were generated for MACHINE $M in 
${tmpdir}/stamps\n";

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#210738): 
https://lists.openembedded.org/g/openembedded-core/message/210738
Mute This Topic: https://lists.openembedded.org/mt/110980697/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-