From: Mark Hatle <mark.hatle@windriver.com>
Date: Wed, 9 May 2012 15:50:59 +0000 (-0500)
Subject: blacklist.bbclass: Refactor, use PNBLACKLIST[pn]
X-Git-Tag: 2015-4~10673
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0893457465e184550906844fbab2dec397201835;p=openembedded-core.git

blacklist.bbclass: Refactor, use PNBLACKLIST[pn]

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>

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---

diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass
index 7bf4a73a9a..75abd99c29 100644
--- a/meta/classes/blacklist.bbclass
+++ b/meta/classes/blacklist.bbclass
@@ -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))
 }
-