From 533ae18c2ca766b8bd36632a41c47e2314662d5a Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sat, 29 Apr 2006 23:35:14 +0000 Subject: classes/insane.bbclass: inherit package.bbclass instead of the nonexistant packages one --- classes/insane.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 067fa64dff..56aec2ef40 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -23,10 +23,10 @@ DEPENDS_prepend = " pax-utilities-native " # We play a special package function -inherit packages - - -PACKAGEFUNCS += "do_package_qa" +inherit package +PACKAGEFUNCS += " do_package_qa " python do_package_qa () { } + + -- cgit v1.2.3 From 52e5e901bb892e190a66b2370dc1c58554609a17 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 30 Apr 2006 00:27:47 +0000 Subject: classes/insane.bbclass: Use the PACKAGE_DEPENDS hack to avoid circular dependencies for pax-utils-native --- classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 56aec2ef40..629d0e82b0 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -20,10 +20,10 @@ # We need to have the scanelf utility as soon as # possible. # -DEPENDS_prepend = " pax-utilities-native " # We play a special package function inherit package +PACKAGE_DEPENDS += "pax-utils-native" PACKAGEFUNCS += " do_package_qa " python do_package_qa () { -- cgit v1.2.3 From c1b283fdbcd2e2e224b3c365d0a1937d0637991b Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Sun, 30 Apr 2006 12:29:07 +0000 Subject: conf/bitbake.conf: Save a magic cookie in the OE version of bitbake.conf classes/sanity.bbclass: Check the OE cookie for bitbake.conf --- classes/sanity.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'classes') 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__ -- cgit v1.2.3