7f41f1a888
This commit changes the sysroots path to be machine specific.
Changes includes:
1) STAGING_DIR_TARGET and STRAGING_DIR_HOST points to machine specific
paths.
2) task stamp files. Adding ${MACHINE} info into stamp files for
do_populate_sysroots and do_package tasks. Add a BB_STAMPTASK_BLACKLIST
to keep native, nativesdk, crosssdk, and cross-canadian stamp unchanged.
3) siteconfig path. Separate the site config path for different machines
to avoid one machine adopting the cache file of another machine.
4) sstate. Add machine name to sstate manifest file.
Change relocation code for sstate paths since sysroot is machine.
Keep native, nativesdk, crosssdk, and cross-canadian unchanged.
5) toolchain scripts. Change the environment path to point to machine
specific sysroots in toolchain scripts bbclass.
6) Relocate la files when populating to a different machine of the same
architecture.
7) Exclude STAGING_DIR_TARGET and STAGING_DIR_HOST parameter from sstate
siginfo since they contain ${MACHINE} information.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
33 lines
1.2 KiB
Text
33 lines
1.2 KiB
Text
python siteconfig_do_siteconfig () {
|
|
shared_state = sstate_state_fromvars(d)
|
|
if shared_state['name'] != 'populate-sysroot':
|
|
return
|
|
if not os.path.isdir(os.path.join(bb.data.getVar('FILE_DIRNAME', d, 1), 'site_config')):
|
|
bb.debug(1, "No site_config directory, skipping do_siteconfig")
|
|
return
|
|
bb.build.exec_func('do_siteconfig_gencache', d)
|
|
sstate_clean(shared_state, d)
|
|
sstate_install(shared_state, d)
|
|
}
|
|
|
|
EXTRASITECONFIG ?= ""
|
|
|
|
siteconfig_do_siteconfig_gencache () {
|
|
mkdir -p ${WORKDIR}/site_config_${MACHINE}
|
|
gen-site-config ${FILE_DIRNAME}/site_config \
|
|
>${WORKDIR}/site_config_${MACHINE}/configure.ac
|
|
cd ${WORKDIR}/site_config_${MACHINE}
|
|
autoconf
|
|
CONFIG_SITE="" ${EXTRASITECONFIG} ./configure ${CONFIGUREOPTS} --cache-file ${PN}_cache
|
|
sed -n -e "/ac_cv_c_bigendian/p" -e "/ac_cv_sizeof_/p" \
|
|
-e "/ac_cv_type_/p" -e "/ac_cv_header_/p" -e "/ac_cv_func_/p" \
|
|
< ${PN}_cache > ${PN}_config
|
|
mkdir -p ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d
|
|
cp ${PN}_config ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d
|
|
|
|
}
|
|
|
|
do_populate_sysroot[sstate-interceptfuncs] += "do_siteconfig "
|
|
|
|
EXPORT_FUNCTIONS do_siteconfig do_siteconfig_gencache
|