git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commit

author	Kai Kang <kai.kang@windriver.com>
	Tue, 11 Sep 2018 23:25:23 +0000 (19:25 -0400)
committer	Richard Purdie <richard.purdie@linuxfoundation.org>
	Wed, 12 Sep 2018 07:17:37 +0000 (08:17 +0100)
commit	52f2dd97e9dd20dea0f3cdeb2df490d1a4c646aa
tree	9f84e0a66a5454b0216ab7902696eddeca0080ee	tree \| snapshot
parent	3197c086269a4b21fb807a9c552b56f23c5b86dc	commit \| diff

multilib: fix install file conflicts

Fix install files conflicts between multlib packages by inherit multilib_script:

| file /usr/bin/cairo-trace conflicts between attempted installs of lib32-libcairo-perf-utils-1.14.12-r0.x86 and libcairo-perf-utils-1.14.12-r0.core2_64
| file /usr/bin/icu-config conflicts between attempted installs of lib32-icu-dev-62.1-r0.x86 and icu-dev-62.1-r0.core2_64
| file /usr/bin/gpgrt-config conflicts between attempted installs of lib32-libgpg-error-dev-1.32-r0.x86 and libgpg-error-dev-1.32-r0.core2_64

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

meta/recipes-graphics/cairo/cairo_1.14.12.bb		diff \| blob \| blame \| history
meta/recipes-support/icu/icu.inc		diff \| blob \| blame \| history
meta/recipes-support/libgpg-error/libgpg-error_1.32.bb		diff \| blob \| blame \| history