mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
Remove layout_* variables
Remove layout_* variables and replace them with variables specific to the different classes. The layout variables were only useful for the native/cross classes and caused more confusion than they solved. They didn't scale to the sdk class. It now clear a small set of native/cross variables fulfil the needs. This patch also changes native.bbclass to use "/" as the STAGING_DIR which makes sense since we're installing binaries into the locations we're compiling them for. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
@@ -206,11 +206,11 @@ autotools_stage_all() {
|
||||
oe_runmake DESTDIR="${STAGE_TEMP}" install
|
||||
autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR}
|
||||
if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then
|
||||
autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir}
|
||||
autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir}
|
||||
autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir}
|
||||
autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir}
|
||||
autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir}
|
||||
autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${bindir}
|
||||
autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${sbindir}
|
||||
autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${base_bindir}
|
||||
autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${base_sbindir}
|
||||
autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${libexecdir}
|
||||
fi
|
||||
if [ -d ${STAGE_TEMP}/${libdir} ]
|
||||
then
|
||||
@@ -218,7 +218,7 @@ autotools_stage_all() {
|
||||
fi
|
||||
if [ -d ${STAGE_TEMP}/${base_libdir} ]
|
||||
then
|
||||
autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${layout_base_libdir}
|
||||
autotools_stage_libdir ${STAGE_TEMP}/${base_libdir} ${STAGING_DIR_HOST}${base_libdir}
|
||||
fi
|
||||
rm -rf ${STAGE_TEMP}/${mandir} || true
|
||||
rm -rf ${STAGE_TEMP}/${infodir} || true
|
||||
|
||||
Reference in New Issue
Block a user