From d6dfe6f5986b968bba05cf70a99f444f8d3e441c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 4 Mar 2008 20:25:13 +0000 Subject: base.bbclass: Only set BB_DEFAULT_TASK if it wasn't set already --- classes/base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 7609c05851..615d02d07e 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1,4 +1,4 @@ -BB_DEFAULT_TASK = "build" +BB_DEFAULT_TASK ?= "build" # like os.path.join but doesn't treat absolute RHS specially def base_path_join(a, *p): -- cgit v1.2.3 From a526b2c8b8f286a02ce0045b36ad44b300cb93e7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 4 Mar 2008 20:26:00 +0000 Subject: packaged-staging.bbclass: Only need to run after do_package_write, no need to list package types. --- classes/packaged-staging.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 29ce72d65c..d822a86820 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -225,5 +225,5 @@ python do_package_stage () { bb.utils.unlockfile(lf) } -addtask package_stage after do_package_write_ipk do_package_write_deb do_package_write do_populate_staging before do_build +addtask package_stage after do_package_write do_populate_staging before do_build -- cgit v1.2.3 From adeb76875a1f8bdd264173ff417afae91df65336 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Mar 2008 22:19:08 +0000 Subject: native.bbclass: Remove strange bogus inherit --- classes/native.bbclass | 2 -- 1 file changed, 2 deletions(-) (limited to 'classes') diff --git a/classes/native.bbclass b/classes/native.bbclass index 8f2b6f3fec..63e9741397 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -1,5 +1,3 @@ -inherit base - # Native packages are built indirectly via dependency, # no need for them to be a direct target of 'world' EXCLUDE_FROM_WORLD = "1" -- cgit v1.2.3 From 0986f61319e5d18f20bf5bead94aa7e525ebb946 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Mar 2008 22:32:17 +0000 Subject: autotools.bbclass: sdk.bbclass doesn't need libtool-cross --- classes/autotools.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 991e472b14..4f3e0b1c4d 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -17,6 +17,7 @@ def autotools_dep_prepend(d): deps += 'libtool-native ' if not bb.data.inherits_class('native', d) \ and not bb.data.inherits_class('cross', d) \ + and not bb.data.inherits_class('sdk', d) \ and not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d, 1): deps += 'libtool-cross ' -- cgit v1.2.3 From ab87ff852bfd21819b999be286bd8614e54a63a7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 5 Mar 2008 22:33:29 +0000 Subject: sdk.bbclass: Revert recent changes for now --- classes/sdk.bbclass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'classes') diff --git a/classes/sdk.bbclass b/classes/sdk.bbclass index 71c65a1629..cbc1742dab 100644 --- a/classes/sdk.bbclass +++ b/classes/sdk.bbclass @@ -6,16 +6,15 @@ OLD_PACKAGE_ARCH := ${PACKAGE_ARCH} PACKAGE_ARCH = "${BUILD_ARCH}-${OLD_PACKAGE_ARCH}-sdk" HOST_ARCH = "${BUILD_ARCH}" -# This isn't BUILD_VENDOR since we don't want to clash with native staging -HOST_VENDOR = "${TARGET_VENDOR}" +HOST_VENDOR = "${BUILD_VENDOR}" HOST_OS = "${BUILD_OS}" HOST_PREFIX = "${BUILD_PREFIX}" HOST_CC_ARCH = "${BUILD_CC_ARCH}" -CPPFLAGS = "${BUILDSDK_CPPFLAGS}" -CFLAGS = "${BUILDSDK_CFLAGS}" -CXXFLAGS = "${BUILDSDK_CFLAGS}" -LDFLAGS = "${BUILDSDK_LDFLAGS}" +CPPFLAGS = "${BUILD_CPPFLAGS}" +CFLAGS = "${BUILD_CFLAGS}" +CXXFLAGS = "${BUILD_CFLAGS}" +LDFLAGS = "${BUILD_LDFLAGS}" # Path prefixes prefix = "${SDK_PREFIX}" -- cgit v1.2.3 From 4d25ad47736218ef2c07e8d0dac3d4ba827bbc3a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 6 Mar 2008 13:15:56 +0000 Subject: packaged-staging.bbclass: Set MULTMACH_ARCH if its not been set so we don't depend on multimachine.bbclass --- classes/packaged-staging.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes') diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index d822a86820..b564136e3f 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -20,6 +20,9 @@ python () { bb.data.setVar("PSTAGING_DISABLED", "1", d) } +# multimachine.bbclass will override this +MULTIMACH_ARCH ?= "${PACKAGE_ARCH}" + export PSTAGING_DISABLED = "0" DEPLOY_DIR_PSTAGE = "${DEPLOY_DIR}/pstage" -- cgit v1.2.3