Skip to contentSkip to conversation

v2 Import the blacklist functionality from meta-oe

PATCH New Mark Hatle 2 participants 5 messages May 9, 2012

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover v2 Import the blacklist functionality from meta-oe

Refactor from v1. Include the original functionality from meta-oe, it has been changed based on comments both on the list and off. And I believe greatly simplified.

It is expected that distributions who need the old functionality may continue to use the old blacklist.bbclass in their layers.

One additional note, I had people ask why I need this functionality. The issue is that we intend to use OE-Core release almost exactly as-is. But we have to sent reasonable support boundries for our customers. This will allow us to declare certain items as unsupported, and if the end user wishes to clear the blacklist they can.

The following changes since commit 043871d7e5d2d19c2ff43e54d2ff180c09e8903e:

kern-tools: integrate minor fixes (2012-05-08 16:06:15 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/blacklist
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/blacklist

Mark Hatle (2):
blacklist: fix typo in name blacklist.bbclass: Refactor, use PNBLACKLIST[pn]

 meta/classes/blacklist.bbclass |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 meta/classes/blacklist.bbclass
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/2 blacklist: fix typo in name

Import directly from meta-openembedded commit: a63c374cdc785ade69d2998978d08280e671dc1f

---
 meta/classes/blacklist.bbclass |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 meta/classes/blacklist.bbclass
meta/classes/blacklist.bbclass new file +20 -0
new file mode 100644
index 0000000..7bf4a73
@@ -0,0 +1,20 @@
+# anonymous support class from angstrom
+# 
+# Features:
+#
+# * blacklist handling, set ANGSTROM_BLACKLIST_pn-blah = "message"
+#
+
+python () {
+    import bb
+
+    blacklist = bb.data.getVar("ANGSTROM_BLACKLIST", d, 1)
+    pkgnm = bb.data.getVar("PN", d, 1)
+    distro = bb.data.getVar("DISTRO", d, 1)
+
+    if blacklist:
+	bb.note("%s DOES NOT support %s because %s" % (distro,pkgnm, blacklist))
+        raise bb.parse.SkipPackage("%s DOES NOT support %s because %s" % (distro,pkgnm, blacklist))
+
+}
+
Signature · 1 line
1.7.3.4
author
#2 lore raw

PATCH v2 2/2 blacklist.bbclass: Refactor, use PNBLACKLIST[pn]

In reply to Mark Hatle

Revise the handling from ANGSTROM_BLACKLIST to PNBLACKLIST[pn].

Refactor the code to eliminate references to the distribution and recipe name in the message.

Change the skipPackage message message from:

ERROR: <recipe> was skipped: <distro> DOES NOT support <recipe> because <reason>

to:

ERROR: <recipe> was skipped: Recipe is blacklisted: <reason>

---
 meta/classes/blacklist.bbclass |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
meta/classes/blacklist.bbclass +11 -11
index 7bf4a73..75abd99 100644
@@ -1,20 +1,20 @@
-# anonymous support class from angstrom
+# anonymous support class from originally from angstrom
 # 
+# To use the blacklist, a distribution should include this
+# class in the INHERIT_DISTRO
+#
+# No longer use ANGSTROM_BLACKLIST, instead use a table of
+# recipes in PNBLACKLIST
+#
 # Features:
 #
-# * blacklist handling, set ANGSTROM_BLACKLIST_pn-blah = "message"
+# * To add a package to the blacklist, set:
+#   PNBLACKLIST[pn] = "message"
 #
 
 python () {
-    import bb
-
-    blacklist = bb.data.getVar("ANGSTROM_BLACKLIST", d, 1)
-    pkgnm = bb.data.getVar("PN", d, 1)
-    distro = bb.data.getVar("DISTRO", d, 1)
+    blacklist = d.getVarFlag('PNBLACKLIST', d.getVar('PN', True), True)
 
     if blacklist:
-	bb.note("%s DOES NOT support %s because %s" % (distro,pkgnm, blacklist))
-        raise bb.parse.SkipPackage("%s DOES NOT support %s because %s" % (distro,pkgnm, blacklist))
-
+        raise bb.parse.SkipPackage("Recipe is blacklisted: %s" % (blacklist))
 }
-
Signature · 1 line
1.7.3.4
#3 lore raw

Re: [PATCH 2/2 v2] blacklist.bbclass: Refactor, use PNBLACKLIST[pn]

Op 9 mei 2012, om 22:00 heeft Mark Hatle het volgende geschreven:

Quoted 23 lines

Revise the handling from ANGSTROM_BLACKLIST to PNBLACKLIST[pn].

Refactor the code to eliminate references to the distribution and recipe name in the message.

Change the skipPackage message message from:

ERROR: <recipe> was skipped: <distro> DOES NOT support <recipe> because <reason>

to:

ERROR: <recipe> was skipped: Recipe is blacklisted: <reason>

---
meta/classes/blacklist.bbclass | 22 +++++++++++-----------

1 files changed, 11 insertions(+), 11 deletions(-)
meta/classes/blacklist.bbclass +0 -0
index 7bf4a73..75abd99 100644

meta/classes/blacklist.bbclass line 4

Quoted 5 lines
meta/classes/blacklist.bbclass +3 -1
@@ -1,20 +1,20 @@
-# anonymous support class from angstrom
+# anonymous support class from originally from angstrom
 # 
+# To use the blacklist, a distribution should include this
+# class in the INHERIT_DISTRO

INHERIT works just fine as well

author
#4 lore raw

Re: [PATCH 2/2 v2] blacklist.bbclass: Refactor, use PNBLACKLIST[pn]

Quoted 21 lines · Koen Kooi

Op 9 mei 2012, om 22:00 heeft Mark Hatle het volgende geschreven:

Quoted 18 lines

Revise the handling from ANGSTROM_BLACKLIST to PNBLACKLIST[pn].

Refactor the code to eliminate references to the distribution and recipe name in the message.

Change the skipPackage message message from:

ERROR:<recipe> was skipped:<distro> DOES NOT support<recipe> because<reason>

to:

ERROR:<recipe> was skipped: Recipe is blacklisted:<reason>

---
meta/classes/blacklist.bbclass | 22 +++++++++++-----------

1 files changed, 11 insertions(+), 11 deletions(-)
Quoted 12 lines

meta/classes/blacklist.bbclass line 4

Quoted 10 lines
meta/classes/blacklist.bbclass +3 -1
index 7bf4a73..75abd99 100644
@@ -1,20 +1,20 @@
-# anonymous support class from angstrom
+# anonymous support class from originally from angstrom
 #
+# To use the blacklist, a distribution should include this
+# class in the INHERIT_DISTRO

INHERIT works just fine as well

Happy to change the comment, but my intention was that a blacklist is specified by a distribution, thus the inherit_distro comment.

--Mark

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core