summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2006-04-30 13:03:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-30 13:03:55 +0000
commit38ed32df1f29057b30c188a2ada9ffbe70484f82 (patch)
tree9f33e9a6702aba01d36b2c5e4f73b0edfa7b99d3 /classes
parent00dace339beec560cb4dc44225e8456eee1638a9 (diff)
parentc15557bd9f35bc698b01ea8029c62594b42d57f3 (diff)
merge of 9a80eb5deb2b5f31c20a1da2065134687e7ef5eb
and 8efef2b3aa52e815abc0ab9f1df2391b3ffb9202
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__