summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2006-05-01 12:07:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-05-01 12:07:55 +0000
commit6c6c1843d871ad454797fee6814360018e772a24 (patch)
tree23d7acd51ab2b17e1193ac136d9c6aba06f54863 /classes
parent9c4951eb174ea42368077d008d78c01222bbed37 (diff)
parent07f6a2d51842fe58c245bb167e5e0c020e6583a7 (diff)
merge of 35ce256593987e71d7c04247837a04f2dfaea425
and c973ff55ff1f4aa31763966c5b65965b1da3e903
Diffstat (limited to 'classes')
-rw-r--r--classes/insane.bbclass10
-rw-r--r--classes/sanity.bbclass4
2 files changed, 9 insertions, 5 deletions
diff --git a/classes/insane.bbclass b/classes/insane.bbclass
index 067fa64dff..629d0e82b0 100644
--- a/classes/insane.bbclass
+++ b/classes/insane.bbclass
@@ -20,13 +20,13 @@
# We need to have the scanelf utility as soon as
# possible.
#
-DEPENDS_prepend = " pax-utilities-native "
# We play a special package function
-inherit packages
-
-
-PACKAGEFUNCS += "do_package_qa"
+inherit package
+PACKAGE_DEPENDS += "pax-utils-native"
+PACKAGEFUNCS += " do_package_qa "
python do_package_qa () {
}
+
+
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 6af44ee191..8253b27930 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -83,6 +83,10 @@ def check_sanity(e):
if not check_app_exists('texi2html', e.data):
raise_sanity_error('Please install the texi2html binary')
+ oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
+ if not oes_bb_conf:
+ raise_sanity_error('You do not include OpenEmbeddeds version of conf/bitbake.conf')
+
addhandler check_sanity_eventhandler
python check_sanity_eventhandler() {
from bb import note, error, data, __version__