diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2017-04-11 20:38:38 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-04-12 15:09:58 +0100 |
| commit | 3e903cb42f94c77900115035155cd62142d29544 (patch) | |
| tree | becda59570181b9a3b2081297565babbc14d964e | |
| parent | fc43f10a517d5fb27145b796471d27419ef1fd19 (diff) | |
| download | poky-3e903cb42f94c77900115035155cd62142d29544.tar.gz | |
recipes/*-cross recipes: ignore TARGET_ARCH sstate hash
"yocto-compat-layer.py --machines" showed that shared packages like
gcc-cross-powerpc64 have a sstate signature that depends on
TUNEFLAGS. As a result, there are unnecessary rebuilds and potential
conflicts in a multiconfig.
That's due to the way how TARGET_ARCH is set. Richard Purdie suggested
setting TARGET_ARCH[vardepvalue] as fix, which works. It would be
shorter to do that in cross.bbclass instead of repeating the relevant
line in different recipes, but Richard was concerned about potential
side-effects in other usages of cross.bbclass.
TARGET_GOARM as used in go.inc is still causing signature differences
for go-cross-powerpc64 and machines b4420qds-64b and p5020ds-64b. This
needs further investigation.
(From OE-Core rev: 39bfa0dd3237cbca47e7fca1075d521f9d073f25)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/binutils/binutils-cross.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/gcc/gcc-cross.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/gdb/gdb-cross.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-cross.inc | 3 |
4 files changed, 12 insertions, 0 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-cross.inc b/meta/recipes-devtools/binutils/binutils-cross.inc index 5e6f468f2e..02ec891606 100644 --- a/meta/recipes-devtools/binutils/binutils-cross.inc +++ b/meta/recipes-devtools/binutils/binutils-cross.inc | |||
| @@ -4,6 +4,9 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils" | |||
| 4 | PN = "binutils-cross-${TARGET_ARCH}" | 4 | PN = "binutils-cross-${TARGET_ARCH}" |
| 5 | BPN = "binutils" | 5 | BPN = "binutils" |
| 6 | 6 | ||
| 7 | # Ignore how TARGET_ARCH is computed. | ||
| 8 | TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}" | ||
| 9 | |||
| 7 | INHIBIT_DEFAULT_DEPS = "1" | 10 | INHIBIT_DEFAULT_DEPS = "1" |
| 8 | INHIBIT_AUTOTOOLS_DEPS = "1" | 11 | INHIBIT_AUTOTOOLS_DEPS = "1" |
| 9 | 12 | ||
diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index bb5f7a0a5e..c5c1645f69 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc | |||
| @@ -11,6 +11,9 @@ python () { | |||
| 11 | 11 | ||
| 12 | PN = "gcc-cross-${TARGET_ARCH}" | 12 | PN = "gcc-cross-${TARGET_ARCH}" |
| 13 | 13 | ||
| 14 | # Ignore how TARGET_ARCH is computed. | ||
| 15 | TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}" | ||
| 16 | |||
| 14 | require gcc-configure-common.inc | 17 | require gcc-configure-common.inc |
| 15 | 18 | ||
| 16 | # While we want the 'gnu' hash style, we explicitly set it to sysv here to | 19 | # While we want the 'gnu' hash style, we explicitly set it to sysv here to |
diff --git a/meta/recipes-devtools/gdb/gdb-cross.inc b/meta/recipes-devtools/gdb/gdb-cross.inc index d92f31fb01..ebe329f6d3 100644 --- a/meta/recipes-devtools/gdb/gdb-cross.inc +++ b/meta/recipes-devtools/gdb/gdb-cross.inc | |||
| @@ -21,6 +21,9 @@ GDBPROPREFIX = "" | |||
| 21 | PN = "gdb-cross-${TARGET_ARCH}" | 21 | PN = "gdb-cross-${TARGET_ARCH}" |
| 22 | BPN = "gdb" | 22 | BPN = "gdb" |
| 23 | 23 | ||
| 24 | # Ignore how TARGET_ARCH is computed. | ||
| 25 | TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}" | ||
| 26 | |||
| 24 | inherit cross | 27 | inherit cross |
| 25 | inherit gettext | 28 | inherit gettext |
| 26 | 29 | ||
diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc index 68f5efd6c0..93206a5d05 100644 --- a/meta/recipes-devtools/go/go-cross.inc +++ b/meta/recipes-devtools/go/go-cross.inc | |||
| @@ -4,6 +4,9 @@ DEPENDS += "gcc-cross-${TARGET_ARCH}" | |||
| 4 | 4 | ||
| 5 | PN = "go-cross-${TARGET_ARCH}" | 5 | PN = "go-cross-${TARGET_ARCH}" |
| 6 | 6 | ||
| 7 | # Ignore how TARGET_ARCH is computed. | ||
| 8 | TARGET_ARCH[vardepvalue] = "${TARGET_ARCH}" | ||
| 9 | |||
| 7 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/go-cross:" | 10 | FILESEXTRAPATHS =. "${FILE_DIRNAME}/go-cross:" |
| 8 | 11 | ||
| 9 | GOROOT_FINAL = "${libdir}/go" | 12 | GOROOT_FINAL = "${libdir}/go" |
