diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-04-21 15:55:21 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-04-26 14:00:50 +0100 |
commit | 7dbcc71712ed54f5c3a7898eabfa467cbca19a1a (patch) | |
tree | b4ade8863331f2559035fefd2b8bfcbdbce3080f | |
parent | b8ea59d5950a0a1885b43130c6d9102bb1e161ff (diff) | |
download | poky-7dbcc71712ed54f5c3a7898eabfa467cbca19a1a.tar.gz |
go: Rely on go-runtime to provide needed modules
go compiler is including go/src/cmd modules in -dev package which is in
conflict with go-runtime-dev which provides exact same copy of this
module along with other runtime modules, as a result when both go-dev and
go-runtime-dev are included in image then it results in rootfs failures,
here lets make go depend on go-runtime and dont install the cmd module
here explicitly.
(From OE-Core rev: 307ad88822950e8523b313d70a1fbab87048fa8d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/go/go-target.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/go/go-target.inc b/meta/recipes-devtools/go/go-target.inc index 316bf6f038..8e44247031 100644 --- a/meta/recipes-devtools/go/go-target.inc +++ b/meta/recipes-devtools/go/go-target.inc | |||
@@ -34,12 +34,12 @@ do_install() { | |||
34 | install -m 0755 $f ${D}${libdir}/go/bin/ | 34 | install -m 0755 $f ${D}${libdir}/go/bin/ |
35 | ln -sf ../${baselib}/go/bin/$name ${D}${bindir}/ | 35 | ln -sf ../${baselib}/go/bin/$name ${D}${bindir}/ |
36 | done | 36 | done |
37 | rm -rf ${D}${libdir}/go/src | ||
37 | } | 38 | } |
38 | 39 | ||
39 | PACKAGES = "${PN} ${PN}-dev" | 40 | PACKAGES = "${PN} ${PN}-dev" |
40 | FILES_${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}" | 41 | FILES_${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}" |
41 | FILES_${PN}-dev = "${libdir}/go" | 42 | RDEPENDS_${PN} = "go-runtime" |
42 | RDEPENDS_${PN}-dev = "perl bash" | ||
43 | INSANE_SKIP_${PN} = "ldflags" | 43 | INSANE_SKIP_${PN} = "ldflags" |
44 | 44 | ||
45 | BBCLASSEXTEND = "nativesdk" | 45 | BBCLASSEXTEND = "nativesdk" |