From 0f1f8ff6f100e7a9b9a2438459d55995a47c061b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 19 Mar 2008 15:07:06 +0000 Subject: native and autotools bbclass: use autotools_stage_all instead of oe_runmake install for staging native packages --- classes/native.bbclass | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'classes/native.bbclass') diff --git a/classes/native.bbclass b/classes/native.bbclass index 63e9741397..ddbbc04e19 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -76,7 +76,12 @@ export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}" do_stage () { if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] then - oe_runmake install + if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1"] + then + oe_runmake install + else + autotools_stage_all + fi fi } -- cgit v1.2.3 From f1204894470e72800bcb7654ba5d346066fd6a1a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 19 Mar 2008 19:39:28 +0000 Subject: autotools, native bbclass: try harder to stage native binaries --- classes/native.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes/native.bbclass') diff --git a/classes/native.bbclass b/classes/native.bbclass index ddbbc04e19..aa1d4b6510 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -80,6 +80,7 @@ do_stage () { then oe_runmake install else + AUTOTOOLS_NATIVE_STAGE_BINARIES = "1" autotools_stage_all fi fi -- cgit v1.2.3 From e0c07ebd9158c035921040c1641fb7f80427a895 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 19 Mar 2008 20:17:40 +0000 Subject: native, autotools bbclass: check if bindir exists before trying to access it * hardcoded since native.bbclass redefines ${bindir} and friends :( --- classes/native.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/native.bbclass') diff --git a/classes/native.bbclass b/classes/native.bbclass index aa1d4b6510..ec9ca6bef3 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -80,7 +80,7 @@ do_stage () { then oe_runmake install else - AUTOTOOLS_NATIVE_STAGE_BINARIES = "1" + export AUTOTOOLS_NATIVE_STAGE_BINARIES="1" autotools_stage_all fi fi -- cgit v1.2.3 From 4d0b164c696c5b3934780bb49182953043da4e83 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 19 Mar 2008 21:53:03 +0000 Subject: native.bbclass: fix ] spacing --- classes/native.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes/native.bbclass') diff --git a/classes/native.bbclass b/classes/native.bbclass index ec9ca6bef3..43c71e16cf 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -76,7 +76,7 @@ export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}" do_stage () { if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] then - if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1"] + if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ] then oe_runmake install else -- cgit v1.2.3 From 95c3f2b582226e999784e17be341ecb2aae28016 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 20 Mar 2008 10:58:13 +0000 Subject: autotools.bbclass: Merge autotools_stage_all with changes in Poky. Removes a typo, adds libexec dir to staging list, works with cross.bbclass, removed info and man data which is pointless in staging and factors out repeated functionality into a separate function --- classes/native.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'classes/native.bbclass') diff --git a/classes/native.bbclass b/classes/native.bbclass index 43c71e16cf..4022cb09c0 100644 --- a/classes/native.bbclass +++ b/classes/native.bbclass @@ -80,7 +80,6 @@ do_stage () { then oe_runmake install else - export AUTOTOOLS_NATIVE_STAGE_BINARIES="1" autotools_stage_all fi fi -- cgit v1.2.3