]> code.ossystems Code Review - openembedded-core.git/commit
Code Review / openembedded-core.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 1c7f6f4) | patch
Fix conflict error when enable multilib.
authorleimaohui <leimaohui@fujitsu.com>
Sat, 21 Aug 2021 21:41:53 +0000 (05:41 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 22 Aug 2021 21:21:12 +0000 (22:21 +0100)
commit40d131ff65d36022ca604d1153c5948eb888a2e3
treea2cd98de2133e94fc63203884510eb429fb191d9tree | snapshot
parent1c7f6f444fdcb859a37d3b51a8d47260834d01dbcommit | diff
Fix conflict error when enable multilib.

file /usr/include/bits/pthread_stack_min.h conflicts between attempted installs of libc6-dev-2.34-r0.aarch64 and lib32-libc6-dev-2.34-r0.armv7ahf_neon

Signed-off-by: Lei Maohui <leimaohui@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/glibc/glibc-package.inc diff | blob | history
Mirror of the official openembedded-core repository