diff options
| author | Changqing Li <changqing.li@windriver.com> | 2019-08-13 16:36:22 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-14 17:33:48 +0100 |
| commit | 686cf796b94eb44f92d907e24562790ef7c8b1e8 (patch) | |
| tree | aaa8ac8da0f2a61f08b445321ae4027d118feba8 | |
| parent | d2093ecc224f4dee374b293f6e6c93c658154c52 (diff) | |
| download | poky-686cf796b94eb44f92d907e24562790ef7c8b1e8.tar.gz | |
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
(From OE-Core rev: 60dcae509a210f2cae8eda525a1b006663aef9bf)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/go/go-runtime.inc | 3 |
1 files changed, 3 insertions, 0 deletions
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() { | |||
| 59 | done | 59 | done |
| 60 | find ${D}${libdir}/go/src -depth -type d -name testdata -exec rm -rf {} \; | 60 | find ${D}${libdir}/go/src -depth -type d -name testdata -exec rm -rf {} \; |
| 61 | rm -f ${D}${libdir}/go/src/cmd/dist/dist | 61 | rm -f ${D}${libdir}/go/src/cmd/dist/dist |
| 62 | rm -f ${D}${libdir}/go/src/cmd/cgo/zdefaultcc.go | ||
| 63 | rm -f ${D}${libdir}/go/src/cmd/go/internal/cfg/zdefaultcc.go | ||
| 64 | |||
| 62 | } | 65 | } |
| 63 | 66 | ||
| 64 | ALLOW_EMPTY_${PN} = "1" | 67 | ALLOW_EMPTY_${PN} = "1" |