]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
go-runtime: remove conflict files from -dev packages
authorChangqing Li <changqing.li@windriver.com>
Tue, 13 Aug 2019 08:36:22 +0000 (16:36 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 14 Aug 2019 16:33:48 +0000 (17:33 +0100)
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

(From OE-Core rev: 60dcae509a210f2cae8eda525a1b006663aef9bf)

Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/go/go-runtime.inc

index e282195619ca9fd701f2e61274ca612b2b682f57..9731e164e99718a9e1f167639bf862f71a9384ba 100644 (file)
@@ -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"