Patchwork lib/oe: Add sstatesig, OE specific signature generator classes

login
register
mail settings
Submitter Richard Purdie
Date Jan. 20, 2012, 4:19 p.m.
Message ID <1327076359.4268.6.camel@ted>
Download mbox | patch
Permalink /patch/19833/
State New
Headers show

Comments

Richard Purdie - Jan. 20, 2012, 4:19 p.m.
This patch adds SignatureGenerator classes specific to OE. For now,
these emulate the previous behaviour with the exception that
dependencies on quilt-native are now ignored for checksum purposes.

The intent is to allow easier experimentation and customisation of 
this code in future as a result of these changes.

Note that these changes require pending bitbake patches.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Richard Purdie - Jan. 20, 2012, 6:32 p.m.
On Fri, 2012-01-20 at 16:19 +0000, Richard Purdie wrote:
> +
> +class SignatureGeneratorOEBasic(bb.siggen.SignatureGeneratorBasic):
> +    name = "OEBasic"
> +    def init_rundepcheck(self, data):
> +        pass
> +    def rundep_check(self, fn, recipename, task, dep, depname):
> +        return sstate_rundepfilter(fn, recipename, task, dep, depname)
> +
> +class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
> +    name = "OEBasicHash"
> +    def init_rundepcheck(self, data):
> +        pass
> +    def rundep_check(self, fn, task, dep, dataCache):

This should be:

def rundep_check(self, fn, recipename, task, dep, depname):

> +        return sstate_rundepfilter(fn, recipename, task, dep, depname)
> +
> +# Insert these classes into siggen's namespace so it can see and select them
> +bb.siggen.SignatureGeneratorOEBasic = SignatureGeneratorOEBasic
> +bb.siggen.SignatureGeneratorOEBasicHash = SignatureGeneratorOEBasicHash

Cheers,

Richard

Patch

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 091e965..bedb73b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -9,7 +9,7 @@  inherit utility-tasks
 inherit metadata_scm
 inherit logging
 
-OE_IMPORTS += "os sys time oe.path oe.utils oe.data oe.packagegroup"
+OE_IMPORTS += "os sys time oe.path oe.utils oe.data oe.packagegroup oe.sstatesig"
 OE_IMPORTS[type] = "list"
 
 def oe_import(d):
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py
new file mode 100644
index 0000000..fdfab63
--- a/dev/null
+++ b/meta/lib/oe/sstatesig.py
@@ -0,0 +1,48 @@ 
+import bb.siggen
+
+def sstate_rundepfilter(fn, recipename, task, dep, depname):
+    # Return True if we should keep the dependency, False to drop it
+    def isNative(x):
+        return x.endswith("-native")
+    def isCross(x):
+        return x.endswith("-cross") or x.endswith("-cross-initial") or x.endswith("-cross-intermediate")
+    def isNativeSDK(x):
+        return x.endswith("-nativesdk")
+
+    # Always include our own inter-task dependencies
+    if recipename == depname:
+        return True
+
+    # Quilt (patch application) changing isn't likely to affect anything
+    if depname == "quilt-native":
+        return False
+    # Don't change native/cross/nativesdk recipe dependencies any further
+    if isNative(recipename) or isCross(recipename) or isNativeSDK(recipename):
+        return True
+
+    # Only target packages beyond here
+
+    # Drop native/cross/nativesdk dependencies from target recipes
+    if isNative(depname) or isCross(depname) or isNativeSDK(depname):
+        return False
+
+    # Default to keep dependencies
+    return True
+
+class SignatureGeneratorOEBasic(bb.siggen.SignatureGeneratorBasic):
+    name = "OEBasic"
+    def init_rundepcheck(self, data):
+        pass
+    def rundep_check(self, fn, recipename, task, dep, depname):
+        return sstate_rundepfilter(fn, recipename, task, dep, depname)
+
+class SignatureGeneratorOEBasicHash(bb.siggen.SignatureGeneratorBasicHash):
+    name = "OEBasicHash"
+    def init_rundepcheck(self, data):
+        pass
+    def rundep_check(self, fn, task, dep, dataCache):
+        return sstate_rundepfilter(fn, recipename, task, dep, depname)
+
+# Insert these classes into siggen's namespace so it can see and select them
+bb.siggen.SignatureGeneratorOEBasic = SignatureGeneratorOEBasic
+bb.siggen.SignatureGeneratorOEBasicHash = SignatureGeneratorOEBasicHash