summaryrefslogtreecommitdiffstats
path: root/meta/classes
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/classes
parentf80563c9cfec3d7c76be8ee889d311567251e44b (diff)
downloadpoky-4d503cfa062552046d9331a6dcfa724225cebc11.tar.gz
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/classes')
-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 98b62a0549..de6b6fff42 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -77,20 +77,26 @@ export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}"
77export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}" 77export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
78export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}" 78export oldincludedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
79 79
80do_stage () { 80#
81 if [ "${INHIBIT_NATIVE_STAGE_INSTALL}" != "1" ] 81# If changing this function, please make sure packaged-staging.bbclass is
82# updated too
83#
84do_stage_native () {
85 # If autotools is active, use the autotools staging function, else
86 # use our "make install" equivalent
87 if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" == "1" ]
82 then 88 then
83 # If autotools is active, use the autotools staging function, else 89 autotools_stage_all
84 # use our "make install" equivalent 90 else
85 if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ] 91 oe_runmake install
86 then
87 oe_runmake install
88 else
89 autotools_stage_all
90 fi
91 fi 92 fi
92} 93}
93 94
95
96do_stage () {
97 do_stage_native
98}
99
94do_install () { 100do_install () {
95 true 101 true
96} 102}