mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 00:39:46 +00:00
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:
+16
-10
@@ -77,20 +77,26 @@ export libdir = "${STAGING_DIR_NATIVE}${layout_libdir}"
|
|||||||
export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
|
export includedir = "${STAGING_DIR_NATIVE}${layout_includedir}"
|
||||||
export oldincludedir = "${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
|
then
|
||||||
# If autotools is active, use the autotools staging function, else
|
autotools_stage_all
|
||||||
# use our "make install" equivalent
|
else
|
||||||
if [ "${AUTOTOOLS_NATIVE_STAGE_INSTALL}" != "1" ]
|
oe_runmake install
|
||||||
then
|
|
||||||
oe_runmake install
|
|
||||||
else
|
|
||||||
autotools_stage_all
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
do_stage () {
|
||||||
|
do_stage_native
|
||||||
|
}
|
||||||
|
|
||||||
do_install () {
|
do_install () {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user