From patchwork Wed Mar 8 01:40:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 20568 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E769DC678D5 for ; Wed, 8 Mar 2023 01:40:36 +0000 (UTC) Received: from mail3.bemta32.messagelabs.com (mail3.bemta32.messagelabs.com [195.245.230.18]) by mx.groups.io with SMTP id smtpd.web11.12597.1678239635019509079 for ; Tue, 07 Mar 2023 17:40:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=170520fj header.b=oVyGJ4bK; spf=pass (domain: fujitsu.com, ip: 195.245.230.18, mailfrom: wangmy@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1678239633; i=@fujitsu.com; bh=Tqm/U6iyqWMADPt1PS7Ek8+ckuD5Fo8tOz7ub/4PpE4=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=oVyGJ4bKF3WfpzGeDvBnm77l9JFyjcqPYxcFgcCO1ruW97EdpxH0Zdtvs4IMzabpm /SSea1lRHf/9pwUBAspP8HM/1Xo9iOXaQyrg93QNrO/UOAe6ev2f3cJxHBWm4bogxc U5GXeJHkGNBLQSEQyS0Suq4owVQNSPS/AgTnJoruoVIN6LwgWmnR6rqPqvhxyQp/Ls Qw/qh//vr6VNsYPJIpNUIHtYACWv0Q12SPKjQnH8LBYnApctAr8czww1igMrpF1/YC ABCCF9ysdHlMoDmN7vhMima8e/Rc0knfpiy6BdgElT+KdVfqmNsSTyj2RYpCaWNGcC 1u1z35lKtXDJQ== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRWlGSWpSXmKPExsViZ8ORpDvhOXu KwdsvvBZ3fr5jd2D0OLdxBWMAYxRrZl5SfkUCa8aJA72sBR2cFXM/dzA1MDZzdDFycQgJPGCU mHBmOjOEc4VJ4kXTCVYIZw+jxNwb/WxdjJwcbAJSEjfu/weyOThEBPQkrv4TBQkzC6hIvPjdw w5iCwuESEybexWsnAUofv3QXrA4r4CTxNJJUxlBbAkBBYkpD98zQ8QFJU7OfMICMUdC4uCLF8 wQNYoSsy83s0DYlRKtH35B2WoSV89tYp7AyD8LSfssJO0LGJlWMZoWpxaVpRbpmuklFWWmZ5T kJmbm6CVW6SbqpZbqlqcWl+ga6iWWF+ulFhfrFVfmJuek6OWllmxiBIZiSjHDjR2Mc/r+6h1i lORgUhLl3XeEPUWILyk/pTIjsTgjvqg0J7X4EKMMB4eSBK/PQ6CcYFFqempFWmYOMC5g0hIcP EoivJtBWnmLCxJzizPTIVKnGBWlxHk3PwVKCIAkMkrz4NpgsXiJUVZKmJeRgYFBiKcgtSg3sw RV/hWjOAejkjCvwn2gKTyZeSVw018BLWYCWnxhPwvI4pJEhJRUA5PEpt+d70XZDx6dXhK5mXe rRfweUa7zRU3Sk364f3JPONG70jv9kqWI8DfTI3Vi6z76f/eXvXfn7L2cuVU2fxJLjgtGzaj7 zbpZgW2R/uaUUqYXZ1sVHtbs+5cic2efzbfzR/I3LJ1jde6prZFNXVfBSa7JIdmLtm2afnvLo ddzdqkIP2z837muZ21lgUqm/Da7XtEPi2dm8e7yzTvP+NGwlGXzTOYDHBVVO+/NL9/d+N6ij+ PfjaIY7boC7yfMS14YGTebT9ku/dxx6RQu53Wp1sclO5fdW6ge0bXC2Fnt/A/BmF3frvGfFYr 5ej/t+2OPz+2828oiJnX+lJtgcPehtew8zZP/XXd0LNpb5HJFiaU4I9FQi7moOBEAK1k9P0AD AAA= X-Env-Sender: wangmy@fujitsu.com X-Msg-Ref: server-15.tower-585.messagelabs.com!1678239632!413161!1 X-Originating-IP: [62.60.8.98] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.103.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 29403 invoked from network); 8 Mar 2023 01:40:32 -0000 Received: from unknown (HELO n03ukasimr03.n03.fujitsu.local) (62.60.8.98) by server-15.tower-585.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Mar 2023 01:40:32 -0000 Received: from n03ukasimr03.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTP id D0BCD1AF for ; Wed, 8 Mar 2023 01:40:31 +0000 (GMT) Received: from R01UKEXCASM223.r01.fujitsu.local (R01UKEXCASM223 [10.182.185.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTPS id C41851AD for ; Wed, 8 Mar 2023 01:40:31 +0000 (GMT) Received: from localhost.localdomain (10.167.225.33) by R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 8 Mar 2023 01:40:30 +0000 From: To: CC: Wang Mingyu Subject: [OE-core] [PATCH V2 1/5] dhcpcd: Fix install conflict when enable multilib. Date: Wed, 8 Mar 2023 09:40:15 +0800 Message-ID: <1678239619-21210-1-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Originating-IP: [10.167.225.33] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) X-Virus-Scanned: ClamAV using ClamSMTP List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Mar 2023 01:40:36 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178147 From: Wang Mingyu Error: Transaction test error: file /usr/share/man/man8/dhcpcd.8 conflicts between attempted installs of dhcpcd-doc-9.4.1-r0.cortexa57 and lib32-dhcpcd-doc-9.4.1-r0.armv7ahf_neon The differences between the two files are as follows: @@ -821,7 +821,7 @@ If you always use the same options, put them here. .It Pa /usr/libexec/dhcpcd-run-hooks Bourne shell script that is run to configure or de-configure an interface. -.It Pa /usr/lib64/dhcpcd/dev +.It Pa /usr/lib/dhcpcd/dev Linux .Pa /dev management modules. Signed-off-by: Wang Mingyu --- meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb index 39e689d2f6..03dbf31b35 100644 --- a/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb +++ b/meta/recipes-connectivity/dhcpcd/dhcpcd_9.4.1.bb @@ -62,3 +62,6 @@ do_install:append () { } FILES:${PN}-dbg += "${libdir}/dhcpcd/dev/.debug" + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}-doc:${datadir}/man/man8/dhcpcd.8" From patchwork Wed Mar 8 01:40:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 20569 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9FF2C6FD1F for ; Wed, 8 Mar 2023 01:40:46 +0000 (UTC) Received: from mail1.bemta32.messagelabs.com (mail1.bemta32.messagelabs.com [195.245.230.1]) by mx.groups.io with SMTP id smtpd.web10.12550.1678239641172777620 for ; Tue, 07 Mar 2023 17:40:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=170520fj header.b=yb5wCs/5; spf=pass (domain: fujitsu.com, ip: 195.245.230.1, mailfrom: wangmy@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1678239639; i=@fujitsu.com; bh=stclqC1d2pavUNR9d50W0uDRNTJQB5JdlOgC7slf3Ks=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=yb5wCs/5jeHTM04+G8TY5S9eG/v2nH+2/z6ggjkkc1sVqnpi9CH5U9uE6t0gwbdxI WbqG0ywS8Jnm/td/TX0NgSL5YVOn8vULE6788N/nPVg10vdXdSyFH2Tw1anqLSAIFA V3/EIFU9Vw8c82hTN7D97Xrtrxn1u5qzmGYRprp5gNRQRMmB2dk+f3/3GuIgxa/rHo AgWAjCjl+5U948mjdkvH/bn2of7Si0OcPbNV5yIDvEWe+WaqODllQRorTUPZF2MA68 et4aBtbWacjVKMaFYtWK7obMy3hu7Z/+/6taZLlWVSj8kJsDtV5ltnAUWhND7WxXzs w7w3ZC2Jcjysg== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrEIsWRWlGSWpSXmKPExsViZ8MxSXfac/Y Ug4f3pSzu/HzH7sDocW7jCsYAxijWzLyk/IoE1oz+Q5IFuzgqJv5fyNjAuJy9i5GLQ0jgMaPE tBsbmSGc60wSZ+69Z+li5ARy9jBKfFtQBmKzCUhJ3Lj/n62LkYNDREBP4uo/UZAws4CKxIvfP ewgtrBAoMSmlhZmEJsFKP7g51ImkHJeASeJFYc5QMISAgoSUx6+ByvhFHCWmLv3OBvEJieJd7 0TwLbyCghKnJz5hAVivITEwRcvmCF6FSVmX25mgbArJVo//IKy1SSuntvEPIFRcBaS9llI2hc wMq1iNC1OLSpLLdK10EsqykzPKMlNzMzRS6zSTdRLLdUtTy0u0TXUSywv1kstLtYrrsxNzknR y0st2cQIDNqUYtY3Oxi39f3VO8QoycGkJMq77wh7ihBfUn5KZUZicUZ8UWlOavEhRhkODiUJX p+HQDnBotT01Iq0zBxgBMGkJTh4lER4N4O08hYXJOYWZ6ZDpE4xKkqJ825+CpQQAElklObBtc Gi9hKjrJQwLyMDA4MQT0FqUW5mCar8K0ZxDkYlYV6F+0BTeDLzSuCmvwJazAS0+MJ+FpDFJYk IKakGJr/tCZaMm6rTgif+sC9XS5Z9bKLpuu/8pV7RyZyvWYT9Q05PlUqy1grYUG6+0F7j2++e IxWN2vev63amMe+x0zN5f83Pw/LH34dvk2w/t69eJKc4wfyR+Mp2z53VlqrV7nMP+88/2+Ad9 WmZHKNI1YOAQ6de/3qScHSd1Mo5WolsQjlbvSN2XlRkub+ncmWKs+vM0vPGfyq9t8ktXDt9o0 PusbfTxSObKj2qJNm6P/6bfvrlhe7gqD477SQBDQXRIl+vKy62v75XanT9nO0Uqvemyfn1fXl eoc9PGjRWePpGy7S0r1jD+qI2qOTInRmMltZ7pc37Vc62NLBsrJl4oMFOL2ATg2hgRP6HhD9K LMUZiYZazEXFiQAfxMrwVQMAAA== X-Env-Sender: wangmy@fujitsu.com X-Msg-Ref: server-11.tower-587.messagelabs.com!1678239638!412674!1 X-Originating-IP: [62.60.8.146] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.103.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30539 invoked from network); 8 Mar 2023 01:40:38 -0000 Received: from unknown (HELO n03ukasimr02.n03.fujitsu.local) (62.60.8.146) by server-11.tower-587.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Mar 2023 01:40:38 -0000 Received: from n03ukasimr02.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTP id 0E3A51000D7 for ; Wed, 8 Mar 2023 01:40:38 +0000 (GMT) Received: from R01UKEXCASM223.r01.fujitsu.local (R01UKEXCASM223 [10.182.185.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr02.n03.fujitsu.local (Postfix) with ESMTPS id 026BB1000D2 for ; Wed, 8 Mar 2023 01:40:38 +0000 (GMT) Received: from localhost.localdomain (10.167.225.33) by R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 8 Mar 2023 01:40:36 +0000 From: To: CC: Wang Mingyu Subject: [OE-core] [PATCH V2 2/5] lua: Fix install conflict when enable multilib. Date: Wed, 8 Mar 2023 09:40:16 +0800 Message-ID: <1678239619-21210-2-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1678239619-21210-1-git-send-email-wangmy@fujitsu.com> References: <1678239619-21210-1-git-send-email-wangmy@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.33] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) X-Virus-Scanned: ClamAV using ClamSMTP List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Mar 2023 01:40:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178148 From: Wang Mingyu Error: Transaction test error: file /usr/include/luaconf.h conflicts between attempted installs of lua-dev-5.4.4-r0.aarch64 and lib32-lua-dev-5.4.4-r0.armv7ahf_neon The differences between the two files are as follows: @@ -219,7 +219,7 @@ #define LUA_ROOT "/usr/" #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" -#define LUA_CDIR LUA_ROOT "lib64/lua/" LUA_VDIR "/" +#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" #if !defined(LUA_PATH_DEFAULT) #define LUA_PATH_DEFAULT \ Signed-off-by: Wang Mingyu --- meta/recipes-devtools/lua/lua_5.4.4.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/lua/lua_5.4.4.bb b/meta/recipes-devtools/lua/lua_5.4.4.bb index 0b2e754b31..a39d888ec2 100644 --- a/meta/recipes-devtools/lua/lua_5.4.4.bb +++ b/meta/recipes-devtools/lua/lua_5.4.4.bb @@ -57,3 +57,6 @@ do_install_ptest () { } BBCLASSEXTEND = "native nativesdk" + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}-dev:${includedir}/luaconf.h" From patchwork Wed Mar 8 01:40:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 20570 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C920CC6FA99 for ; Wed, 8 Mar 2023 01:40:46 +0000 (UTC) Received: from mail1.bemta34.messagelabs.com (mail1.bemta34.messagelabs.com [195.245.231.1]) by mx.groups.io with SMTP id smtpd.web10.12551.1678239646201227520 for ; Tue, 07 Mar 2023 17:40:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=170520fj header.b=d1VLjC1p; spf=pass (domain: fujitsu.com, ip: 195.245.231.1, mailfrom: wangmy@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1678239644; i=@fujitsu.com; bh=cRarFgNMZcPDsK6EYRvz+PPOyooKBOuG7Y/Etx1w0Ic=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=d1VLjC1pYY15SbQZ3yjCZX8EHUdIiBUI9g+N7viWmCJUG0/51JarjLiySrnXvpX5p L9mBSK0hcAfGv4ZZDS7gH255qY5GBJBVXIPztOQZ8upeHAoF+P7sd6xn+CPy4Oa50m adAcZpZJXtgKoxNp1ShBO3BKzympKa2FElq2bOG/2SQh85V+lXFpOz/OhqEMbi3+PD E3ifv2kCW4c2/45fwi6rQzPWPGYxuicyWT+FeejnN90wtayUPfq1xRDk2z4YDZwafG FJKfhDg3b8bTy7zKhUf6vZPQDZvf5a/qjNXr79HMQSmnqWlQrfcR6ivwH4srl3KtPj sk7OfR5Nl80aw== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRWlGSWpSXmKPExsViZ8ORqDv7OXu KweEXZhZ3fr5jd2D0OLdxBWMAYxRrZl5SfkUCa8bdWW8ZC1bzVDR0nGdtYPzM1cXIxSEk8JhR 4uH85exdjJxAznUmiavdpRCJPYwSy469YAZJsAlISdy4/5+ti5GDQ0RAT+LqP1GQMLOAisSL3 z1gvcICwRKn7qxhBbFZgOK3zx9iAbF5BZwkzny/xghiSwgoSEx5+B5sJKeAs8TcvcfZIPY6Sb zrnQBVLyhxcuYTFoj5EhIHX0CcICGgKDH7cjMLhF0p0frhF5StJnH13CbmCYyCs5C0z0LSvoC RaRWjaXFqUVlqka6RXlJRZnpGSW5iZo5eYpVuol5qqW55anEJUCaxvFgvtbhYr7gyNzknRS8v tWQTIzBwU4pV+3cwru39q3eIUZKDSUmUd98R9hQhvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErw+D 4FygkWp6akVaZk5wCiCSUtw8CiJ8G4GaeUtLkjMLc5Mh0idYlSUEufd/BQoIQCSyCjNg2uDRe 4lRlkpYV5GBgYGIZ6C1KLczBJU+VeM4hyMSsK8CveBpvBk5pXATX8FtJgJaPGF/Swgi0sSEVJ SDUy5Vnr5V9enmVxQkj+7O7BG3qRfeevHpfn6sVKp7r3dBaWsbCyb/Pv+JajWdF/au3Qt8/tm g5PVWVfZwq9P4mGN19QWrY2ZcWiNo+X87n3x5eZ6mQpv33z0XBMgJ7n/4q+/t7/OfvJ22/Qno osvMslp6ez6o2rFF/ps/XG30z83rLx4UsPe8qzGrI3Xt5nFLV3SzhgTeT5sbYhF2r0Xdq98rZ ru7e98OUWLU8LhpnRiRsxTLWu7lXV+08Wrb7Suk676nLYvoepWl705X5izyPG125aLFVawKrC yTebOrPq1cu8lTuGr4pYHkuY/vpu9c/ssb13HSbu+8Gzfdfjl3cezWzc7bHj4Qu20sdJa/UVK LMUZiYZazEXFiQCkYL4aVwMAAA== X-Env-Sender: wangmy@fujitsu.com X-Msg-Ref: server-17.tower-565.messagelabs.com!1678239643!47092!1 X-Originating-IP: [62.60.8.97] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.103.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27880 invoked from network); 8 Mar 2023 01:40:43 -0000 Received: from unknown (HELO n03ukasimr01.n03.fujitsu.local) (62.60.8.97) by server-17.tower-565.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Mar 2023 01:40:43 -0000 Received: from n03ukasimr01.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr01.n03.fujitsu.local (Postfix) with ESMTP id 96A4A100182 for ; Wed, 8 Mar 2023 01:40:43 +0000 (GMT) Received: from R01UKEXCASM223.r01.fujitsu.local (R01UKEXCASM223 [10.182.185.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr01.n03.fujitsu.local (Postfix) with ESMTPS id 8A16D100043 for ; Wed, 8 Mar 2023 01:40:43 +0000 (GMT) Received: from localhost.localdomain (10.167.225.33) by R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 8 Mar 2023 01:40:41 +0000 From: To: CC: Wang Mingyu Subject: [OE-core] [PATCH V4 3/5] vala: Fix install conflict when enable multilib. Date: Wed, 8 Mar 2023 09:40:17 +0800 Message-ID: <1678239619-21210-3-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1678239619-21210-1-git-send-email-wangmy@fujitsu.com> References: <1678239619-21210-1-git-send-email-wangmy@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.33] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) X-Virus-Scanned: ClamAV using ClamSMTP List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Mar 2023 01:40:46 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178149 From: Wang Mingyu Error: Transaction test error: file /usr/bin/vala-gen-introspect-0.56 conflicts between attempted installs of lib32-vala-0.56.3-r0.armv7ahf_neon and vala-0.56.3-r0.aarch64 file /usr/bin/vapigen-wrapper conflicts between attempted installs of lib32-vala-0.56.3-r0.armv7ahf_neon and vala-0.56.3-r0.aarch64 The differences of vala-gen-introspect-0.56 are as follows: @@ -2,7 +2,7 @@ prefix=/usr exec_prefix=/usr -libdir=/usr/lib64 +libdir=/usr/lib pkglibdir=${libdir}/vala-0.56 if [ $# -ne 2 ] Signed-off-by: Wang Mingyu --- meta/recipes-devtools/vala/vala.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc index d3daee37dc..162e99bb03 100644 --- a/meta/recipes-devtools/vala/vala.inc +++ b/meta/recipes-devtools/vala/vala.inc @@ -50,6 +50,9 @@ do_install:append:class-target() { # vapi files. SYSROOT_DIRS += "${bindir_crossscripts}" +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}:${bindir}/vala-gen-introspect-0.56" + SYSROOT_PREPROCESS_FUNCS:append:class-target = " vapigen_sysroot_preprocess" vapigen_sysroot_preprocess() { # Tweak the vapigen name in the vapigen pkgconfig file, so that it picks @@ -64,5 +67,5 @@ SSTATE_SCAN_FILES += "vapigen-wrapper" PACKAGE_PREPROCESS_FUNCS += "vala_package_preprocess" vala_package_preprocess () { - sed -i -e 's:${RECIPE_SYSROOT}::g;' ${PKGD}${bindir_crossscripts}/vapigen-wrapper + rm -rf ${PKGD}${bindir_crossscripts} } From patchwork Wed Mar 8 01:40:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 20571 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB3BDC6FA99 for ; Wed, 8 Mar 2023 01:40:56 +0000 (UTC) Received: from mail1.bemta34.messagelabs.com (mail1.bemta34.messagelabs.com [195.245.231.3]) by mx.groups.io with SMTP id smtpd.web10.12554.1678239650321050436 for ; Tue, 07 Mar 2023 17:40:50 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=170520fj header.b=vyd1+BQH; spf=pass (domain: fujitsu.com, ip: 195.245.231.3, mailfrom: wangmy@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1678239648; i=@fujitsu.com; bh=T9Gp402IKbBSWDN9kcGeoYxSOcNnnYPQkoVTcljwjj4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=vyd1+BQHh9UxAkp0vC3Oq/6Redq/mYpRtmGuqDNJsRMelJwoiZbh7Y6dcLMs07hc0 MF6uV/q4y8adMu8U3pZ2LNaosJv+nneDLtDGiWv/8+9wqiK22z565k4PFrbhf5p49+ MtTjezIT6IXmYDa99ybbpknbnc0mKHtvxs/egP/frOm56fDO1/wwZ8IlH0qdwUJ8oW jq5QtHuYqd175okyQv8AsyK2aEK8wWcTEzGNRlT+USch9zOUlt3UwqJ4jXen4lF8Cl Lf5goVpPM7+mRf8HpkJSBpoJ/di0ZCl6a9XSelstbpG0IfWtTaqg5QvOxbB9GJckyM DWsG9rXKNrrQA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrGIsWRWlGSWpSXmKPExsViZ8OxWXfBc/Y Ug3l72Czu/HzH7sDocW7jCsYAxijWzLyk/IoE1oyXjc8ZC7ZyVnRu3c7YwHiSo4uRi0NI4D6j xPQfW5khnMtMEkdWv2aCcPYwShy+v4q1i5GTg01ASuLG/f9sXYwcHCICehJX/4mChJkFVCRe/ O5hBwkLC4RLPNoZChJmAQpPPPuRCcTmFXCSmH37LwuILSGgIDHl4XtmEJtTwFli7t7jbCC2EF DNu94JLBD1ghInZz5hgRgvIXHwxQtmiF5FidmXm6HmVEq0fvgFZatJXD23iXkCo+AsJO2zkLQ vYGRaxWhanFpUllqka6GXVJSZnlGSm5iZo5dYpZuol1qqW55aXKJrpJdYXqyXWlysV1yZm5yT opeXWrKJERi4KcVqj3cwbu37q3eIUZKDSUmUd98R9hQhvqT8lMqMxOKM+KLSnNTiQ4wyHBxKE rw+D4FygkWp6akVaZk5wCiCSUtw8CiJ8G4GaeUtLkjMLc5Mh0idYjTmWNtwYC8zR+f+rgPMQi x5+XmpUuK8m58ClQqAlGaU5sENgkX3JUZZKWFeRgYGBiGegtSi3MwSVPlXjOIcjErCvAr3gab wZOaVwO17BXQKE9ApF/azgJxSkoiQkmpg6ri+tsm9YNVNHTblnv8LFhqdYs2+MScuuSno3Vvd +rhX158vO1hxfi3nxmP7K10fS84PmVG+xFxyt92+xYYJ6y8zde28Fakbef62pFafSPxT1sPhb Kvr6jVU4nl1K3sXHnve9sh24+fnPhPMqgpmlwYUmc1z+/DiprL4E4aQelf9srX3Wrs0eZ+yJ7 1WV715OfHY+wuKQS3+XQccL/JF/bfbKFEcdMF7xVIpjbZ20ddaBS/+tb1IEFnJaRuUGVlYeMb gcgLz2u5ml2dXNyZc/v9lwk0u0eR8+zVP367PySh+x5D4LoHX6kl8duzcmgyntV97re+0Svgu qMtisrOV43U9931SdWVCgtxM4XQlluKMREMt5qLiRAC5XDMnaQMAAA== X-Env-Sender: wangmy@fujitsu.com X-Msg-Ref: server-6.tower-548.messagelabs.com!1678239647!3602!1 X-Originating-IP: [62.60.8.179] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.103.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 1009 invoked from network); 8 Mar 2023 01:40:48 -0000 Received: from unknown (HELO n03ukasimr04.n03.fujitsu.local) (62.60.8.179) by server-6.tower-548.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Mar 2023 01:40:48 -0000 Received: from n03ukasimr04.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr04.n03.fujitsu.local (Postfix) with ESMTP id CD6CE7C for ; Wed, 8 Mar 2023 01:40:47 +0000 (GMT) Received: from R01UKEXCASM223.r01.fujitsu.local (R01UKEXCASM223 [10.182.185.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr04.n03.fujitsu.local (Postfix) with ESMTPS id C18CE7B for ; Wed, 8 Mar 2023 01:40:47 +0000 (GMT) Received: from localhost.localdomain (10.167.225.33) by R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 8 Mar 2023 01:40:46 +0000 From: To: CC: Wang Mingyu Subject: [OE-core] [PATCH V2 4/5] xcb-proto: Fix install conflict when enable multilib. Date: Wed, 8 Mar 2023 09:40:18 +0800 Message-ID: <1678239619-21210-4-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1678239619-21210-1-git-send-email-wangmy@fujitsu.com> References: <1678239619-21210-1-git-send-email-wangmy@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.33] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) X-Virus-Scanned: ClamAV using ClamSMTP List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Mar 2023 01:40:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178150 From: Wang Mingyu Error: Transaction test error: file /usr/share/pkgconfig/xcb-proto.pc conflicts between attempted installs of lib32-xcb-proto-dev-1.15.2-r0.armv7ahf_neon and xcb-proto-dev-1.15.2-r0.cortexa57 The differences between the two files are as follows: @@ -2,7 +2,7 @@ exec_prefix=/usr datarootdir=${prefix}/share datadir=/usr/share -libdir=/usr/lib64 +libdir=/usr/lib xcbincludedir=${pc_sysrootdir}${datadir}/xcb PYTHON_PREFIX=${prefix} pythondir=${pc_sysrootdir}${libdir}/python3.11/site-packages Signed-off-by: Wang Mingyu --- meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb index 4e4472a9c1..0fdca732e8 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.15.2.bb @@ -28,3 +28,6 @@ DEV_PKG_DEPENDENCY = "" RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}-dev:${datadir}/pkgconfig/xcb-proto.pc" + From patchwork Wed Mar 8 01:40:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mingyu Wang (Fujitsu)" X-Patchwork-Id: 20572 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D32B0C6FA99 for ; Wed, 8 Mar 2023 01:41:16 +0000 (UTC) Received: from mail3.bemta32.messagelabs.com (mail3.bemta32.messagelabs.com [195.245.230.82]) by mx.groups.io with SMTP id smtpd.web11.12612.1678239671554989032 for ; Tue, 07 Mar 2023 17:41:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@fujitsu.com header.s=170520fj header.b=MSufP99U; spf=pass (domain: fujitsu.com, ip: 195.245.230.82, mailfrom: wangmy@fujitsu.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fujitsu.com; s=170520fj; t=1678239669; i=@fujitsu.com; bh=bVB+/njmM/zakfUfP1B0nij2aytuKmjQbmn05AttZHU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MSufP99UGhZ1ftPX388LMjEtvk1i0FRgEKN+mAF+X1Egk9GqyQdanVn9XxqnojdPT rYcPXVWefINwEJgpk1SBXoKU3q2abLTQXuw7UFgWCDHhdWU1lcA1uUjWttyEVCtzcz 65RY4Z5KIqOgakS8qnlbjz6zMRyQ/5PEo8zP3y50Le2EzDXwcjrGG16qnRVTkCUh1d 5sHA1ZwSIzeEYqzi1NkgLWxFWxMMppDHFK9G6klvTD3rZqZBRjRIzX3orMFjUzouY5 td1R7rD/VMaNphCPAqkKyVamdKr2BVs52vqJ3leIh+mO//tgbrQ+wYKeB+31wWZ5n+ 0GYcZS+OAM7dg== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrCIsWRWlGSWpSXmKPExsViZ8ORpLv1OXu Kwf/jnBZ3fr5jd2D0OLdxBWMAYxRrZl5SfkUCa8bF7p/sBVv4KuZfCmpgbOXtYuTiEBJ4wCjx Z9lhFgjnMpPE5Oa/7BDOHkaJCUufsXUxcnKwCUhJ3Lj/H8jm4BAR0JO4+k8UJMwsoCLx4ncPO 4gtLBAksffLWyYQmwUovuNiCwuIzSvgJHF95nGwuISAgsSUh++ZQWxOAWeJuXuPg40XAqp51z sBql5Q4uTMJywQ8yUkDr54wQzRqygx+3IzC4RdKdH64ReUrSZx9dwm5gmMgrOQtM9C0r6AkWk Vo2lxalFZapGuoV5SUWZ6RkluYmaOXmKVbqJeaqlueWpxCVAmsbxYL7W4WK+4Mjc5J0UvL7Vk EyMwcFOKWZh3MB7u+at3iFGSg0lJlHffEfYUIb6k/JTKjMTijPii0pzU4kOMMhwcShK8Pg+Bc oJFqempFWmZOcAogklLcPAoifBuBmnlLS5IzC3OTIdInWJUlBLn3fwUKCEAksgozYNrg0XuJU ZZKWFeRgYGBiGegtSi3MwSVPlXjOIcjErCvAr3gabwZOaVwE1/BbSYCWjxhf0sIItLEhFSUg1 M/OauFwuqju1Mc5H7eOfzG8FjYrwTPrFN1iru2+mjc/avoZT0Oe7qp5/LdaR7dzfv+Xsp8XwU j3hUrmv+V7ba/YVJEdI/Zp4p/ByuvjCi7Fxh0VeJxOUrhQ8v0Onp+BrWd23HuWVb9q/aap8pL NM2yXtOy7k5CenvnU9yaP/KtXy4eGXakmouebEdiq6yJU17L13ZljHh3MpvTw172X+9/PNlv8 +2+ct7PwpJXVawPKBld/9ffNXleOtZ05iXtvJpZ52sfaH0enm2uWluXbbH55j9tyfMsznT0m2 hsLq2W2PNPpfzxTu8J4R+c3x8/aFWW2zgFd7Em/zZU8TdTUt29H9XtO0xjK/dNGl9uqedEktx RqKhFnNRcSIAUerrJ1cDAAA= X-Env-Sender: wangmy@fujitsu.com X-Msg-Ref: server-22.tower-585.messagelabs.com!1678239668!411584!1 X-Originating-IP: [62.60.8.98] X-SYMC-ESS-Client-Auth: outbound-route-from=pass X-StarScan-Received: X-StarScan-Version: 9.103.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6922 invoked from network); 8 Mar 2023 01:41:09 -0000 Received: from unknown (HELO n03ukasimr03.n03.fujitsu.local) (62.60.8.98) by server-22.tower-585.messagelabs.com with ECDHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Mar 2023 01:41:09 -0000 Received: from n03ukasimr03.n03.fujitsu.local (localhost [127.0.0.1]) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTP id BDDB91AD for ; Wed, 8 Mar 2023 01:41:08 +0000 (GMT) Received: from R01UKEXCASM223.r01.fujitsu.local (R01UKEXCASM223 [10.182.185.121]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by n03ukasimr03.n03.fujitsu.local (Postfix) with ESMTPS id B25837B for ; Wed, 8 Mar 2023 01:41:08 +0000 (GMT) Received: from localhost.localdomain (10.167.225.33) by R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 8 Mar 2023 01:41:07 +0000 From: To: CC: Wang Mingyu Subject: [OE-core] [PATCH V2 5/5] bash: Fix install conflict when enable multilib. Date: Wed, 8 Mar 2023 09:40:19 +0800 Message-ID: <1678239619-21210-5-git-send-email-wangmy@fujitsu.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1678239619-21210-1-git-send-email-wangmy@fujitsu.com> References: <1678239619-21210-1-git-send-email-wangmy@fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.225.33] X-ClientProxiedBy: G08CNEXCHPEKD07.g08.fujitsu.local (10.167.33.80) To R01UKEXCASM223.r01.fujitsu.local (10.182.185.121) X-Virus-Scanned: ClamAV using ClamSMTP List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 08 Mar 2023 01:41:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178151 From: Wang Mingyu Error: Transaction test error: file /usr/bin/bashbug conflicts between attempted installs of lib32-bash-bashbug-5.2.15-r0.armv7ahf_neon and bash-bashbug-5.2.15-r0.aarch64 The differences between the two files are as follows: @@ -26,14 +26,14 @@ # configuration section: # these variables are filled in by the make target in Makefile # -MACHINE="aarch64" -OS="linux-gnu" -CC="aarch64-poky-linux-gcc -mcpu=cortex-a57 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security " +MACHINE="arm" +OS="linux-gnueabi" +CC="arm-pokymllib32-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security " CFLAGS=" -O2 -pipe -g -feliminate-unused-debug-types -DNON_INTERACTIVE_LOGIN_SHELLS -DHEREDOC_PIPESIZE=65536 -DBRACKETED_PASTE_DEFAULT=0" RELEASE="5.2" PATCHLEVEL="15" RELSTATUS="release" -MACHTYPE="aarch64-poky-linux-gnu" +MACHTYPE="arm-pokymllib32-linux-gnueabi" PATH=/bin:/usr/bin:/usr/local/bin:$PATH export PATH Signed-off-by: Wang Mingyu --- meta/recipes-extended/bash/bash_5.2.15.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-extended/bash/bash_5.2.15.bb b/meta/recipes-extended/bash/bash_5.2.15.bb index f78f79fcc5..ce81496f52 100644 --- a/meta/recipes-extended/bash/bash_5.2.15.bb +++ b/meta/recipes-extended/bash/bash_5.2.15.bb @@ -20,3 +20,6 @@ DEBUG_OPTIMIZATION:append:armv4 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb DEBUG_OPTIMIZATION:append:armv5 = " ${@bb.utils.contains('TUNE_CCARGS', '-mthumb', '-fomit-frame-pointer', '', d)}" BBCLASSEXTEND = "nativesdk" + +inherit multilib_script +MULTILIB_SCRIPTS = "${PN}-bashbug:${bindir}/bashbug"