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>
This commit is contained in:
Richard Purdie 2009-06-11 14:43:45 +01:00
parent f80563c9cf
commit 4d503cfa06
1 changed files with 16 additions and 10 deletions

View File

@ -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
}