Return-Path: Received: from mail1.windriver.com (mail1.windriver.com [147.11.146.13]) by mail.openembedded.org (Postfix) with ESMTP id 0C0A360739 for ; Tue, 18 Feb 2020 02:56:00 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail1.windriver.com (8.15.2/8.15.2) with ESMTPS id 01I2u1V8028484 (version=TLSv1 cipher=AES256-SHA bits=256 verify=FAIL) for ; Mon, 17 Feb 2020 18:56:02 -0800 (PST) Received: from [128.224.162.183] (128.224.162.183) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.468.0; Mon, 17 Feb 2020 18:56:01 -0800 To: References: <20200211150741.2729-1-kai.kang@windriver.com> From: Kang Kai Message-ID: <2580ac74-38f2-4fdc-9030-7591d9cc26cb@windriver.com> Date: Tue, 18 Feb 2020 10:55:59 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 In-Reply-To: <20200211150741.2729-1-kai.kang@windriver.com> Subject: Re: [PATCH] glibc-package.inc: fix multilib headers conflict X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Feb 2020 02:56:01 -0000 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US On 2020/2/11 下午11:07, kai.kang@windriver.com wrote: > From: Kai Kang > > Pass bits/endianness.h and bits/struct_rwlock.h to oe_multilib_header in > glibc-package.inc to fix files conflict: > > | Error: Transaction check error: > | file /usr/include/bits/endianness.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 > | file /usr/include/bits/struct_rwlock.h conflicts between attempted installs of lib32-libc6-dev-2.31-r0.armv7vet2hf_vfp and libc6-dev-2.31-r0.aarch64 Ping. Could reproduce with config require conf/multilib.conf MACHINE = "qemuarm64" MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "armv7vethf" Regards, Kai > > Signed-off-by: Kai Kang > --- > meta/recipes-core/glibc/glibc-package.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc > index 3aed7be4f8..285a9aa2f5 100644 > --- a/meta/recipes-core/glibc/glibc-package.inc > +++ b/meta/recipes-core/glibc/glibc-package.inc > @@ -87,7 +87,7 @@ do_install() { > rmdir --ignore-fail-on-non-empty ${D}${libexecdir} > fi > > - oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h > + oe_multilib_header bits/syscall.h bits/long-double.h bits/floatn.h bits/endianness.h bits/struct_rwlock.h > > if [ -f ${D}${bindir}/mtrace ]; then > sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace -- Kai Kang