summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-05-09 10:50:59 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-11 17:49:37 +0100
commit0893457465e184550906844fbab2dec397201835 (patch)
tree2bf437a1b869e0bc7455a927b16b290a27df44fc
parent02a5fe21cad2ec29268de7f3a556bb827f726998 (diff)
downloadopenembedded-core-0893457465e184550906844fbab2dec397201835.tar.gz
openembedded-core-0893457465e184550906844fbab2dec397201835.tar.bz2
openembedded-core-0893457465e184550906844fbab2dec397201835.tar.xz
openembedded-core-0893457465e184550906844fbab2dec397201835.zip
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>
-rw-r--r--meta/classes/blacklist.bbclass22
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass
index 7bf4a73a9..75abd99c2 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))
}
-