Skip to contentSkip to conversation

icecc.bbclass: stop causing everything to be effectivelly MACHINE_ARCH

PATCH New Martin Jansa 1 participant 1 message Apr 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 icecc.bbclass: stop causing everything to be effectivelly MACHINE_ARCH

* since this change:
commit d2fcaeb153fdc3f8d7143ea823139f1537055ff1
Author: Douglas Royds <[email protected]>
Date: Thu Dec 20 11:59:47 2018 +1300

icecc: Don't generate recipe-sysroot symlinks at recipe-parsing time

the set_icecc_env function depends on KERNEL_CC variable even for recipes like linux-libc-headers

* KERNEL_CC variable depends on STAGING_KERNEL_DIR:
Variable KERNEL_CC value is ${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_KERNEL_ARCH} -fuse-ld=bfd ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} List of dependencies for variable KERNEL_CC is {'STAGING_KERNEL_DIR', 'HOST_PREFIX', 'DEBUG_PREFIX_MAP', 'HOST_CC_KERNEL_ARCH', 'KERNEL_SRC_PATH'}

which depends on MACHINE:
Variable STAGING_KERNEL_DIR value is ${TMPDIR}/work-shared/${MACHINE}/kernel-source List of dependencies for variable STAGING_KERNEL_DIR is {'MACHINE'}

* as detected with:
openembedded-core/scripts/sstate-diff-machines.sh --tmpdir=tmp-glibc --machines="qemux86 qemux86copy qemuarm" --targets=glibc --analyze

ERROR: linux-libc-headers different signature for task do_configure.sigdata between qemux86 and qemux86copy
NOTE: Starting bitbake server...
basehash changed from 3146f4ffeb002bd69fed7656a4b896365b2e2a00071c69e1afbb672889e754ee to f1a5160e39912e61389b6f9fe68d61146a2be91716ac37e4a32ecf4c09b2b5fa Variable MACHINE value changed from 'qemux86' to 'qemux86copy'

  $ bitbake-diffsigs /OE/build/oe-core/tmp-glibc/sstate-diff/1556122458/qemux86*/*/linux-libc-headers/*do_configure.sigdata*
  NOTE: Starting bitbake server...
  basehash changed from f1a5160e39912e61389b6f9fe68d61146a2be91716ac37e4a32ecf4c09b2b5fa to 3146f4ffeb002bd69fed7656a4b896365b2e2a00071c69e1afbb672889e754ee
  Variable MACHINE value changed from 'qemux86copy' to 'qemux86'
---
 meta/classes/icecc.bbclass | 1 +
 1 file changed, 1 insertion(+)
meta/classes/icecc.bbclass +1 -0
index 6d003dccef..edb0e10434 100644
@@ -312,6 +312,7 @@ def set_icecc_env():
     # dummy python version of set_icecc_env
     return
 
+set_icecc_env[vardepsexclude] += "KERNEL_CC"
 set_icecc_env() {
     if [ "${@use_icecc(bb, d)}" = "no" ]
     then
Signature · 1 line
2.17.1