diff options
Diffstat (limited to 'meta/classes/siteconfig.bbclass')
| -rw-r--r-- | meta/classes/siteconfig.bbclass | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/classes/siteconfig.bbclass b/meta/classes/siteconfig.bbclass index 0813c2543e..bb491d2994 100644 --- a/meta/classes/siteconfig.bbclass +++ b/meta/classes/siteconfig.bbclass @@ -1,13 +1,13 @@ python siteconfig_do_siteconfig () { shared_state = sstate_state_fromvars(d) - if shared_state['name'] != 'populate-sysroot': + if shared_state['task'] != 'populate_sysroot': return - if not os.path.isdir(os.path.join(bb.data.getVar('FILE_DIRNAME', d, 1), 'site_config')): + if not os.path.isdir(os.path.join(d.getVar('FILE_DIRNAME'), 'site_config')): bb.debug(1, "No site_config directory, skipping do_siteconfig") return + sstate_install(shared_state, d) bb.build.exec_func('do_siteconfig_gencache', d) sstate_clean(shared_state, d) - sstate_install(shared_state, d) } EXTRASITECONFIG ?= "" @@ -18,12 +18,13 @@ siteconfig_do_siteconfig_gencache () { >${WORKDIR}/site_config_${MACHINE}/configure.ac cd ${WORKDIR}/site_config_${MACHINE} autoconf - CONFIG_SITE="" ${EXTRASITECONFIG} ./configure ${CONFIGUREOPTS} --cache-file ${PN}_cache + rm -f ${BPN}_cache + CONFIG_SITE="" ${EXTRASITECONFIG} ./configure ${CONFIGUREOPTS} --cache-file ${BPN}_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 + < ${BPN}_cache > ${BPN}_config mkdir -p ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d - cp ${PN}_config ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d + cp ${BPN}_config ${SYSROOT_DESTDIR}${datadir}/${TARGET_SYS}_config_site.d } |