From 60dcae509a210f2cae8eda525a1b006663aef9bf Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 13 Aug 2019 16:36:22 +0800 Subject: go-runtime: remove conflict files from -dev packages fix below error: file /usr/lib64/go/src/cmd/cgo/zdefaultcc.go conflicts between attempted installs of go-dev-1.12.6-r0.core2_64 and go-runtime-dev-1.12.6-r0.core2_64 file /usr/lib64/go/src/cmd/go/internal/cfg/zdefaultcc.go conflicts between attempted installs of go-dev-1.12.6-r0.core2_64 and go-runtime-dev-1.12.6-r0.core2_64 these 2 files existed in both go-dev and go-runtime-dev remove it from go-runtime-dev to fix the problem Signed-off-by: Changqing Li Signed-off-by: Richard Purdie --- meta/recipes-devtools/go/go-runtime.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/go/go-runtime.inc b/meta/recipes-devtools/go/go-runtime.inc index e282195619..9731e164e9 100644 --- a/meta/recipes-devtools/go/go-runtime.inc +++ b/meta/recipes-devtools/go/go-runtime.inc @@ -59,6 +59,9 @@ do_install() { done find ${D}${libdir}/go/src -depth -type d -name testdata -exec rm -rf {} \; rm -f ${D}${libdir}/go/src/cmd/dist/dist + rm -f ${D}${libdir}/go/src/cmd/cgo/zdefaultcc.go + rm -f ${D}${libdir}/go/src/cmd/go/internal/cfg/zdefaultcc.go + } ALLOW_EMPTY_${PN} = "1" -- cgit 1.2.3-korg