| Message ID | 20221211161239.17710-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | 3667e589ba16eb261cfd72c2b11429f482c239f6 |
| Headers | show |
| Series | lib/sstatesig: Drop OEBasic siggen | expand |
Hi Richard, "Forwarding" this to Michael as a docs update requirement notice (yocto-docs and bitbake). Cheers, Quentin On 12/11/22 17:12, Richard Purdie wrote: > We're now used to using hashes as part of the task hashes and the sstate code > relies on this. The older OEBasic hash approach therefore wouldn't work and > can be removed. > > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > meta/lib/oe/sstatesig.py | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py > index bf48aed7e11..f0224454c93 100644 > --- a/meta/lib/oe/sstatesig.py > +++ b/meta/lib/oe/sstatesig.py > @@ -101,15 +101,6 @@ def sstate_lockedsigs(d): > sigs[pn][task] = [h, siggen_lockedsigs_var] > return sigs > > -class SignatureGeneratorOEBasic(bb.siggen.SignatureGeneratorBasic): > - name = "OEBasic" > - def init_rundepcheck(self, data): > - self.abisaferecipes = (data.getVar("SIGGEN_EXCLUDERECIPES_ABISAFE") or "").split() > - self.saferecipedeps = (data.getVar("SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS") or "").split() > - pass > - def rundep_check(self, fn, recipename, task, dep, depname, dataCaches = None): > - return sstate_rundepfilter(self, fn, recipename, task, dep, depname, dataCaches) > - > class SignatureGeneratorOEBasicHashMixIn(object): > supports_multiconfig_datacaches = True > > @@ -326,7 +317,6 @@ class SignatureGeneratorOEEquivHash(SignatureGeneratorOEBasicHashMixIn, bb.sigge > bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set") > > # Insert these classes into siggen's namespace so it can see and select them > -bb.siggen.SignatureGeneratorOEBasic = SignatureGeneratorOEBasic > bb.siggen.SignatureGeneratorOEBasicHash = SignatureGeneratorOEBasicHash > bb.siggen.SignatureGeneratorOEEquivHash = SignatureGeneratorOEEquivHash > > > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#174475): https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/message/174475__;!!OOPJP91ZZw!hzEFgmvDjswO3ys-VJ8xiRgn-iv4AXZnbHNnpzHngPvyJOsVMXf0xNYfP9hY5q4fnRGYI0m8YXN1uoqbcm5iBoicY5p5PRxrrLlnyWDkuxF5kIap$ > Mute This Topic: https://urldefense.com/v3/__https://lists.openembedded.org/mt/95602001/6293953__;!!OOPJP91ZZw!hzEFgmvDjswO3ys-VJ8xiRgn-iv4AXZnbHNnpzHngPvyJOsVMXf0xNYfP9hY5q4fnRGYI0m8YXN1uoqbcm5iBoicY5p5PRxrrLlnyWDku1kJZxVj$ > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/unsub__;!!OOPJP91ZZw!hzEFgmvDjswO3ys-VJ8xiRgn-iv4AXZnbHNnpzHngPvyJOsVMXf0xNYfP9hY5q4fnRGYI0m8YXN1uoqbcm5iBoicY5p5PRxrrLlnyWDku1FpazUE$ [quentin.schulz@theobroma-systems.com] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index bf48aed7e11..f0224454c93 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py @@ -101,15 +101,6 @@ def sstate_lockedsigs(d): sigs[pn][task] = [h, siggen_lockedsigs_var] return sigs -class SignatureGeneratorOEBasic(bb.siggen.SignatureGeneratorBasic): - name = "OEBasic" - def init_rundepcheck(self, data): - self.abisaferecipes = (data.getVar("SIGGEN_EXCLUDERECIPES_ABISAFE") or "").split() - self.saferecipedeps = (data.getVar("SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS") or "").split() - pass - def rundep_check(self, fn, recipename, task, dep, depname, dataCaches = None): - return sstate_rundepfilter(self, fn, recipename, task, dep, depname, dataCaches) - class SignatureGeneratorOEBasicHashMixIn(object): supports_multiconfig_datacaches = True @@ -326,7 +317,6 @@ class SignatureGeneratorOEEquivHash(SignatureGeneratorOEBasicHashMixIn, bb.sigge bb.fatal("OEEquivHash requires SSTATE_HASHEQUIV_METHOD to be set") # Insert these classes into siggen's namespace so it can see and select them -bb.siggen.SignatureGeneratorOEBasic = SignatureGeneratorOEBasic bb.siggen.SignatureGeneratorOEBasicHash = SignatureGeneratorOEBasicHash bb.siggen.SignatureGeneratorOEEquivHash = SignatureGeneratorOEEquivHash
We're now used to using hashes as part of the task hashes and the sstate code relies on this. The older OEBasic hash approach therefore wouldn't work and can be removed. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/lib/oe/sstatesig.py | 10 ---------- 1 file changed, 10 deletions(-)