summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-06-11 14:43:45 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-06-11 14:43:45 +0100
commit4d503cfa062552046d9331a6dcfa724225cebc11 (patch)
tree289f7612eab34a4709bbd56dee4d6e0b9a4a2954 /meta
parentf80563c9cfec3d7c76be8ee889d311567251e44b (diff)
downloadopenembedded-core-4d503cfa062552046d9331a6dcfa724225cebc11.tar.gz
openembedded-core-4d503cfa062552046d9331a6dcfa724225cebc11.tar.bz2
openembedded-core-4d503cfa062552046d9331a6dcfa724225cebc11.tar.xz
openembedded-core-4d503cfa062552046d9331a6dcfa724225cebc11.zip
native.bbclass: Drop INHIBIT_NATIVE_STAGE_INSTALL function and wrap logic in a do_stage_native() wrapper which packaged-staging can detect
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/native.bbclass26
1 files changed, 16 insertions, 10 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 98b62a054..de6b6fff4 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -77,20 +77,26 @@ export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}"
export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
-do_stage () {
- if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ]
+#
+# If changing this function, please make sure packaged-staging.bbclass is
+# updated too
+#
+do_stage_native () {
+ # If autotools is active, use the autotools staging function, else
+ # use our "make install" equivalent
+ if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" == "1" ]
then
- # If autotools is active, use the autotools staging function, else
- # use our "make install" equivalent
- if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ]
- then
- oe_runmake install
- else
- autotools_stage_all
- fi
+ autotools_stage_all
+ else
+ oe_runmake install
fi
}
+
+do_stage () {
+ do_stage_native
+}
+
do_install () {
true
}