summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-04-21 15:55:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-07 13:03:30 +0100
commit97b2996489be67e7e932e56caa8a442bb2e85ca6 (patch)
tree0ac657de6b58ac65e719952ba294a89198ee6994 /meta
parentb4024d1280a15a8aab41d9723f97356ccc9174c7 (diff)
downloadpoky-97b2996489be67e7e932e56caa8a442bb2e85ca6.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: 1ace1655f8ae08c07c8875be53b641e7c2564ded) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/go/go-target.inc4
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
39PACKAGES = "${PN} ${PN}-dev" 40PACKAGES = "${PN} ${PN}-dev"
40FILES_${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}" 41FILES_${PN} = "${libdir}/go/bin ${libdir}/go/pkg/tool/${TARGET_GOTUPLE} ${bindir}"
41FILES_${PN}-dev = "${libdir}/go" 42RDEPENDS_${PN} = "go-runtime"
42RDEPENDS_${PN}-dev = "perl bash"
43INSANE_SKIP_${PN} = "ldflags" 43INSANE_SKIP_${PN} = "ldflags"
44 44
45BBCLASSEXTEND = "nativesdk" 45BBCLASSEXTEND = "nativesdk"