diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-31 14:52:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-06 12:14:05 +0000 |
| commit | e3c7e1703499e6a5332d9ab8a941671ec8235c4f (patch) | |
| tree | b0e333f8dc7c17b6ed3c730cbd533eddec3cf052 | |
| parent | 786322ec408e2ef5cd6fb809456e0453e5f5e162 (diff) | |
| download | openembedded-core-e3c7e1703499e6a5332d9ab8a941671ec8235c4f.tar.gz | |
go: Change from TARGET_ARCH to TUNE_PKGARCH
Right now go-cross is changing signatures when you change TUNE for a given
architecture. In particular this breaks layer tests like:
yocto-check-layer ../meta-yocto-bsp/ --machines qemuarm beaglebone-yocto
This changes the PN addtion to something containing the tune rather than
the arch which avoids these kinds of errors. If go-cross can be tune
independent that would be nice but currently that isn't the case.
[YOCTO #12586]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/go.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-cross.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-runtime.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/go/go-target.inc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/go.bbclass b/meta/classes/go.bbclass index 167d02e3fa..af331f8018 100644 --- a/meta/classes/go.bbclass +++ b/meta/classes/go.bbclass @@ -8,7 +8,7 @@ GOROOT = "${STAGING_LIBDIR}/go" export GOROOT export GOROOT_FINAL = "${libdir}/go" -DEPENDS_GOLANG_class-target = "virtual/${TARGET_PREFIX}go virtual/${TARGET_PREFIX}go-runtime" +DEPENDS_GOLANG_class-target = "virtual/${TUNE_PKGARCH}-go virtual/${TARGET_PREFIX}go-runtime" DEPENDS_GOLANG_class-native = "go-native" DEPENDS_GOLANG_class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk virtual/${TARGET_PREFIX}go-runtime" diff --git a/meta/recipes-devtools/go/go-cross.inc b/meta/recipes-devtools/go/go-cross.inc index 44f230b8bc..6d9aa5c2dd 100644 --- a/meta/recipes-devtools/go/go-cross.inc +++ b/meta/recipes-devtools/go/go-cross.inc @@ -1,9 +1,9 @@ inherit cross -PROVIDES = "virtual/${TARGET_PREFIX}go" +PROVIDES = "virtual/${TUNE_PKGARCH}-go" DEPENDS = "go-native" -PN = "go-cross-${TARGET_ARCH}" +PN = "go-cross-${TUNE_PKGARCH}" export GOHOSTOS = "${BUILD_GOOS}" export GOHOSTARCH = "${BUILD_GOARCH}" diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index 0041e8afab..c219aa3789 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc @@ -1,4 +1,4 @@ -DEPENDS = "virtual/${TARGET_PREFIX}go go-native" +DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" DEPENDS_class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk" PROVIDES = "virtual/${TARGET_PREFIX}go-runtime" diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index 29a1344675..c229ab2f8d 100644 --- a/meta/recipes-devtools/go/go-target.inc +++ b/meta/recipes-devtools/go/go-target.inc @@ -1,4 +1,4 @@ -DEPENDS = "virtual/${TARGET_PREFIX}go go-native" +DEPENDS = "virtual/${TUNE_PKGARCH}-go go-native" DEPENDS_class-nativesdk = "virtual/${TARGET_PREFIX}go-crosssdk go-native" export GOHOSTOS = "${BUILD_GOOS}" |