From patchwork Thu Nov 25 02:44:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 1261 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 800C7C433EF for ; Thu, 25 Nov 2021 02:45:05 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web09.7319.1637808304496207846 for ; Wed, 24 Nov 2021 18:45:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=DEYO4Qdb; spf=pass (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=6963faa46c=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AP2fh1H009587 for ; Thu, 25 Nov 2021 02:45:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=Ol61r1Jf30CmzNiM8KdRtWr74DKjbqt2ayMqQIEJHlM=; b=DEYO4QdbIGmPEyUyETU7KjFcwTJ6idnPTnVhmP/lN+QdkE//f6EkrlZIITjcFpwRL9l7 djRk25O2yAcuq5YaWXTcmTx6s5YnIRuq6CMiEA6LrWfQewqlY/he24NkvWYTf4mKNAlY V9NDId4AIxS3pc0Rf3gGhpivOtgiSNSm6Syn2mgxJ195on9SZVMSb1c1FM/8BO2DlJGV IeNdNWBwaQ/X5+KmivOnKcxl1x7f1DThz/2u6NckDwyTyJAeUFmA5iDt9rA+pHaeN5Fp pQG03GZy+rsySwItOHMNWucQaf8Ww1aKYzdyx6Q+5H0ge7ikU7gnR47qDzHyuIvqk+DP jg== Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2177.outbound.protection.outlook.com [104.47.57.177]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3chce58yxf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Nov 2021 02:45:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S3K6pCf6cbu1nBjbnP/2kDID2ZJN36ZSepbgRxKEFtmMk51i21TwNlLv/xUagn2HJALeBW9RtlZq+9Trau/E5lXQZqyG4zoRKdJaXf/nvNx4/KG3z2Q3cutMDSMOW0aJhMOB1q32ZhCKedwJyH7kAIDK0rITKkmIxoUGpu8YxJ75Gg8zBrYPLhB0aLgar79gWx2GREo4wKuurQfajzWtsOQKKRrA8/Ea/eI9F3aDgzXCa0N+M734w7u9seUMd+OCSwwsRsxvdR7A+Rn31Sh3cK3pnmGPRRK7lBe5q2gN+lVjs9h/Nrac/rKRDm3Pp3AUx44eQZkcxGQ0V3K9d9oNtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ol61r1Jf30CmzNiM8KdRtWr74DKjbqt2ayMqQIEJHlM=; b=ab8HYeTKGKWeIaICLLUK7oYlxoVe1m5FNjpDmsLK/S2VAFQge+xR78j/Ie1Iwe39MgG+CNKUrQmIY7gytqBtE8w5dr7C7rDroHHXgKbOn5+Z0w25RF8Q6DPbK3VtQgVg5OdX0r5URgcAgWwWoReFbttDDplUGuw4U50Zk4dnhPEwVGC9YTlXczHrRQkhAVA7jcl4LuovS1ozKX1/pz7ePaugxN5NenV1ZWXpwDFdi8fRnyxK8qQaUjJ+FtWcSn1Na/ftkLElPPhK6hKNgAlpy0cW1A/KLbX9hj0bf6eZifWslhJJVmfQfxLrdVEU4hXj2tEyFyw5k20UPTVK0biCmg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by CO1PR11MB4803.namprd11.prod.outlook.com (2603:10b6:303:90::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Thu, 25 Nov 2021 02:45:01 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480%9]) with mapi id 15.20.4713.022; Thu, 25 Nov 2021 02:45:01 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 1/7] libtalloc: fix pyext_PATTERN for cross compilation Date: Thu, 25 Nov 2021 10:44:44 +0800 Message-Id: <20211125024450.143364-1-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 Received: from pek-yzhao1-d1.wrs.com (60.247.85.82) by HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 02:45:00 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 76b8ab9e-39b5-4b49-b651-08d9afbd936f X-MS-TrafficTypeDiagnostic: CO1PR11MB4803: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1388; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3WthVneLOsUzkrcrUo5OFw8ZqmfJ9J7PLu/bPVBZLHKQJovZ8lsxQotGtkAizTFaU7wO2O3nyK4Vllg2+7HT+qiseCs8r4IbnX9V+4MxhyQvKTjwW+BWGQViS7bDrz8wcJCsbpupIghQO2NeuM12Ojv7c24Ud0ygNORrADmVMRSVsebiy5+ehXMxW9l00vas3p3lTWmi5NUPlWfja/nxfvZrT4+V2DJG9Fs3zU8wD6k6MAwYgM0mHoS/IFaT/ClKUhNANlmOPqj+f5lDfeHAw9+gK7AT7xsayqJhWFMCb8ESVarqKnDJ+JplCmOOKepIlGon83IRCaoFF2dBVSFvT27lFoPIU5O0W5jMjUtW4ooOPeJ+Y4gE28wbPqo4Vf8qZw3zunHXZcgiBC5nBGO2ZFfHA0VEPYPVgJjQ0HgPfa7lsUWzAqL8yT7WwGE7QjfehkdCMLRJBmw/NDQntI5xr8qQ21OxY0+THwJnINiYmMd//1y/ysjSrD2WbUo6ljbXOr8Vz6GJSdDkUHIJzzhwsntq8YswBvBHVJw0RHS2FEGlRmriop+b5IEikjxGpMwDUB+8r1TfW4OavcvAvxjcbziPcSA8FHfE2M0/Ikh/d9z2PyXhD1L0X2RHEAg7iXjn1AxIbtargj30ykpQdwkF2MmG9M7mDcYhOj0TRlQC5tIbN9riirk2KZY1i7im96j+cvlkocgSj3u+BJqxHAnLJ4uUyrm5PJW0XUKy6s2YVkIJc2+Dku4D+FLNRCIf7knIp6BXdbuXrZgTCZHnmlQ9PkgkTWSz53Xa+AjX9g6UmMg= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(44832011)(186003)(6916009)(52116002)(26005)(6512007)(2906002)(5660300002)(6666004)(2616005)(956004)(6506007)(508600001)(66946007)(36756003)(1076003)(66556008)(8676002)(86362001)(38350700002)(38100700002)(66476007)(316002)(6486002)(8936002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: CkN516Ow55cXcT1p1wow4+aOkTJFDTq6bDeHrmmKAk6TbVNMKiXEWNuLkkg3pN9I0MKDKV0g8wz1PBBuOz9dUSBZYsg3upjxZFSFmtBen7I2yfmOQSKvz6ybFV6K14DmshBULImsEuEOwpYXxUhrcfh9R6r9hVddUmxruB8b1f3S5u2SmNa7j1pWiN24sOGFndp2bD4UNdZSgYxcmF7aTlexDv5xUlzBq1oT/yller2DmReKhxQF56kfetou94xGHhxoXkgD1m21jtO870yglgTxsmnJ/1adgNOMAo+gfZjXMkkbADAZ7XHmhce6xYrI6mTT9z4jZb8aGpyCUF0VSXmDRnewHM/hcfPdXqk0nOKWSyn0taRKHwN4A9WhSWhnVYCPm123TaZQGYDRjkqQ+L6GCqU4oTHI+znrZXt3ZwAq3b7m6WZF4BhcFIH9P1JrcRO3qvfHlDxCjzLfmExyNs6Axrfg0B3rist+AS+dnjr3p/bk8bLDteRet7V+DjJ7ZAIK7BdEK9ve3W3s7GwHy+FzAjLa04mBKC5bd4onBVDhASNsSs+S6KO//silTaQe55RhXT3zgq8i489qQXkLJ3mczVTyb3AFWS/Ycg2qxHYNCdnYR+wcwOva7XhBgs9O+DkQSsgwPoAyotJBINKW4YtO3jKV4oQtal/b+pN1XT8WaxJ0te6A6iK7UGFAHHuvFSUaqe8VzWacORkDRNZU93+Lql61yeLHaL4loJkofM6CqhCRQgSQVSE50Ctqs76z0UL4de5iBHVXMo/+t6JoQ/wnowQoD0ygT1IDY2fYFAHGE5lB1XMw+NsA6mbDKC8YBfqMaUlre/QKsVEracAc0buxBY65XILve4CQgMZCVC34It9khBSmk89a6TWtYP1nLZwknHSOa2z5/MuEvNuDxCXYi0PV3ZkT5SaJjo0XHlgwhCUYfXH+x6ZnhVe8cskk29KPYUKJLJcISblHlkl+l2YufFTYAcyaQ7esqth/giadMIdkp9K4ZWFtD5xBGXTiHJP6LYwuLX3vkyboxYbaechk7GFEF3iAu843fHoko9KyndBo9fgR1KUIuCZIEZiNwKAEoOXAMqRe+eZmALuox9H2Im0yN9EdBb0A+iqDkXL//uFlxSRy3+YabIwphF5ndoemD5zmoMVr14LBrGV4sKihGoskRuKmW4mv+ybtd8MZ/augDjwUQVN1PRYeMXeI10z2oG6fRQttdntvyqwEcqvv24iYg2dO4kZUIR7AlJYnN/BzzymK3NHpttmG+ZcRvXmSLGl/mKmiljRgnJHfa9uLVaVFd5qOV6DaBijQHYXHzKJGiQbjc25ERMmggAdGERjg0dM+XF4D2OpsU+MuZbz/oZGUrUwBQQf3NzN9kOLkgcryahcGcxH7lvzmC37VAj7Nd3lZhI5dzzHVYtVauxPoEQupdG/KoR4MNt9apxWfKpfAq5m7zNyQObaYbHhjFI4c4Cpzw/3wg6CFVdSUyDSQuLGwG3dfD5YB1H6QwQH6VPdrSBOUkAcH6zzNDWrrLPTl0Yw1UZqiwsEmyqTKPGvU0CgvVVMizC1UzOf1MV1tGhqGKdWn3i8yBF7eL+cE1KhPhMXocXGE1WfcvnCVccMY2+xfbmnMohSE6sLLLxk= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 76b8ab9e-39b5-4b49-b651-08d9afbd936f X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 02:45:00.8629 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YR9XvldzCGr96/yX9DSqB0aDQd3061/uWuMSD+6ckzO2G/iBAAUmN8ac4pdckJuM2dz41sCXMCVTG7W0KIrDNg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4803 X-Proofpoint-GUID: cjMyPGMb4jDe4vWz-FYFcgp6h8Sfou-M X-Proofpoint-ORIG-GUID: cjMyPGMb4jDe4vWz-FYFcgp6h8Sfou-M X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-24_06,2021-11-24_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 mlxlogscore=999 clxscore=1011 impostorscore=0 suspectscore=0 malwarescore=0 spamscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111250012 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 ; Thu, 25 Nov 2021 02:45:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94116 The pyext_PATTERN will add native arch as suffix when cross compiling. For example, on qemuarm64, it is expanded to: pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' which will result in the incorrect library name. root@qemuarm64:~# find /usr/lib -name \*talloc\* /usr/lib/pkgconfig/talloc.pc /usr/lib/pkgconfig/pytalloc-util.cpython-310-x86_64-linux-gnu.pc /usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2.3.3 /usr/lib/libtalloc.so.2 /usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2 /usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so /usr/lib/libtalloc.so /usr/lib/libtalloc.so.2.3.3 /usr/lib/python3.10/site-packages/talloc.cpython-310-x86_64-linux-gnu.so Set pyext_PATTERN to '%s.so' to remove the suffix. After the patch: root@qemuarm64:~# find /usr/lib -name \*talloc\* /usr/lib/pkgconfig/talloc.pc /usr/lib/pkgconfig/pytalloc-util.pc /usr/lib/libpytalloc-util.so.2.3.3 /usr/lib/libtalloc.so.2 /usr/lib/libpytalloc-util.so.2 /usr/lib/libpytalloc-util.so /usr/lib/libtalloc.so /usr/lib/libtalloc.so.2.3.3 /usr/lib/python3.10/site-packages/talloc.so Signed-off-by: Yi Zhao --- ...-pyext_PATTERN-for-cross-compilation.patch | 57 +++++++++++++++++++ .../libtalloc/libtalloc_2.3.3.bb | 1 + 2 files changed, 58 insertions(+) create mode 100644 meta-networking/recipes-support/libtalloc/libtalloc/0001-Fix-pyext_PATTERN-for-cross-compilation.patch diff --git a/meta-networking/recipes-support/libtalloc/libtalloc/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtalloc/libtalloc/0001-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 000000000..47ee4bb24 --- /dev/null +++ b/meta-networking/recipes-support/libtalloc/libtalloc/0001-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,57 @@ +From b5eaeb7ed4e75012d2715f995e15a13850064f61 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib -name \*talloc\* +/usr/lib/pkgconfig/talloc.pc +/usr/lib/pkgconfig/pytalloc-util.cpython-310-x86_64-linux-gnu.pc +/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2.3.3 +/usr/lib/libtalloc.so.2 +/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so.2 +/usr/lib/libpytalloc-util.cpython-310-x86-64-linux-gnu.so +/usr/lib/libtalloc.so +/usr/lib/libtalloc.so.2.3.3 +/usr/lib/python3.10/site-packages/talloc.cpython-310-x86_64-linux-gnu.so + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib -name \*talloc\* +/usr/lib/pkgconfig/talloc.pc +/usr/lib/pkgconfig/pytalloc-util.pc +/usr/lib/libpytalloc-util.so.2.3.3 +/usr/lib/libtalloc.so.2 +/usr/lib/libpytalloc-util.so.2 +/usr/lib/libpytalloc-util.so +/usr/lib/libtalloc.so +/usr/lib/libtalloc.so.2.3.3 +/usr/lib/python3.10/site-packages/talloc.so + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index b1c8dd0..24faa31 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = dct[x] +- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.17.1 + diff --git a/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb b/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb index e6e2066a5..9b207609f 100644 --- a/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb +++ b/meta-networking/recipes-support/libtalloc/libtalloc_2.3.3.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://talloc.h;beginline=3;endline=27;md5=a301712782cad6dd6 SRC_URI = "https://www.samba.org/ftp/talloc/talloc-${PV}.tar.gz \ file://options-2.2.0.patch \ + file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ " SRC_URI[sha256sum] = "6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa" From patchwork Thu Nov 25 02:44:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 1262 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 96D6FC433F5 for ; Thu, 25 Nov 2021 02:45:05 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web08.7492.1637808304496566371 for ; Wed, 24 Nov 2021 18:45:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=kiDJDS4n; spf=pass (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=6963faa46c=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AP2fh1I009587 for ; Thu, 25 Nov 2021 02:45:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=t+Locyl2TA5MJvVu8PRIoJFFZo/REuv3SM5LjYc2mt0=; b=kiDJDS4nsX1XVjNS71wPAZiuDt+I7dkZJZlOHV7r7PrSWoXFS9l7WIg87R2DPdM1h3/V zcfAXbMSuFlQOSyrWpS8E5tXtV5HJIn3f4btCLA7bLBcx1j8RsxW/1+IEYaI52KY4Q7g hqOgzG0KycZSnzyJO3w4OvO1ATDfS9IhhPJ0nyjKciH6txMPB/y1TLkangX+WAbetwCC 6IGyi7AweNWurzmtRAeIWglQqoWqgT3Pva6I2WkZAozy5eBhRgi4qsJ0i/Gu27h1BjDz YLGnqaAUHO1pFEoaw1RkatsGDiPSEPttb1T9EwybWhL0rM19vE+QkqTzL0ZTg9uzpwcT bg== Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2177.outbound.protection.outlook.com [104.47.57.177]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3chce58yxf-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Nov 2021 02:45:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VD8ByV97UXvx5VT/QaKsOftYuP7/BxC1xAIH75YTSbqLNqCqCm/CCtisX4cLVc/jJCJGXuovEV88ZpR0SWQsgCMSviLXlaXWpky32OKA4pxXy/W09Xz+lu4j16nL111wP9lfU751ERp+h+sznyQV+kpkU/8DhjOh4VzP2/7F8+AiPrHY+DyJaIItu4KQquenLMwC3jnbL4HTx5Oi7gROspET0a5NiALKrFxqIV55ziy3IDusbKF3eO3Oi41fwSj7GpDTGS+u8ZoAfuGRlJUExIDlGArdeSeFaSiXpJWeFd0sZ6Zt3n9XbWlXPGYWsYMebg75ZhuCc/gJKwQGlMXpag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t+Locyl2TA5MJvVu8PRIoJFFZo/REuv3SM5LjYc2mt0=; b=iCuvrQ8p64iYbV6d8B9rD9w2mGPEPNw7eZab84hQ3gavh7LY+wfqLW8tOBV4X8SD/F/ewmC20gVhP7OtoUPvHII0/r50J9d4b82UgDvEPIas1CFL1v63YRT86S4OUdhb32atG6MYzzBQDLXSGZiWM1QSxLbwhjnD+FhGYRgQUWSaL4mub3R0kFADp0b3qJUWCfFYPoKq3zyzSgLcs5rGFVwXJMO6i42NcPiDpzle2Sm743T6uS9yDGLic4YBa+u7pWAETPn21l9Gi4LzABTy6ZA3j47/ZOBtp4WJ/53CiiuH9bTJYIbCyuOsTzppBGOss+opJo45YTJRnISwQsQqlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by CO1PR11MB4803.namprd11.prod.outlook.com (2603:10b6:303:90::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Thu, 25 Nov 2021 02:45:02 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480%9]) with mapi id 15.20.4713.022; Thu, 25 Nov 2021 02:45:02 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 2/7] libtdb: fix pyext_PATTERN for cross compilation Date: Thu, 25 Nov 2021 10:44:45 +0800 Message-Id: <20211125024450.143364-2-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211125024450.143364-1-yi.zhao@windriver.com> References: <20211125024450.143364-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 Received: from pek-yzhao1-d1.wrs.com (60.247.85.82) by HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 02:45:01 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f9c44877-a9a2-4151-7465-08d9afbd9409 X-MS-TrafficTypeDiagnostic: CO1PR11MB4803: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1775; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g1i1XbYtnwUCuSOI03MN8IlpCl5LyrM7uUf9srNp/2vn/2Fx4k9xUIqYjJg3NpCXtQ1A2BaZVtpQGpQYi0bZkL0G5vVD8D2DVGEUxqBDjAsgtuGS6bRlVZ6Y2QTgCATCSHA04j/buHMXC251MSqlZtzUyGWlmLwpZFp3CahC8C0Q9OeOg4WyQ6rhOUBZqWBFfHEghnQZFEr7HaLQwwyfImnJQ1689eZ+HEmr17DfeZvSxAKIyO6OUn43pqwX3nLqLwpukZpFJdn+U2HEXY+ZbkemAmNFBjGmzvqmuwd6CDYhq24bLQQIinyhioeNL33beuLEA6ZWhzj/vgDSyWPg7/VJ/DSOpFT0v4ugdE7oraD79LyE4t8KhT43aJMdwFNicMvOsYQyDRp1qAv0eg+6ioovDPAhhh6KAcrPp4lsr1AbNkl6uNeqIegCbiUPUY8b+q6nuv8D+8STyYWPTTLG/nMgDlf9HmzILzKAh16TZ5vrb5QAklwbxRXJoOsThPtjQA5QeBWFeQ8rjYDIF65eyQNixJv2DRiFpoBYLYAqlCjIvaG+DhbHT6nw3tY9qYsdlddMUY74pJ9jh8V4CJjno9AtMyWEsuE6QmHthjam+MMYnxXRgdRrALwcx4QH1/prWJ8R+DZQFdlvOEzEU3Lcd4DLnTFytzQIH5skZGQMa6ac5uVR0UrmPLcqdDgsBGIY3VIr3zerLo+Mrr7ixgJpbc+zzMqOb8P9zgn6VzMRdz5Drf71knD38wgvTl9g/RGerY5dGKXc7VBd4peM7q1um4YSuSIDqKUaa7vVIpqOTmI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(44832011)(186003)(6916009)(52116002)(26005)(6512007)(2906002)(5660300002)(6666004)(2616005)(956004)(6506007)(508600001)(66946007)(36756003)(1076003)(66556008)(8676002)(86362001)(38350700002)(38100700002)(66476007)(316002)(6486002)(8936002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dyXpIFnhxGUZ4zaUyRS5/+Y+6GPbqPcSCsxcA0wSypjjFGFBHSGLkyqdbFfx/JM/1yoWtfmyHjKPyk+oqLNOzxTABN4W3g7v9mLCNU9R3NIMzl5dRPhfRVKt+RN4ll7iVFKHIbtws4AiPlWL8A8IlwtRNaAQM6xsbg3bEC6/4JLmavx5HHMKJrELtMl3/ci7esoOGfx5Q+2MbO+LQ1u5IhznuTNyEtocLhg5BlZygXYaKqzAI0nSSwkgfWn8vJZ8gGAa/3NfnEsqWagIORjrgwy0vsG9QXEWX2Xc4zilnJCALMCQz4r5nOv1Kl7ptmeO7b5xFGe/+ut7jP9gjdDR67bBJxgqV7qw27CMo0mR5EPyAEUOT37KT6auZpZ8rJAP024BrV8LD2XEKTKG/DEqe4vRO6oz/r0/XtPtD+ie1c1wZhROfJARM/eIDwAERN2ellM4OEfGG4W3PSUJbbVk3otQ5wxv1++dRlz+sZGJLFAT6vUadO2N52l9pS14Crvy9ZzhXauNyeVWYiN7SgZwQZSPeE2sbSMB3mlQxzBGNX6WNgyF7F7eOxfPESSixXbFiY0aU+fdnHQV5b+Ke4qMR2lmISYiQ8VyAyhdJaSyznOWkM2pvZ4CWeIAuUnVziDfgh+qpFwfLUt5hZ9SsMKDbce9GRfbj4R50e3YzfHhAK32P3G21Fnj2AT8pOyCAXZJ0nN9+ESpRkY0qQo5ISChDIiFXt1tv18/iqlIxmHaL6xBCkmGJSZH2RCg9gAAEsuS4Y46GNSz7m2HPqU3c9CBeVhBksnVJJ1bNiFhmebyS9yycl8nFuH12IcwFzoDKu9TKyeNBg1VMqZclkCOcJRFY9h/GLANb7wuR4wJ+OSEVcckFnrzLxqIkoR987QIXaPGe8T/NONbbawD/FyxCa4aNqytAijHw6PJOw4MMIALmTzNvuOt8S7gYQpGPNtnjEay4/WULnwU3G/oO/jNzuBIt85RFM04hjVB1Qvl0hFft+PwaneqzqCZlR/c0kjcZ2J/LY0VGDWw1jMFOYMwz7f+GXLlrooh1jFHTXwFcvVI6AZJvaeSf8caKU5vUDuE/hBhz5NYc1+AE8A+2ciySjC1DXkNEPDxTVIGJqlyj5imPcpGfGkYN5MRvzlBGf2Kny8UngBdX4u1Y3QDqTVGhpRqAA1rBqhpCTmLcEKxppU+kHXOuJxi1cR6sDSev099trCl0JAGhWn4Fz8MQtUf/H4t48n8TrnjUf+ikyYZ7zXpJHgO2Evq4w2ZAAl85j5DCJF6miHVY7Y5e7A6ZrC/VAA6S2blsDHkL1eJfXZHG0I6s7Yb2GGiuG4AhpTpc3mmUcyZuBv7ItcaqobYDLl48o/kb5c+YZDpl5rR+8MwFNzasENIOJqc0EzR9MB3goUABUiCiMQ8NEcqDZIAFLxq1X4OSIjli+gX9kDJZD3OeCqh7G++RVaQviLviI1vsP40e6w5vlFA7UrMkOFkD3EHblqkY7FOaIzo2siSIcWB9VIwFEzMRZcYxmcm6V731+QhLvImEwpsVkz/OVypXX+9wZTRo64URcYR1qq3GTgx784yRd2KfiUWqk1RKFzLaN0Qlcd+QJ1jz5AZir5UuoZikaJghXctXS+xB31y/MRrWBjIJjQ= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: f9c44877-a9a2-4151-7465-08d9afbd9409 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 02:45:01.9163 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: uiVxgsHg7BunxqgDVKm85/EorxrJxyGvRoRGeY2GDtJ4YY03gsvNSfwsTzYdzqAz4ba0smQgB6FgK13TZAW5AQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4803 X-Proofpoint-GUID: wpNpwC6yhTODY8mQ_nHbzzAZy_CLdDUc X-Proofpoint-ORIG-GUID: wpNpwC6yhTODY8mQ_nHbzzAZy_CLdDUc X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-24_06,2021-11-24_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 mlxlogscore=999 clxscore=1015 impostorscore=0 suspectscore=0 malwarescore=0 spamscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111250012 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 ; Thu, 25 Nov 2021 02:45:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94117 The pyext_PATTERN will add native arch as suffix when cross compiling. For example, on qemuarm64, it is expanded to: pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' which will result in the incorrect library name. root@qemuarm64:~# find /usr/lib/python3.10/ -name tdb\* /usr/lib/python3.10/site-packages/tdb.so /usr/lib/python3.10/site-packages/tdb.cpython-310-x86_64-linux-gnu.so Set pyext_PATTERN to '%s.so' to remove the suffix. After the patch: root@qemuarm64:~# find /usr/lib/python3.10/ -name tdb\* /usr/lib/python3.10/site-packages/tdb.so Signed-off-by: Yi Zhao --- ...-pyext_PATTERN-for-cross-compilation.patch | 42 +++++++++++++++++++ .../recipes-support/libtdb/libtdb_1.4.3.bb | 7 +--- 2 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 meta-networking/recipes-support/libtdb/libtdb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch diff --git a/meta-networking/recipes-support/libtdb/libtdb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtdb/libtdb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 000000000..6f221989f --- /dev/null +++ b/meta-networking/recipes-support/libtdb/libtdb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,42 @@ +From 00bd6680ad38c20c95a35c963d7077269f3a3aa2 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib/python3.10/ -name tdb\* +/usr/lib/python3.10/site-packages/tdb.so +/usr/lib/python3.10/site-packages/tdb.cpython-310-x86_64-linux-gnu.so + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/python3.10/ -name tdb\* +/usr/lib/python3.10/site-packages/tdb.so + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index 7c45a76..c9a90f7 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = dct[x] +- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.17.1 + diff --git a/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb b/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb index ad8459389..e7f738402 100644 --- a/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb +++ b/meta-networking/recipes-support/libtdb/libtdb_1.4.3.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://tools/tdbdump.c;endline=18;md5=b59cd45aa8624578126a8c SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://tdb-Add-configure-options-for-packages.patch \ + file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ " SRC_URI[md5sum] = "e638e8890f743624a754304b3f994f4d" @@ -39,12 +40,6 @@ EXTRA_OECONF += "--disable-rpath \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ " -do_install:append() { - # add this link for cross check python module existence. eg: on x86-64 host, check python module - # under recipe-sysroot which is mips64. - cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s tdb.*.so tdb.so -} - PACKAGES += "tdb-tools python3-tdb" RPROVIDES:${PN}-dbg += "python3-tdb-dbg" From patchwork Thu Nov 25 02:44:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 1263 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 863B5C433FE for ; Thu, 25 Nov 2021 02:45:06 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web09.7320.1637808304906449403 for ; Wed, 24 Nov 2021 18:45:05 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=iO5r6m1P; spf=pass (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=6963faa46c=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AP2fh1J009587 for ; Thu, 25 Nov 2021 02:45:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=cajmjzCqAe8F/GQ+D75DVPQ69o4zV53YlkXLmo6lwU8=; b=iO5r6m1PElLnZN5lLJUjpANJ+tMgCmLwH91iueRd729xSZfZh++xORCB0RMDjgT65+v1 uZy8+EdJRm+2yUMwqQGWSQJ2Rov1vWzxF+fIQJy4InhNwfvJV58k8O8bZYZw7zhZj8S9 1901nHuJEn3wZYLv7Pok8XkBZzrH7nedEZEWZm5wGJtUU1W1eqB+LHHG+kL5igPIA51v BCiRCunWiUIa9O0KqCAq+oc3aCWkFgpvkJQWQFnHA4CtOTgyRXCr5nxZnPccdmVVFJT2 pP52lBZaugZ5CT/44xItbeb1DGaXCI5NbXHR7uD7kboNh37+nE33JPTR2m/Yu+C/YmSf wQ== Received: from nam11-dm6-obe.outbound.protection.outlook.com (mail-dm6nam11lp2177.outbound.protection.outlook.com [104.47.57.177]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3chce58yxf-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Nov 2021 02:45:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c8aloI9BjVJAc7Vaw3NVufqCK02+vXVelULSIVuF2meZpd067qnI79rCZejaoJsS0FJkD1jH+Ku+BAGIZQ9mXmO8+Hb8tvvEcGVmcvZzsrwAVBj+QhUrzTwbVChRyttXRMzFL8BI65NW0fvnozn5qQcBUkHWzGPjvev6QFR7pOxp4OiVr4rn4HEZCEcSGIeFK6wunm/x2Em6xzcKycSHVk4XLBE790goiw7C/jy2Gvu3E0FOlHBHtVWJR55ZnUr38rGb2APDWNPNmSy1RaAfMUua1GDc8Z703TqwlI0gCnXSlnA9JTwNfs2wEsMka2cUOWznUcRIr66QALtA/9BcJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cajmjzCqAe8F/GQ+D75DVPQ69o4zV53YlkXLmo6lwU8=; b=mHRuyTriFXL7B7f0I026q39nV6vR/dQr5roaC4c3e2PqZOUR2tgD/hWwz1q0ozTiV88F7GMrTIclRUXHzZAbdiXjgT97fTZPlfMd9NFLHBHi6WBMl3AQl1K+I76RKbRei2PFAZWfn/NrkEEcFO08f5YquQzQjvOgspGqsjgLB6fcEjy+PbmofVKzNyivGT14oQAsNxb1XJ1rMEwoVExV47Nqo7NzOpC+84TOJqI5DUSBm1CrrQtEhzM0QzZkc0Gh2/xKbdgQpl3qLyq70LiTyfSsTG6KnWWjIn5GY4m9PNarHOtfPEmQgABpqG4PLZBeRrJIK1bADqJWvRvmII0iXw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by CO1PR11MB4803.namprd11.prod.outlook.com (2603:10b6:303:90::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Thu, 25 Nov 2021 02:45:03 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480%9]) with mapi id 15.20.4713.022; Thu, 25 Nov 2021 02:45:03 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 3/7] libtevent: fix pyext_PATTERN for cross compilation Date: Thu, 25 Nov 2021 10:44:46 +0800 Message-Id: <20211125024450.143364-3-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211125024450.143364-1-yi.zhao@windriver.com> References: <20211125024450.143364-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 Received: from pek-yzhao1-d1.wrs.com (60.247.85.82) by HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 02:45:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b56794da-0e36-44c8-18d9-08d9afbd94ab X-MS-TrafficTypeDiagnostic: CO1PR11MB4803: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1775; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gL4GRrAbyDDd9qd/EUlcyW1chsoTLMALBnk3aO2HFB1ZA5aKyMqg3HAs64x0ZMB23/K4g05tQfBTOuajk6U2nm0iOuFo4S37Of3BCeofKRx24/xKzfAsdueJMVBnirM9pgkUw4cT38QbeCWtQG+0m9b8SEQPHvzg45oFlC1y5dqZkFM24tn3hUoVRjLMZ3x2G5kQMnwgueJsBqSiLPNWAVARO6eUcG0Za9Az2gCbbJ66W93QILKPKITUdLdKRCWZvARIXzJkYPXFqSa+UvxlxwJ6o4w/sG+tp0jLs6hhuaFnWROztIdYlbulxlq7tvUXg0izGf1yUn6uXxoT7jL1t4ZC56uQV1IcYwpU5nsKXUkxhk2TRUZ+ZCPmZPn8P6IqxyTEXkIpZXGNbHbIMwwwxNAj1Di3PwN97OaLMq1m7AAYTM0ePFDYQXPmzotTNwrp0GL4d9lHbDvaWIszTiSqnXeBxt3cb4uLgzpwC0aDhFYZW5qmwQnEX0OyifDJQ3+a7HhBm3prl4GUn+jt4YuYKd1Af+7nOet/0j0V0R61iu5gSzjP2B1jXv8VmE7fnqQLYGuHV4TDI2d3V+gGzwCSi3M5R25meWzRNfXvG+OwP4i8RPkmHW1IPFEChrT7a8h0lnWChB+T3CJMRtbRfie0kPpnYJi0t6t1odoqj2xa1/mPVizdxDPwQh+M6O8WxJvyGL2UWXvVIY++KJzFXc/Sf++sp2L4NlL0LPD/SYvnnF5tlLMR9wwSH6K0zfbGfoyFGItbLdI3LeJaYOd+BMzmqX2m3oEnM8fvmFWaRXPa7QI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(44832011)(186003)(6916009)(52116002)(26005)(6512007)(2906002)(5660300002)(6666004)(2616005)(956004)(6506007)(508600001)(66946007)(36756003)(1076003)(66556008)(8676002)(86362001)(38350700002)(38100700002)(66476007)(316002)(6486002)(8936002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: bGa4Ao7cTFs/FT8ShzmQnatk6gbj9POyRQx3QohBa52CSgz2oE//BBJTBKQ+F2uSHwktBIiIfG+v2ZE2W6R4G2WaZyQa8G6T3/U5Uk6zzK7D3JNn+HP+eAT2GOKmt/G1ek5KgUsZAJWhz1C6sQD2ygEtDPF/Exn3mqWj/5BriroyyRjFWqHcu+a8JRpLMe1CdRdOEOwxD3XVsXdBxJW3tITxD3yKtjjyBYBD9JrjAck9bI55IGYmxMskBvbLIDltxvcSxg9HJTI5LEMSyt6bGygX8rjRew787u2RBCIm+Mj2/h1x/YmTd7Vqv+AoByCv0hgl/py3g9cmcyKmA0gCTMGJ7vB83aQ060bNh44L0kWgWM+/nbgFr8ZwSMhp+Fs+GqPA65UzJ6GT3G/mC4D1B7zz2YIypkQ64h/IhrsqXF6paBYTKfwHZPq2BAkgVaoAgpphJTpPsrt8b2FdALhYcHawPj7jr5cEB2FUzzyA+l2spiPyVJ5vRWJds0GEc/3TxEZD8p0hA1QZuxS1ZGKQTI8xAOVbyCSoKCmL44XrHNiIFb5mhxlyai1grd5cb0A66Sl8XCQbVWr0mhQuaJ6z/6N1LQ+lH4yLn5DLEVZS5RsP274fZUBXNFf+AI0T/QsUMoSIsKnLNaYfUD2Fs4br0OcB7/zobEQ22/PM4aPBZMHb+TEq+k7cwBLPSb+JBN/lc0/aLIXGBZQAET5wG7p9zGSLu9+S/HOMUydt26lgl02AavGztAxLXW/IdbMWhbX+EUehtKvxCFpWS02wjIbMdIeKmuD1gQ1U4r6/oiXqRAquEeiXlUwKRO7C6e1gMH3BbsJ7SKN7nfKyLyMF0mxX0DOM0Fi2ZRYpPeRHtYhA9m30ebkwM0emiABJwurdieJAgGRa/ceSkovdi/Vcqh5OuCg3iQ95N87ahQlbiqq+ldbEenw6DsIm84MkBwrnF99OInyztUlzVhxJ6Oqvzox9WcwlFJAYr3GacJs9q7kxMunJWdQ4vOA66br0QY9K4EA76xSWnMC/RjQzBbfWoHBjLR2Icr5U7lQi2jddbkIMMMFIQQKrxDzj6tJtBMwTATGShc7a2NPiNSi0/KVSYGcdAQFRz++vjfbnW1YY7gWPe96ehoFkTudtrEjEu5syeUQqFSLWsq8loyZOOg0gHO/efEFHw8XRZjOAzcmY1lKbsPMGVwr3WMpxZgTaTC3Wv9VsOVScAtcycQKEJJ1LZnDID73ThSc+edWdobfEoxg4YW4SQmb/Da0DrL14jo+gcX3G+OPhooX2e3K3zVoujs436IamYDuoNRem4Vn/wWo4V42alXkn3D+g2i2wlZPdsKnSQ16jLjx2JDEPv6FLfWEW3Gv1XuD/T9x9RXW2trHJ9DzjE3YAxE5wHa3IU+ezuf/wL2B9NMheN+OhpNRVHjQkeaYR6TbHiQ3ETyiNOjuZ9ROEvqOCokIyYJOpjnPdESLIfGg1wO9ccmn9ZCg6aKUytRoPXqCkgE8YqzdHs1gm5X0IVtLWD+FJ3nW7z+Zux66fR2aPTpln1n92fKm71SDrwYXx1YPCjHOErBtY+4e757HfcGNAn3mSFGVLhm+Lja97ncOwcYyk0F9IpEcbVjNsyXRa0QIQ7HQ7jkTP+P5luYU= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: b56794da-0e36-44c8-18d9-08d9afbd94ab X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 02:45:02.9557 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: qa6nI7vaR4f8hGSNt4p9c+PHdrzMfPVUZ/L60NVmkzYUKzRZStIQbRrXIlO9yppBIIuLh8c9lw4jj3D8GRMGeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4803 X-Proofpoint-GUID: dQSUJK5tBSsQfO0nyCbvu2rJ8LlBCoQZ X-Proofpoint-ORIG-GUID: dQSUJK5tBSsQfO0nyCbvu2rJ8LlBCoQZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-24_06,2021-11-24_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 mlxlogscore=999 clxscore=1015 impostorscore=0 suspectscore=0 malwarescore=0 spamscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111250012 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 ; Thu, 25 Nov 2021 02:45:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94118 The pyext_PATTERN will add native arch as suffix when cross compiling. For example, on qemuarm64, it is expanded to: pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' which will result in the incorrect library name. root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so /usr/lib/python3.10/site-packages/_tevent.cpython-310-x86_64-linux-gnu.so /usr/lib/python3.10/site-packages/_tevent.so Set pyext_PATTERN to '%s.so' to remove the suffix. After the patch: root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so /usr/lib/python3.10/site-packages/_tevent.so Signed-off-by: Yi Zhao --- ...-pyext_PATTERN-for-cross-compilation.patch | 42 +++++++++++++++++++ .../libtevent/libtevent_0.10.2.bb | 6 +-- 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 meta-networking/recipes-support/libtevent/libtevent/0001-Fix-pyext_PATTERN-for-cross-compilation.patch diff --git a/meta-networking/recipes-support/libtevent/libtevent/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libtevent/libtevent/0001-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 000000000..81abac83a --- /dev/null +++ b/meta-networking/recipes-support/libtevent/libtevent/0001-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,42 @@ +From 96ddbe6653f87670e4a0bbff229276bbe0aa822a Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so +/usr/lib/python3.10/site-packages/_tevent.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/_tevent.so + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/python3.10/ -name \*tevent\*.so +/usr/lib/python3.10/site-packages/_tevent.so + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index 7c45a76..c9a90f7 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = dct[x] +- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.17.1 + diff --git a/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb b/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb index 5d7e1a0d6..78c092095 100644 --- a/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb +++ b/meta-networking/recipes-support/libtevent/libtevent_0.10.2.bb @@ -9,6 +9,7 @@ RDEPENDS:python3-tevent = "python3" SRC_URI = "https://samba.org/ftp/tevent/tevent-${PV}.tar.gz \ file://options-0.10.0.patch \ file://0001-libtevent-fix-musl-libc-compile-error.patch \ + file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ " LIC_FILES_CHKSUM = "file://tevent.h;endline=26;md5=4e458d658cb25e21efc16f720e78b85a" @@ -42,11 +43,6 @@ EXTRA_OECONF += "--disable-rpath \ --with-libiconv=${STAGING_DIR_HOST}${prefix}\ --without-gettext \ " -do_install:append() { - # add this link for cross check python module existence. eg: on x86-64 host, check python module - # under recipe-sysroot which is mips64. - cd ${D}${PYTHON_SITEPACKAGES_DIR}; ln -s _tevent.*.so _tevent.so -} PACKAGES += "python3-tevent" From patchwork Thu Nov 25 02:44:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 1265 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 69B15C433F5 for ; Thu, 25 Nov 2021 02:45:10 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web08.7493.1637808309928347333 for ; Wed, 24 Nov 2021 18:45:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=bdA/fifz; spf=pass (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=6963faa46c=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AP2iirj012422 for ; Wed, 24 Nov 2021 18:45:07 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=HkpwtJjYwyyOfvIbngurLPrIovQ+qPz1apRxQ5uFVVw=; b=bdA/fifz4Mvu8U9KJgpXV3qzWfvjTCnwM+Rlc/SxYbKi7xGEz1CNgtJxmV3HDjZ7rBl5 CHV0qy8OIdkPFQBb+Hqpg9NoWuAjWRJmXrZI1bI8jV6/WaCV2Ebd5tbtrKj7VQ0drIEd +zsLZf9NixegVdS6iSnS7fEYtl/24TzaCtwg5pF5JzxqpcQ9QLPvgXGFdeDz9x8hBd0d gsoA1aINSMUJ3LuJ3Wk9c99YkLfZ+uL3AF1WY52mhKpraUEAFu0KlMTY9Ma3vaoETnNj j2w0iwWApFO8j4iPBfx0AvR9FECFfp0IdcXVs4ex/i9hb8KR9iLx/qFcecfZ+xnDIRCd Hw== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2106.outbound.protection.outlook.com [104.47.70.106]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3chbbv1094-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 24 Nov 2021 18:45:07 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EN2+obBBwG9K/uaN06DYpv7pZoLoGnuH1phtxcqFe6V55ZIMO58ugcp5IFGOLuT/C2NjB9xjkIctLzdFg5PMcLEXEIjeKCXRzqkFs1l8FLbYldAAJ49Uewet+2XNX+liPcdvd09aIch/nVQNJ8z6bH2sdhO4rV18a2I8JOgheIu9kU/RyWkQ5pxCNd94SE3/9AIvzny7VCcYz5GQNxEr7b9pFAxPwdJYOHlMJsKJTXKWwWyTqCiB+C+AgioTOaAexhezUeS4qZx6o1ZeCTrkhQXT5NW8wMoj7tTHEKCx8MgOXuYHthNU9rQqgIB8N02HJlu3cVFaytws7iUWLR8sQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HkpwtJjYwyyOfvIbngurLPrIovQ+qPz1apRxQ5uFVVw=; b=WN2enEQcESHRq8hJixqmX1RpPAUjAsgFwfG+KII6bG5GZqshN4z3WPi9qYuuuJtz2joLOoCGM0xmX49MUy6coCCm0Oc29OsyxwtOdza99ZrFc51Qys0NZ/GEX+aZUReZPrYfA0DTWZU5Nbor4v0h2r8kq1++GOJO3BpIE1gtk8QANjbWhLTjuG58VlD0LZYpbjVmRse3rPTWiAvQ0lTUfr4VMOPBCdo9N4AWQDs/25Tgiv6JNfiUwf7e1Vz/fISkDC6OBdO+o+b+2UC92gBcQCfld4lNYtYKdwfx/ulNsKHsi7SB/PS3n8yHbOfyxj00FdYjMOTmCwPTfMJ/vLEvWA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by MWHPR1101MB2189.namprd11.prod.outlook.com (2603:10b6:301:51::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.26; Thu, 25 Nov 2021 02:45:04 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480%9]) with mapi id 15.20.4713.022; Thu, 25 Nov 2021 02:45:04 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 4/7] libldb: fix pyext_PATTERN for cross compilation Date: Thu, 25 Nov 2021 10:44:47 +0800 Message-Id: <20211125024450.143364-4-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211125024450.143364-1-yi.zhao@windriver.com> References: <20211125024450.143364-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 Received: from pek-yzhao1-d1.wrs.com (60.247.85.82) by HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 02:45:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 540ab603-d5e4-4958-9cc1-08d9afbd954a X-MS-TrafficTypeDiagnostic: MWHPR1101MB2189: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1388; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d2qfvzq02j+Qt1IycFdIkdasuACUJrmZNBaZZ2k5CEYKHGC7EiHLACQoFzCYeqxF6m3ZDUW5xVvq2FHXowEaLX2W+LUiXfXtaH8HmIjto+jUJyGlyv/olh2E/8UlB20SDwi6SPNfH89a7H8n4KBWP/BtPYXwg8xUrQ/BUoLo9ob7wayd6pfW7IcGpLz/IT46YR9NxovMGM4swFLtvk1ou2l5lmELUOYSNCQMsH5rfWPuAXqt+8Q9G/AKt7MvVjrfmsK3cBBEpxZsuHhhlPIj9Z7S2HCqX5M81kQ+VTqrzRvBMixtBd5EC4J3p411iRzH+t6pCjBay0oat+291xRjP5pmWnN5NqGKchc4ksZYV+fuUDIqxA4Jw7W7TIaPCJUK9JuWYc3zRQzdr2gXXrlnK8mlCZ3N6v82GvJ82DW8Q2vLbMfF0D+cawqJGrPuqO/3mH8nG8UORDdV7IYawfXtGOZJylWJIlQweRXYaMnRwF6XLt0PcbO7awZSUK7YY+Tu7RJEzPbps1UW5f4iUMOn4io75DjSHs+d3g7SVZnnf8SUVcqwWuJDHnr+O4T9bc9NBR4j+gSOc3q/S+G52Eq7/Fv/l973TMpu/Fwm/YDAyp0V10c+tNToJ5E3ir9SE/tpGut5vfCnnWhIrH6gcLASGjFDJmXOGWN9uaHZ8W3V/y5qKW8jWgIYCiWLR6w/sUY9ZKPnzHLJRokdR8A6K1LE376OQwp292YFJYbuuGnYiji+aQjvKUN8QqOkop9PC+PtlMxK3vl2VWY3u0A50uwLhyr/GFKR1guef5G6c6mwSqM= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(86362001)(316002)(38350700002)(66476007)(8936002)(66556008)(38100700002)(52116002)(2616005)(1076003)(6506007)(186003)(66946007)(44832011)(508600001)(6916009)(2906002)(6486002)(36756003)(8676002)(5660300002)(26005)(83380400001)(6512007)(6666004)(956004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qZlXAW8+yLA+KdQdPu4PUc0WaXKv8xXZDOisD6RGzAE4YzDd3qLdG130ZM5trfZEJD1ubNw8jSnb/2/zVL/vnf+vGdCCXjYhxN++ceQf1KNZ7Xzn1xPzHiroEj5ZQjdzjfInvjvUkKDsrHyG/ZQGZXut36gEGkJVt39UVlfOVFWHuMPSjjRNo9ZL56KE6r7blsJ/4/loDDXV+DGEOfUIKnoyAPU79qy0VAO3J5BwbaIg4oc4UqB40h+9o0maHzO7g8yClkRGa3nDfK7DlymvtszgKlU1c0RW/Ta+M+cV0/AJz13JV6m4KLlF09xWgNz326BhhyWaEUVAUp/ygmaePUeO/Vnft/Kqj0QQu4bTVY/pnf3QEUQBRpnXyLh3pwtad74M3edILdoBHs8XNL0tQVaEtTzF9ne7JW4JOLCF1pNEijDHXoG3mxkPcMZ1B0Xv2AmUch7xfSzHfDewIHSelSHeDAd7AoL8KeFms1tkoUqrUlsqvtCaFtQTCDGIKu87LkR8PsI+gPT9/nrQQB3L7bKWgMQtwx125RrXX3ztl+CRqB8GHwc2Fu8EIPhBns3mB2Ft45lXmIL/sGzv7u35gjgyWqGzN3YK+oKfKnzIvcrAjEkzotlMHNLS09JUd7scoUyfxfy+7pj9O4gDGZSThBuNxRhcKPR5lrSqa1c5096iTLfYxpyqLAQOMWj0Vzj+VY9svZ9yOxJZuQgx+PRGGuQKENUAOs9NLauCS7PGfbSSmUQ+UKMUwBmKX5+UbovUaGr5mvtwEMDaREm6mTfRy+6iwmt/dB25aejxC/R71+vWAWFuAtKTDS5Ta3FDxd2iztUK7jHyqKoQq5yPiVLw+vEyixGdhQy2S1qs/QnI6kgLzo3XzPygDdTaca/5S+0zbdKVQazAd41AXVTvmseH6JRwHziXkHyYHwyFMKsj4Zw1pVTBqgwVo55BIEmNvOSvUdZHt2ta96uPTdjm8uIktJNmBwF2GdvNXXBOncwXu3IrrqEebItixtYqaj/Zw6o+fx+Fz/cKdR5/pzGgXAjPoP3nvammKFQuNVBgO2n+jBVFcvZcfagQGw9/aTQViyNZQA4EBztDOdpgR8uKonhlOM/uH8Pb8RNkWGoGmsWOI8WsL40XCV1XWX8F2th7kqdjLNCSXKiK5+LPiP/KFNJG4Ty7Hi+3MOoqzswfB1gSaqY7H3arkoLTpcNv4g8+vNCCGw6fpe7hwV+wiCQ/WXQ6OeYCQg/YR0RK/00EaStchHdxkkaxzwEKsnj/E/va/YjGOLo4t7wEANWMxHl8HwrSM9vskdPepT92in0ae+nltZzn84N/8/XngvF8V2mCULGZur3gbWybssEtzb7SgGdsqM0am593a9150gQYb8BArW9g+vIjL6n5YpMGuniKi+B3lTe94j4EPueXDLJRPzJNhVO8/jYb9gd2eM7EoOg4ehw1E7lOnES7GdtcONH6V2IpxvvIH82A7LPBRsPtD7m3z27JXfJUVNRX3MRoNUGUEfTqD679K+bCt8zh7rv/pSuhElc0YS3YE6NRAohDDciS9sPqjqEPPNe1F1V6APIcBJkpd0o0CtTxwU8T8cF4MqWEed44E/Wze3roEUPe6GJ8+NOYRzSFV8yyzyCfDJUq3HY= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 540ab603-d5e4-4958-9cc1-08d9afbd954a X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 02:45:03.9772 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: OniS3nkV2DgSigk4rrBWT7TgkBKJK3c2bpqgNB2dZZd92mqzFuJoPtaQFEkt/drPbKAsbn5CI/8255zHyJCnxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2189 X-Proofpoint-GUID: 0GzwsXIY_pOwLOUaALxp7LOk8X9ERLnW X-Proofpoint-ORIG-GUID: 0GzwsXIY_pOwLOUaALxp7LOk8X9ERLnW X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-24_06,2021-11-24_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 lowpriorityscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111250012 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 ; Thu, 25 Nov 2021 02:45:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94119 The pyext_PATTERN will add native arch as suffix when cross compiling. For example, on qemuarm64, it is expanded to: pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' which will result in the incorrect library name. root@qemuarm64:~# find /usr/lib/ -name \*ldb\* /usr/lib/pkgconfig/pyldb-util.cpython-310-x86_64-linux-gnu.pc /usr/lib/pkgconfig/ldb.pc /usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2.3.2 /usr/lib/libldb.so.2.3.2 /usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2 /usr/lib/libldb.so /usr/lib/libldb.so.2 /usr/lib/python3.10/site-packages/_ldb_text.py /usr/lib/python3.10/site-packages/ldb.cpython-310-x86_64-linux-gnu.so /usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so Set pyext_PATTERN to '%s.so' to remove the suffix. After the patch: root@qemuarm64:~# find /usr/lib/ -name \*ldb\* /usr/lib/pkgconfig/pyldb-util.pc /usr/lib/pkgconfig/ldb.pc /usr/lib/libpyldb-util.so.2.3.2 /usr/lib/libldb.so.2.3.2 /usr/lib/libpyldb-util.so.2 /usr/lib/libldb.so /usr/lib/libldb.so.2 /usr/lib/python3.10/site-packages/_ldb_text.py /usr/lib/python3.10/site-packages/ldb.so /usr/lib/libpyldb-util.so Signed-off-by: Yi Zhao --- ...-pyext_PATTERN-for-cross-compilation.patch | 59 +++++++++++++++++++ .../recipes-support/libldb/libldb_2.3.2.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta-networking/recipes-support/libldb/libldb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch diff --git a/meta-networking/recipes-support/libldb/libldb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-support/libldb/libldb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 000000000..382a19ced --- /dev/null +++ b/meta-networking/recipes-support/libldb/libldb/0001-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,59 @@ +From c67c7cee024150fcbdca18764a026aed8724d7ae Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib/ -name \*ldb\* +/usr/lib/pkgconfig/pyldb-util.cpython-310-x86_64-linux-gnu.pc +/usr/lib/pkgconfig/ldb.pc +/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2.3.2 +/usr/lib/libldb.so.2.3.2 +/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so.2 +/usr/lib/libldb.so +/usr/lib/libldb.so.2 +/usr/lib/python3.10/site-packages/_ldb_text.py +/usr/lib/python3.10/site-packages/ldb.cpython-310-x86_64-linux-gnu.so +/usr/lib/libpyldb-util.cpython-310-x86-64-linux-gnu.so + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/ -name \*ldb\* +/usr/lib/pkgconfig/pyldb-util.pc +/usr/lib/pkgconfig/ldb.pc +/usr/lib/libpyldb-util.so.2.3.2 +/usr/lib/libldb.so.2.3.2 +/usr/lib/libpyldb-util.so.2 +/usr/lib/libldb.so +/usr/lib/libldb.so.2 +/usr/lib/python3.10/site-packages/_ldb_text.py +/usr/lib/python3.10/site-packages/ldb.so +/usr/lib/libpyldb-util.so + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index b1c8dd0..24faa31 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = dct[x] +- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.17.1 + diff --git a/meta-networking/recipes-support/libldb/libldb_2.3.2.bb b/meta-networking/recipes-support/libldb/libldb_2.3.2.bb index 3f7ed36d3..d26acea40 100644 --- a/meta-networking/recipes-support/libldb/libldb_2.3.2.bb +++ b/meta-networking/recipes-support/libldb/libldb_2.3.2.bb @@ -9,6 +9,7 @@ RDEPENDS:pyldb += "python3" SRC_URI = "http://samba.org/ftp/ldb/ldb-${PV}.tar.gz \ file://0001-do-not-import-target-module-while-cross-compile.patch \ file://0002-ldb-Add-configure-options-for-packages.patch \ + file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ file://libldb-fix-musl-libc-conflict-type-error.patch \ " From patchwork Thu Nov 25 02:44:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 1266 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 73AE3C4332F for ; Thu, 25 Nov 2021 02:45:10 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web10.7546.1637808309928916294 for ; Wed, 24 Nov 2021 18:45:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=rCFEM8Q2; spf=pass (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=6963faa46c=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AP2iirk012422 for ; Wed, 24 Nov 2021 18:45:08 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=lkR/DM+i3LwXXCNozBgxOLWxUHgZwFEhs+JGuC0j5VE=; b=rCFEM8Q2+8gwCu8v04s1Md+Lw/wTRaSJgOEqLWXOJ4C4nOxWqaC9v0WE4LB67Ev5KyWl Zm68vrHZThSmgv5DQQ9gXpF3kygp24W0vihby8gHhG1LvfoEbrUPdLh7MX6Z8Edju0EH iVqVh+A9GUBRapvbnIZgC45utuvD7OH/4OMPtjddiJKhekP/WMsWpRmsdew20oiuxren X+G/U5k/Bq+fCltT4MaA97DHgKns8ruqi1XG2pZMf541uUvpHgFGj6IRE957eozhjp4N C1/8tw2Za94rBzgLx54iQS5fVdRvPX/fQvMK6oOhyZ+uwSAQO7JEklGG+Zyg/S9JZ/gH ew== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2106.outbound.protection.outlook.com [104.47.70.106]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3chbbv1094-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 24 Nov 2021 18:45:07 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uo8h345Ye/QlFMDSRdtQSl8CiXBswZXTn5vgl3y/azOB7AkKUGUcMS2nLeH9XHStz3CmF9JUKGMaE1VHAh1mutcYLsxAkiTnyWf8w/u5SWtauTVKn0uheXzlfDZ6B3DMpVC3Vo41SGohtl9AJGTR1dsbPkYYiMW3mhLNsrMhWx6PtZg+lfu4BAiLL6mtnqnsTmp2q3wQeFVrJgM3WU5/4iejS6M7RSdP9wia5HADgQ4wjfS4cLT4cq4gM0oqZX0PjYc2pFF9QiDD8JR51H6ELww6+tvnfIW23nHIksq72U0VFbiismcjsmPgRxIE4ZhLmIKaM9SbfoKi2qbv+p/umg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lkR/DM+i3LwXXCNozBgxOLWxUHgZwFEhs+JGuC0j5VE=; b=kNMOVv+92M5ZFkAo9srbMWaDIJMjFtT4oK/3B5pCghVRr+CDrstVUDb8hJHZmrbcc/E+RzXyW1Vuelludb8ABeC0nSGsjYfqNJbqJPIWywkXvRjSRD+ZMy/ZaV3v6Ka8DJSdfTEz2l36l4DqbgbMa+yQAqo3Mxse8b+jn9yeOiMCg7ar5ofzl8ggylb5gkBucTVy3YTFY1TjCubAD7tJgEucd1Jya9iCeZAn68qUoHX78Z6v0+9TnVOK5n9UjX5IRudGeB15R1Une6Ik8rsqLmIWRzIDjDezX5c9ZcefhdmgfL2vx2kebuKv86fUYYmsFWfWxcP15dhRtMPN8iYz+g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by MWHPR1101MB2189.namprd11.prod.outlook.com (2603:10b6:301:51::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.26; Thu, 25 Nov 2021 02:45:05 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480%9]) with mapi id 15.20.4713.022; Thu, 25 Nov 2021 02:45:05 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 5/7] samba: fix pyext_PATTERN for cross compilation Date: Thu, 25 Nov 2021 10:44:48 +0800 Message-Id: <20211125024450.143364-5-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211125024450.143364-1-yi.zhao@windriver.com> References: <20211125024450.143364-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 Received: from pek-yzhao1-d1.wrs.com (60.247.85.82) by HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 02:45:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62204f69-796c-4069-b8da-08d9afbd95e5 X-MS-TrafficTypeDiagnostic: MWHPR1101MB2189: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1388; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jPS1YldQnnAprlOnbgmjQK8C9ElunSutTYZoJk6YsBAYW3R7a8KOpF2NgadFIh8O/nLQIFCdZzrcdIc94cSgw+MJHPDxrYsVM6JkG7/TBIdNkutegsaKyYjWzPzP8akrKWOMbPpc9OQ0JmfOKIJiV+3YMfuuW+c/AU3GMaX9KjvnQhFSMibp4jImUQj18yZI7088YRYQIDYCpYtCUuyqxgK1oXqitrG3lldhNMZZzd4ZEX/wZWtATWoXbZ9kFvuEthzVUYoBBe7sUTcJiOnDE4dYERJeDYNaKRx/5KVGN/baoN7i7LY+s6Jo/gow+uAIA5SXvmXsavFqrmIY0HsyShZKsmX9rB0YZXpH3kCjjD/Rfa0mdlv5JVu3cnfn0nVPa8zxXkbZEOHqIamGLJOw0J6BKR6fvuvvAEmdM0UYds9UQ7njzXMmZL3d9NonYJG66eIHKtaB71RLh+AA7aTEDUjJYVMiz8NzQtuheAZBgAPBmbMscHAuZ6Q3xSIVI1r4mH0z36a2iKFuUyrIUmI/6pHQK0foOEQvklwKR/JrBiBdA8JIWokUqN2FjguvIW9+iPwbnGRuLlI0C19mb5teMWvHiz0Eczt4LdukKSOpLqSI65HT2WSGnCS13DSPNqm129XJyjalsi30TjhsoxKycR0Dd09Y5bpMcoE4FLAQqHXE+8wI4SbjjHubWxZkoleO+Qs+sr4dxjP3sHjBZCUwcw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(86362001)(316002)(38350700002)(66476007)(8936002)(66556008)(38100700002)(52116002)(2616005)(1076003)(6506007)(186003)(66946007)(44832011)(508600001)(6916009)(2906002)(6486002)(36756003)(8676002)(5660300002)(26005)(83380400001)(6512007)(6666004)(956004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pqrlc16/p22725gt5YalJSapJ80GlTqSBRVDz443g2vS00BdZvX0dvx29R57hppRtYdtNPZMdqVnxq2yUCEqRN8Iw7QYWAcLsIgCd5oLW+BxUq/0sQhJPxT5NZt3kGIkQ4nuyVwwlBZ79+C4GeATsITqVYnJvcEXHWwsNjimKI6T6PB+gtTG7pN8wUGf1c3gC/wCBqtwQfwlEMjhpr8Vl77TMAsKcsvCGI6IM6OfCknSL7Iva4I/9wIcAyirooBqvkOqyQD35wvgTNWnRKwltLt9yAxUE3niVw5uEBWi8A2Z13+/qF+QAGeVu7gGbrqeM+5FhTVHo6dbJEG8yyN8nWgvlLbdib3TqOscs2c9p4eXCxHev9i3gH2273gvFZeub9Dh0Um81DwgBq8+F4BMlbN8xw47pChgK7P9upx3cAI2sDwO8fTQDrJxRago7VvqrtOh4ZjQKb31dEw9RRmQAvwo166eUJItPDDhl5XHkhdG0HIFfidMPs6XTzX0fN+t7lJy6hTXx9yjEMglSq23W8zPJiVI0r7Wd3qRYdC+2wUUt8uin89cL3fYAS5PvAozz1E38+2UOWaAZjxpMvy3SHaCtrBdIMiRudvFMFVzC5hqCgCZSVsvk3ZjBzw4asn8yi1a0jyFBCyCcWdVjAKE1RRGJaFOshwZxFE33NOflVFSE1sRGmD2B+WSI/+cEbEpRnxij61Y8z7ZnU2glrvSRQmZq3ZluTxDnTkPR18/hA+LE3TAAvISu27ix4+su9SMwdMdpyQ85eVjpoZ2n0tFWhaWEFk433pewhpaGnb3yLJuPRo7plaHwMoDZsp31M7yK6yXxr8m86lDU7Y1yWK8rSeKr+ZNx7OWktn/gdK0X06KPOT6mZlv6MuLnA1hdclS2gEDgOuIulkr8/bqnErY8HWgK7oKQpmnBe87wPqdNsgnUHQN8PGsRhZrFhJ3qIbUjJY3Fy+kZISb0t91qQvuR8D0qDEm+BTi95cHEW6vhslEqQnbk6lHcBAFCnxWQkZdWyU0VkhD99TZIkEUy17gn/9HFd39kA2uj6WxLhUNxGkaB88SIhsttz+7m7NqbaEwz4fNFggaz6j0lyUZdOIVCF2XKflBmBBOeGy7iUgVUhFtCy/U1+I/aG9PGaEnuil0DnQePHCaV3qjha5cQhSvMmAqoz+UuqV6TPi86AnCH/3U/w1jzxYmv18qb9EWtFeR7Hx4ZKIjGjnt40+mod3AmeZUSZ9IG/OfA4jy01pdy6Xxa3a9Pq2uO+QiHrcveHoW2LlJrbfCtS2uEn0eFeJZUk7Qk1wBd7kb+2JRZCkiLew/0NNM0BUf3GIu3oHJuF2eBlt/eDUfdRoAQ2jmHvBdV7VAo9w+Vmle2TaPhAsN7lHxxq4F3qWG6mMTNsJnwLm2bEr7u1LGo6YulE8YmAMCRzJBPidOJjt/QaAQyyrc5dX2ZRXEi9YKsYHc6rCvecUU/gwKJubO35VED+eNxB9gGtXMLm+TBAFn0OHRTiQZB1lQgao8tVqKcQlY1OWuxEvKo46gF/FfVJXt+c0XPLthnV31iCjmkZxRnS2wsnqFA2L5s66feGmaVEpN6DknwuTOusCrdHhuKu28U2zsJsVhERIsdGyo2mr8Olo1v2/bhAI= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62204f69-796c-4069-b8da-08d9afbd95e5 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 02:45:05.3512 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: NwoiOacARQGBAuhNF2glk9ZfsovANCuFj1GnZE8oeKnh27aLZSwgoU/uJkbBbJ8TS9WOELBgRF+wqAF883p1lQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2189 X-Proofpoint-GUID: G2KsUse80bw1OV51B6A01fOeTRvdhpIJ X-Proofpoint-ORIG-GUID: G2KsUse80bw1OV51B6A01fOeTRvdhpIJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-24_06,2021-11-24_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 lowpriorityscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111250012 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 ; Thu, 25 Nov 2021 02:45:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94120 The pyext_PATTERN will add native arch as suffix when cross compiling. For example, on qemuarm64, it is expanded to: pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' which will result in the incorrect library name. root@qemuarm64:~# find /usr/lib -name \*cpython\* /usr/lib/pkgconfig/samba-policy.cpython-310-x86_64-linux-gnu.pc /usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so /usr/lib/samba/libsamba-python.cpython-310-x86-64-linux-gnu-samba4.so /usr/lib/samba/libsamba-net.cpython-310-x86-64-linux-gnu-samba4.so /usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0 /usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0.0.1 /usr/lib/python3.10/site-packages/samba/dsdb_dns.cpython-310-x86_64-linux-gnu.so /usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-x86_64-linux-gnu.so /usr/lib/python3.10/site-packages/samba/xattr_tdb.cpython-310-x86_64-linux-gnu.so /usr/lib/python3.10/site-packages/samba/_ldb.cpython-310-x86_64-linux-gnu.so /usr/lib/python3.10/site-packages/samba/gensec.cpython-310-x86_64-linux-gnu.so [snip] Set pyext_PATTERN to '%s.so' to remove the suffix. After the patch: root@qemuarm64:~# find /usr/lib/ /usr/lib/pkgconfig/samba-policy.pc /usr/lib/libsamba-policy.so /usr/lib/samba/libsamba-python-samba4.so /usr/lib/samba/libsamba-net-samba4.so /usr/lib/libsamba-policy.so.0 /usr/lib/libsamba-policy.so.0.0.1 /usr/lib/python3.10/site-packages/samba/dsdb_dns.so /usr/lib/python3.10/site-packages/samba/dsdb.so /usr/lib/python3.10/site-packages/samba/xattr_tdb.so /usr/lib/python3.10/site-packages/samba/_ldb.so /usr/lib/python3.10/site-packages/samba/gensec.so [snip] Signed-off-by: Yi Zhao --- ...-pyext_PATTERN-for-cross-compilation.patch | 63 +++++++++++++++++++ .../samba/samba_4.14.10.bb | 1 + 2 files changed, 64 insertions(+) create mode 100644 meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch diff --git a/meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch b/meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch new file mode 100644 index 000000000..d497dd32c --- /dev/null +++ b/meta-networking/recipes-connectivity/samba/samba/0001-Fix-pyext_PATTERN-for-cross-compilation.patch @@ -0,0 +1,63 @@ +From a0547cacaddcb2fbef1fb9991c5ad522226e6817 Mon Sep 17 00:00:00 2001 +From: Yi Zhao +Date: Wed, 24 Nov 2021 13:33:35 +0800 +Subject: [PATCH] Fix pyext_PATTERN for cross compilation + +The pyext_PATTERN will add native arch as suffix when cross compiling. +For example, on qemuarm64, it is expanded to: +pyext_PATTERN ='%s.cpython-310-x86_64-linux-gnu.so' +which will result in the incorrect library name. + +root@qemuarm64:~# find /usr/lib -name \*cpython\* +/usr/lib/pkgconfig/samba-policy.cpython-310-x86_64-linux-gnu.pc +/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so +/usr/lib/samba/libsamba-python.cpython-310-x86-64-linux-gnu-samba4.so +/usr/lib/samba/libsamba-net.cpython-310-x86-64-linux-gnu-samba4.so +/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0 +/usr/lib/libsamba-policy.cpython-310-x86-64-linux-gnu.so.0.0.1 +/usr/lib/python3.10/site-packages/samba/dsdb_dns.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/dsdb.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/xattr_tdb.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/_ldb.cpython-310-x86_64-linux-gnu.so +/usr/lib/python3.10/site-packages/samba/gensec.cpython-310-x86_64-linux-gnu.so +[snip] + +Set pyext_PATTERN to '%s.so' to remove the suffix. +After the patch: +root@qemuarm64:~# find /usr/lib/ +/usr/lib/pkgconfig/samba-policy.pc +/usr/lib/libsamba-policy.so +/usr/lib/samba/libsamba-python-samba4.so +/usr/lib/samba/libsamba-net-samba4.so +/usr/lib/libsamba-policy.so.0 +/usr/lib/libsamba-policy.so.0.0.1 +/usr/lib/python3.10/site-packages/samba/dsdb_dns.so +/usr/lib/python3.10/site-packages/samba/dsdb.so +/usr/lib/python3.10/site-packages/samba/xattr_tdb.so +/usr/lib/python3.10/site-packages/samba/_ldb.so +/usr/lib/python3.10/site-packages/samba/gensec.so +[snip] + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao +--- + third_party/waf/waflib/Tools/python.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/waf/waflib/Tools/python.py b/third_party/waf/waflib/Tools/python.py +index b1c8dd0..24faa31 100644 +--- a/third_party/waf/waflib/Tools/python.py ++++ b/third_party/waf/waflib/Tools/python.py +@@ -328,7 +328,7 @@ def check_python_headers(conf, features='pyembed pyext'): + x = 'MACOSX_DEPLOYMENT_TARGET' + if dct[x]: + env[x] = conf.environ[x] = dct[x] +- env.pyext_PATTERN = '%s' + dct['SO'] # not a mistake ++ env.pyext_PATTERN = '%s.so' + + + # Try to get pythonX.Y-config +-- +2.17.1 + diff --git a/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb b/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb index c1c393738..af0795458 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb @@ -24,6 +24,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0007-wscript_configure_system_gnutls-disable-check-gnutls.patch \ file://0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch \ file://0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch \ + file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ " SRC_URI:append:libc-musl = " \ From patchwork Thu Nov 25 02:44:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 1264 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 6DA24C433EF for ; Thu, 25 Nov 2021 02:45:10 +0000 (UTC) Received: from mx0a-0064b401.pphosted.com (mx0a-0064b401.pphosted.com [205.220.166.238]) by mx.groups.io with SMTP id smtpd.web11.7343.1637808309930100350 for ; Wed, 24 Nov 2021 18:45:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=A/mKEEf3; spf=pass (domain: windriver.com, ip: 205.220.166.238, mailfrom: prvs=6963faa46c=yi.zhao@windriver.com) Received: from pps.filterd (m0250810.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AP2iirl012422 for ; Wed, 24 Nov 2021 18:45:08 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=3H271Ps15amoph5PlfF3WCDBTBSG/yamYiFXQaugcCw=; b=A/mKEEf3RL6vZqxhJGT64UlweYNcz0KHMYBiTxwCEI+Z3z5pN80p4Rk2zlv6CY6Mtvqx u/Wj+fHY5w/JkMpaROLuHxqCvUBfr5TYVt6o2jKqX/XOrEJ5+G769YiRJP59ffC4TRMm VcKAxlNZRLoC9xN8N/nYvgrytZCsMqK7/8LVnNVlSJFd0JL51isvHXjxcAS0vIlUinR/ HjXNiGh4dXujWXqzU3T+cNtQI4xS81VabdHn69v9JYxryQJdnv6CQtMGs8bA0fLPWFYY YhuvFG3mfvtTHJPhGLhM3tWGIkaGwztC1Ctd5uN/g+AjphW75MtlbHJiOe7NNZqeC5MK xQ== Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2106.outbound.protection.outlook.com [104.47.70.106]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3chbbv1094-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 24 Nov 2021 18:45:08 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iluJFlZhfgFfQ4bmVL7TbjLFIxVl2epGAJcAmRuO09PdSgqgvKKOdOADsqgzkTE/rRHOG/fk+NtF1YZhsIFMsOSd++A0tVUVOTdCY+EerepGdkOMYy8Igc3i+XweaBzKn0ltaiidv0MmRBaDyMQZR6t1ojOLmabxU1ZJqraKFRbVzBLvveGelkp5/kxNRfoIeZ3cF3W2E5O/5m+D7F/MTyZiBa9HfrXbCQABDPCe5AQOP79Vs+b4O0Ia/agLqNpP6YqPdR+RsNk4dJr4zUdxqprHYDID3OggmVn6r5qNKzumV2mp0EsFe+8pZ2e00dJnC9m0JlanaFYqKSvg5aBtJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3H271Ps15amoph5PlfF3WCDBTBSG/yamYiFXQaugcCw=; b=RfpTHADA9RRVS8shDlHEkT+CowYGRZ5Dn3RghQ3DjdqEfWe2zM9uBzNwwiyN/C6HL4Tj+fVf5U/+4zDOh3JBCd1FwXJCQWJaLX3SaKcW2G6lGgaeEF06SxwO4lcqRrh5q0f9hcQwZOnjbyOg+fzlDCPaWxkUn/5rRJoLitBF0NAxCsBLwfVgd2verfvCqSfFPHypMlJLZXTTURDkWzDEgOhwrqRKpMWM5TboddcyP5+Vwz1sQ7fxG5thM0dsJSjWAGnidGemOA+h1ckDShRYu/SbI4GMtsAYEM81LsYSQQz1UUK1c8NGYjHOLNMOj1gTM68t75/zMZrIMVYcKOY1kw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by MWHPR1101MB2189.namprd11.prod.outlook.com (2603:10b6:301:51::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.26; Thu, 25 Nov 2021 02:45:06 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480%9]) with mapi id 15.20.4713.022; Thu, 25 Nov 2021 02:45:06 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 6/7] samba: add pyldb to rdepends for samba-python3 Date: Thu, 25 Nov 2021 10:44:49 +0800 Message-Id: <20211125024450.143364-6-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211125024450.143364-1-yi.zhao@windriver.com> References: <20211125024450.143364-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 Received: from pek-yzhao1-d1.wrs.com (60.247.85.82) by HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 02:45:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6f5b3b8e-bca5-4f9e-c36b-08d9afbd96b6 X-MS-TrafficTypeDiagnostic: MWHPR1101MB2189: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1002; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pu34xKH6tI++ivLXoKIyAopPaEFGjbyLFYZXiCd+c41yR+x+D6LdiEY+5QvQrK0CUsi4QBaLO6F25GIMUmtk2z90WEmTRc0qLpkXMzVgZSWJY/R75hfb9n4XfTAUYy9LF/I/WFrYRBgUxrA1ATC8mjKlgorsNV8fwf30AkDOxPeQNP/TBWtCChiF8fVi5yw5DejxirZBLIyZiSdcqnatrSQX9cmOuGPb5FxHhAMvvQXeUOgH6PREbedz4eow+TMOIboaXf1C8QlsyP8QlF4bh7AW/EPLUpmUHDDRaIrl4EskWmOH+HBHSBk9j1TuaODHiCCUCvlYv1SdGWojFSwP3n6c401eJTuqO+By0QHBI8rV+DnqYJCQSLyPsYxYKZn4Oit0S0eIqJ0dUwJCIhwYP4GP3d9quylOJSsgpUBv9SnFivgZm8aJB6zpdSGlvzz6CRjggZqNAEKc5bXMVR6iNvOzcR1wadtV1UV4jkuK0lGdbmEdVcT3Uh4KK/1aG5ndHu8VSbI1OQ1qoI4B0wBr8sUrU63SmpE9x0rahNHvmiKUB1/wUsulvvJd+HxQj8aXnXMqmm4OoMkPQYQTspnir4f65p2jeq/3+DygRDgNxKHgXyWHJh1jZLkXoiixY2ToM8gHp9tahMRJekZgH5Xs3kfj0v4VAkfGYiVU5d8/8hDiPj8w3VpM9bWJifLn3TeR/wwe9LHP9ZZwdSjivP3pVg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(86362001)(316002)(38350700002)(66476007)(8936002)(66556008)(38100700002)(52116002)(2616005)(1076003)(6506007)(186003)(66946007)(44832011)(508600001)(6916009)(2906002)(6486002)(36756003)(8676002)(5660300002)(26005)(83380400001)(6512007)(6666004)(956004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7edA1/l19A/0DTUpe7PT+/+7IrCAUdVUIy1OWgBZkuI+FCshwJL3MzePVAReGNSBOrnWrNvRajfnPlN52n4B+NUl+D9h4iY5kssUBhkI1tm1Taslo6YOqNGskUNUJ2pkKoMG+1U44VE3dbmGj7kEfj8CTAcLwrHnYgS2ZpPCLG4D0ZeNJ+ahdwxN+egakWkjlDxFZcoOGUA+mol0kOMy2WSjzoTdiwaE5v/rnEtHB9/zeoaczdwg3BVnU4xLeMu80gXhONlKK9cKYOiWE0/gp8ShVl/ewV+iIjzsFrUHHp4+mownL2pPQ5f8BkTR5gu9GdqQ8k6q4CUnFy6ezfIa4dliclg7x6v3moAORaPf6UBQT+TOKa+u6hJ7u3v6TTubINRvdGk8ln8JECGIjhPPA0/droKQeMPzTx7AH1CttytyI5kLe4eKPfH8q2E0+lhz0GFS93rU6py+JuB+q5XHLZbBR+agT2Hf8U1zMf4W8rI9zG2CPXjDHjOdYzbE4XzByhQyIxaEnJPVMf8s8UwyBRruQtLba+feJxcsIj3y5NGynAulJZfUShVIBWrpYaTscZWHbXw/K4u9PTrxYYLbxGd/xeJtSDaDDC87sM2xHEPM/KJEPP4sN6B/eZwMpdOoizK9hd7QuoOd23IwQ+cU5qWaco8ZaC4h9bND96nIUQkqKAmSiSKAzGWzvL/L4hn1NJ3IqhX11b7srMys4pzmNLpOiGVxTqiFW8OM1OOjNHh8HrT7ny6MGn30WbjC2CCTMbOSw6q3DhTWHg2EKpLWujB4XQAUO8H3AnVXa/yz0UF2HQECjUo4xnS4lMg6jIrvrzJuDrI2KZDZwgfxF/Fcli+tsTs0Kr2vjMMnMVBeYLnwVRpAtcjPcUS/B63SCGD+Av1JqKtfCdO67y4T24j0Ie4cgLcwZV3AYC8BUZmNG0PqO1SvRojdOudYriQFemDsZ+AQngGeErYjXcfpYzESWc3l6v8Cw0+fYorxrU2yCu59YVoG6bB5d/EnUTFpgxsEUxaFHcYsQtSG6wZpgrEiCNCVHoU/iKtOxN94jFxY0cEiCVoGoHMKk7lbFhR4DRLyUpQYAyRoWoASqFX5490uJuty/bRcRLRC7By16yfu2Yx76OLdrvE7pN+cMFq/Vd3cyo/laSpx+1gjNerUOvOdhtYvqrEHS5zzXPDouV3mHAjAV0CiiqBeXffL60sa9i2TtdfH/dRs3Ngl1e0NswMXKkWTEVTRw6PcaOvXZ4dJLznUr98fqepjcBrmS5mIDK4w8XzLXtiL7mI2BZ9u2ehI2kjYeQhzPAWwyaSbFpbBpe0UCoP75I0ZfONFs0xQTAhJrwy7aXDgqPKoai+5IdWXaDyUUfnVX5wtd/vuvgqMTXWidfm7AJEc+RgDHHQ3t+v0SlZFh4LCI0n2lBtszEOdrJNdsK+6APX1ytg2BTSTfe01c653xg/RYwGn8xQf0DGge3cUzomCxb+2Hosqj90Zy8L5SFicCZFm1r26jfOQX2/R+OwAlMC3KLcTJpalIaBNTU0uV1RFHCH3vnLlzlrg+wYGq8rXncebUdJD2BjcuYzzHZ9TWL1XUyZwp443MAsHi7zj4tbTNArEJ0sQ58r/AhWr0TCVP075hxJHY06nIfQ= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f5b3b8e-bca5-4f9e-c36b-08d9afbd96b6 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 02:45:06.4932 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dKAsP59U+nTFGh+bQ23InsxevQm4sTepONQwHTxjSyJH0z3U7tMmmNz5oLyxwFYUQpmIsMmOLa4gHx1vzXbKXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1101MB2189 X-Proofpoint-GUID: 5T4M0A26WvidLRmGwQS4GDImR1l5Dh1o X-Proofpoint-ORIG-GUID: 5T4M0A26WvidLRmGwQS4GDImR1l5Dh1o X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-24_06,2021-11-24_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 suspectscore=0 clxscore=1015 priorityscore=1501 mlxscore=0 lowpriorityscore=0 spamscore=0 mlxlogscore=724 phishscore=0 malwarescore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111250012 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 ; Thu, 25 Nov 2021 02:45:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94121 Fixes: $ python3 >>> import samba Traceback (most recent call last): File "", line 1, in File "/usr/lib64/python3.10/site-packages/samba/__init__.py", line 28, in import ldb ModuleNotFoundError: No module named 'ldb' >>> Signed-off-by: Yi Zhao --- meta-networking/recipes-connectivity/samba/samba_4.14.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb b/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb index af0795458..0a5dbe9c9 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb @@ -245,7 +245,7 @@ PACKAGESPLITFUNCS:prepend = "samba_populate_packages " PACKAGES_DYNAMIC = "samba-auth-.* samba-pdb-.*" RDEPENDS:${PN} += "${PN}-base ${PN}-python3 ${PN}-dsdb-modules python3" -RDEPENDS:${PN}-python3 += "pytalloc python3-tdb" +RDEPENDS:${PN}-python3 += "pytalloc python3-tdb pyldb" FILES:${PN}-base = "${sbindir}/nmbd \ ${sbindir}/smbd \ From patchwork Thu Nov 25 02:44:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi Zhao X-Patchwork-Id: 1267 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 6E5C0C43217 for ; Thu, 25 Nov 2021 02:45:11 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.web10.7547.1637808310909478107 for ; Wed, 24 Nov 2021 18:45:11 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=pps06212021 header.b=L4aNegE3; spf=pass (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=6963faa46c=yi.zhao@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1AP2ix26016953 for ; Thu, 25 Nov 2021 02:45:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=PPS06212021; bh=ywBWBQ+AG9e7lOX+CGnzG4pbUnI8H+tGT/LLqUtwWI4=; b=L4aNegE3rB2fTUHnajfWyDIivzXcXYaqedKf8Vj40DtXaW2P4vwBqXgwX5iuGNM/4iEJ 7oFt+S22N3tbsZN5zY2R148gFPLiA62c6+8T22MNJr2BTLBZpt/zFzYIW1ww2K074KUo PxaVk0QNw5q4qDopKwStPbQwlC78cnMfbiUP05id+sUC2Rr/GDruBaAG4DJHVQXqxqk8 eun3DuzWDbGINIj5ZbY7fxKn0WBxqDpUzWN42IQlbRsm4ZKPe2kjiaIdr7zaw6WwldZt F5c9ip2Ia3jKyt8vp9nxVzIG7G3gjiNpyaNlsdZ39XxNZMezdK+YN3bbqrOgfJB2fLIY 7Q== Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2173.outbound.protection.outlook.com [104.47.58.173]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3chce58yxn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 25 Nov 2021 02:45:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hXxqug+zZh7rPTNKZEmBmnxyrR3bv0zSh7Q5NPZQztXbxQ/B8SQUdO0mLdRnHCF63+HA3DmnL/fQinGkBzC4bX3CiAL8bXJyE1Fn5rb0UQh9rDQiTAMAQWGYCtCzqGldWxNAa3ITiFGI08flVKqYyh1dVV6YSkwTvzi7G0ZTtCCHHw+dWVjY1xyiehgXi0mSf9s1d/rh3ZGxT+ubh30nATr0MnmqQzYt2E6xANM7jXzya+5++3SY7IgmA+BqWhL5hvYXA7oB83QomVjl6/LCVwTzu+R/T+YVEKdBJ8XJIs7KNvWLEdaPKKRjf33lbdr2tZKpWfqeg9QF0+g8qH2BGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ywBWBQ+AG9e7lOX+CGnzG4pbUnI8H+tGT/LLqUtwWI4=; b=ffVOiLxRlAvCtv6Y5ZE2WM9onPRVX/nyu9uM+TLoCfe7bJp4HIODHbomGu77jlyAAt7kdgWbfNjBWGvWkpl55w24fp3TpjAuZ6ARNuS/Oj2bRsUyqo8IYt715qr84pz893OShdlY2aZXr+nhYHJBZhA0jwmFPlxTCUIdZXhdAv6KhY/Jc04/FE6p6wIT3y0NjIindFLOg6ggqx6Eul1mXtxFCBhoFMcwN9+kXwKeO5YGlSqRzBE6O+wnDMVK4244WVQ/O9/e4CcLGeIHavjcbOFiiWj7ovtFMgyFh1zw+2ecPoQo/ks1U2c5qRsD7s/zR+b7xuYIjL9O9YJz5jungw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=windriver.com; dmarc=pass action=none header.from=windriver.com; dkim=pass header.d=windriver.com; arc=none Received: from CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) by CO1PR11MB4803.namprd11.prod.outlook.com (2603:10b6:303:90::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4713.19; Thu, 25 Nov 2021 02:45:07 +0000 Received: from CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480]) by CO1PR11MB4867.namprd11.prod.outlook.com ([fe80::455e:9cfb:d106:4480%9]) with mapi id 15.20.4713.022; Thu, 25 Nov 2021 02:45:07 +0000 From: Yi Zhao To: openembedded-devel@lists.openembedded.org Subject: [meta-networking][PATCH 7/7] samba: update cross-answers files Date: Thu, 25 Nov 2021 10:44:50 +0800 Message-Id: <20211125024450.143364-7-yi.zhao@windriver.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211125024450.143364-1-yi.zhao@windriver.com> References: <20211125024450.143364-1-yi.zhao@windriver.com> X-ClientProxiedBy: HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) To CO1PR11MB4867.namprd11.prod.outlook.com (2603:10b6:303:9a::13) MIME-Version: 1.0 Received: from pek-yzhao1-d1.wrs.com (60.247.85.82) by HK2PR04CA0062.apcprd04.prod.outlook.com (2603:1096:202:14::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 25 Nov 2021 02:45:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 18cd0ffd-2dd1-4309-d67c-08d9afbd9766 X-MS-TrafficTypeDiagnostic: CO1PR11MB4803: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dz/KjBGihetmRzHhdJA5PjazGvUK2NDiz3OzN3zQmAGzEQPxQaTsQ/u63XWlR/+r1SMu95rzVnEsNyHnkrRvga8suIjkE0yRLOIc0/c38YQAQOUqEshcdNTq1h0U1OCimGY0NlqG2p0CCZdRPoO3c56jSj2Ec7uyhndikKolH2JfbTT/QFbdfuRQu/vaO5ft7kkbcXN4NR/5lNk+3GzJ+BqKC2Svp/3eDQhBJrDfTjCU5yFOatrL6Vn7f335Z7xQ4zCL8qQvLqF5y4EhQMkXMdw8fD8OYzXeVRfr46tOKPifvYEiPrNQ6DnFdvOJWcwgOYSA1m5CC8MKH8mICXoxKV2qAo1NXObcNBym9zj7dXPGim0HlGGdlr4BX0+xKElMVCjzJZn5aKtgbjf0cSonGFNcepMah45hMtwVFQRdVozFhynlJsjxh+dVgJvKB4sLYunHRt6KnoKCGj/J8w1JNi3jit9tLS4qeYb6HONT2PLljuZzVQQCcNcUxJt/q0OLSK0q98tS5TzH2+pAOCtBCO4UpWlDbEpuqK8a1j/m3oWM81sz5LWS1lOYELn9LtHJCbOFfLbXQzdVOd8LKRwcszaTdS9PpGTVmyKi0Zr81NipEFHcrgGQwrG0jRX7dmZUUUVolhUHIrPW9nFhZuKyoczUcpaawcW78/4f7Jnpk4jLxWPI2rSxjChIfoQ6ToyKYcCm02E9Xb/nFHEJJuZRkQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4867.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(44832011)(186003)(6916009)(52116002)(26005)(6512007)(2906002)(5660300002)(6666004)(30864003)(2616005)(956004)(6506007)(508600001)(66946007)(36756003)(1076003)(66556008)(8676002)(86362001)(38350700002)(38100700002)(66476007)(316002)(6486002)(8936002)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NpOt/dgqafSkBi5d/jBXDhW1rBy1jAyo3SWTF+sgZ0eDCkYq+38DgZBtHwMuXlEHzNTLa6NNsiJTlco5rdwUfgrE0IeZy17xfiqP1cPfnU+wB5BjE1RczkmcjaVPilxDBS+IJTNZKS/NrSaomnzTZ9r0RCxF+Ca74e/gEKLXWMWGfwxpwuhMXgRbLw5UfmRpz5IlcTfST+znK5CQa1CEm23ZXj26ejB63JQX6tazrOHuGnPsrtSyVskAaBd2EX63ao+PyufTi+Eo1XNRHmx0K8+Fy1PIWlqwIXhmOCFYoba9Q6FqbI+ofEqJC800gzDmTmIgFcVT3JUzljgpK+EQrBXQdyqq6gwHbwBc1PunohAuI5qvMldBvZ62KDiqIbmQB0vwcvKh1vSfWrRfSKyLDZsWs4bvZD3FgWWO/rrJkV1EJAnR/l+ZzkYAwmNHZhde2k2KQFAQBw/uQoqTN8iVzTwVTF6MPb5EwiY6AzETfqO0aB6eizLfKzVdIU7KTLFot/laqs4zgtD4bErpRSN3JR6SKM9WP474JOesjJwx6tKpxcrMCrZDKU1na7RSCdQLJHWB/dmon4efiN2jPiym33wk94+T89MfgKY7aH5XQUnreUdajl1nT/DpeG2kPBaEW0prPn3T+lUNJRqzMU15lzpBKamN1rzNYp4POVHv0gBZwsZfhbxYdQryWmloosP94m1zM68I+A/AdxiyiWOmggP9v19vuoeM0gEclfJ5ULd/LfjY64D3JBO3nqmkoRJB7ebEsQxy5PE+APdBYFPgSSrCgCASwgb9iboFZlF+1tiScC9jY7UlwNXXK61/Q7MSypI+nWBoOitFGvCVKCF37WESDchEZ6JqnT1zxdQ3KQlWK25C7K3gg7P4Hdu8Y1Uro1b/BqzTEylXDlynhv5OJTqtc9mbgv8vfH+qmDUmInEWl7uPAnjKJyJYuRGsmIPfoPXzFoJgrmailBunnOk6pmJ4QpOjBNFzFEzvWFy4FxbRAC08jWPPu0CNH7iB3YD7EI0iJHZFmnNvUyjGfp7X3RtqkhttAMXhdxqTmTw5pl9ehzOlpy4WB+AGqcSlKBdrRKFTff8xiGw5oLDyXiElpu1mBqof8kq4MqbEwdu0deXgPAPtG6ULvA8s+7C2ERqTnysl8OVuMZXISZp6DZxsYV7Q1RWNyknYBVhn8/d79z0YZ74itZix/N5sHP1+g9duTgRGn+px87h5FsfMq0HsIRpblZwWKavYBlECrCp18mJMRxgAY61lkIphLRSKSxmHEmMIawFagUSPpkZJLT6+65lgNx/Raucf3p8ezx5Ej2FFYEaxm0Wb/vkisblDci0PL3evfRPtAsciPITCoHekroDgVX8OVxCwtKOAhV8EQ97JFRe2/9pVLYqLl2GYWj0gir41xthvlB+iGCG4ChmlAmJkqMd9pX4DVW6c+2aGPSWSdKd0qFWJN3Y2GJUbvfNZfTEcPHV1h9I4KeaGmeytKZzVgv+gzhJNc2CsmRjoHPVNHQYtFgXkoRtfyierTHmUQDfVRVgkqOvsU+37kXGaDZ73vGa/XxUvQuxWh6hsQEwKferd74ui8+2BghLuTnFzfAP9NX+LbNHMzLw1VOj9PMtvKnO4asonn2rJFlh7AMc= X-OriginatorOrg: windriver.com X-MS-Exchange-CrossTenant-Network-Message-Id: 18cd0ffd-2dd1-4309-d67c-08d9afbd9766 X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4867.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2021 02:45:07.7317 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ddb2873-a1ad-4a18-ae4e-4644631433be X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 12DM+IPyvZOvGFMqovI8ZGIEuY0gNfx2Q83Fs6QfqC73nyVL/kPzOjQ2ljx/pbaYmULKiBwWuJ/WELtlXl0Ktw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB4803 X-Proofpoint-GUID: e0NZmtykKVUDH9G8nHymnh8GuUpDzUE5 X-Proofpoint-ORIG-GUID: e0NZmtykKVUDH9G8nHymnh8GuUpDzUE5 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-24_06,2021-11-24_01,2020-04-07_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 adultscore=0 mlxlogscore=999 clxscore=1015 impostorscore=0 suspectscore=0 malwarescore=0 spamscore=0 bulkscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111250012 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 ; Thu, 25 Nov 2021 02:45:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/94122 Replace the configure tests UNKNOWN answers with the correct answers. Then drop the related patches. Signed-off-by: Yi Zhao --- .../cross-answers-aarch64.txt | 5 + .../cross-answers-aarch64_be.txt | 5 + .../waf-cross-answers/cross-answers-arm.txt | 5 + .../waf-cross-answers/cross-answers-armeb.txt | 5 + .../waf-cross-answers/cross-answers-i586.txt | 5 + .../waf-cross-answers/cross-answers-i686.txt | 5 + .../waf-cross-answers/cross-answers-mips.txt | 5 + .../cross-answers-mips64.txt | 5 + .../cross-answers-mips64el.txt | 5 + .../cross-answers-mipsel.txt | 5 + .../cross-answers-powerpc.txt | 5 + .../cross-answers-powerpc64.txt | 5 + .../cross-answers-powerpc64le.txt | 5 + .../cross-answers-riscv32.txt | 5 + .../cross-answers-riscv64.txt | 5 + .../cross-answers-x86_64.txt | 5 + .../samba/0006-samba-defeat-iconv-test.patch | 39 -------- ...e_system_gnutls-disable-check-gnutls.patch | 39 -------- ...cript-disable-check-fcntl-F_OWNER_EX.patch | 79 ---------------- ...wscript-disable-check-fcntl-RW_HINTS.patch | 92 ------------------- .../samba/samba_4.14.10.bb | 4 - 21 files changed, 80 insertions(+), 253 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch delete mode 100644 meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch delete mode 100644 meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch delete mode 100644 meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch diff --git a/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt index fc0400dfd..a89d9b358 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-aarch64.txt @@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt b/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt index fc0400dfd..a89d9b358 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-aarch64_be.txt @@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-arm.txt b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt index 759afe8f9..b32967539 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-arm.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-arm.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt b/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt index 759afe8f9..b32967539 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-armeb.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-i586.txt b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt index 759afe8f9..b32967539 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-i586.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-i586.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-i686.txt b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt index 759afe8f9..b32967539 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-i686.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-i686.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt index c989f270b..e8844981e 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mips.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt index 215f57483..e78761de6 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips64.txt @@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt b/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt index 215f57483..e78761de6 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mips64el.txt @@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt b/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt index c989f270b..e8844981e 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-mipsel.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt index f1079749e..4d2726139 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt index 7a443cc01..b32d30b34 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt index 7a443cc01..b32d30b34 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-powerpc64le.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt b/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt index 759afe8f9..b32967539 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv32.txt @@ -39,3 +39,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: NO +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt index fc0400dfd..a89d9b358 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-riscv64.txt @@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt b/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt index fc0400dfd..a89d9b358 100644 --- a/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt +++ b/meta-networking/files/waf-cross-answers/cross-answers-x86_64.txt @@ -38,3 +38,8 @@ Checking whether blkcnt_t is 32 bit: NO Checking whether blkcnt_t is 64 bit: OK Checking whether fcntl lock supports open file description locks: OK Checking for a 64-bit host to support lmdb: OK +Checking errno of iconv for illegal multibyte sequence: NO +Checking value of GNUTLS_CIPHER_AES_128_CFB8: OK +Checking value of GNUTLS_MAC_AES_CMAC_128: OK +Checking whether fcntl supports flags to send direct I/O availability signals: NO +Checking whether fcntl supports setting/geting hints: NO diff --git a/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch b/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch deleted file mode 100644 index 00b692b58..000000000 --- a/meta-networking/recipes-connectivity/samba/samba/0006-samba-defeat-iconv-test.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 59f7098bfbd63f9b3c19d7d297a8f90870a1893d Mon Sep 17 00:00:00 2001 -From: Joe Slater -Date: Mon, 31 May 2021 14:50:38 +0800 -Subject: [PATCH] samba: defeat iconv test - -A test was added when configuring samba which requires target code -to be executed. In general, this will not work, so we eliminate it. - -Upstream-Status: Pending - -Signed-off-by: Joe Slater ---- - lib/util/charset/wscript_configure | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/lib/util/charset/wscript_configure b/lib/util/charset/wscript_configure -index 9c27fc6..845eb36 100644 ---- a/lib/util/charset/wscript_configure -+++ b/lib/util/charset/wscript_configure -@@ -17,6 +17,8 @@ if (conf.CHECK_FUNCS_IN('iconv_open', 'iconv', checklibc=False, headers='iconv.h - - conf.DEFINE('HAVE_NATIVE_ICONV', 1) - -+""" -+[added for 4.7.0, but breaks cross-compilation] - conf.CHECK_CODE(''' - uint8_t inbuf[2] = { 0x30, 0xdf }; - uint8_t outbuf[4] = { 0 }; -@@ -36,6 +38,7 @@ conf.CHECK_CODE(''' - msg='Checking errno of iconv for illegal multibyte sequence', - lib='iconv', - headers='errno.h iconv.h') -+""" - - if conf.CHECK_CFG(package='icu-i18n', - args='--cflags --libs', --- -2.17.1 - diff --git a/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch b/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch deleted file mode 100644 index 0f843af20..000000000 --- a/meta-networking/recipes-connectivity/samba/samba/0007-wscript_configure_system_gnutls-disable-check-gnutls.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a31a014c5d98501074fde1acb5c00162c927c361 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Mon, 31 May 2021 15:47:58 +0800 -Subject: [PATCH] wscript_configure_system_gnutls: disable check gnutls - AES_CFB8/AES_CMAC - -The CHECK_VALUEOF() can not work on cross-compilation. - -Fixes configure error: - Checking value of GNUTLS_CIPHER_AES_128_CFB8: UNKNOWN - Checking value of GNUTLS_MAC_AES_CMAC_128: UNKNOWN - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao ---- - wscript_configure_system_gnutls | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/wscript_configure_system_gnutls b/wscript_configure_system_gnutls -index 2ec217f..cd91b55 100644 ---- a/wscript_configure_system_gnutls -+++ b/wscript_configure_system_gnutls -@@ -39,6 +39,7 @@ if (parse_version(gnutls_version) > parse_version('3.6.14')): - if conf.CHECK_FUNCS_IN('gnutls_get_system_config_file', 'gnutls'): - conf.DEFINE('HAVE_GNUTLS_CRYPTO_POLICIES', 1) - -+""" - if conf.CHECK_VALUEOF('GNUTLS_CIPHER_AES_128_CFB8', headers='gnutls/gnutls.h'): - conf.DEFINE('HAVE_GNUTLS_AES_CFB8', 1) - else: -@@ -48,3 +49,4 @@ if conf.CHECK_VALUEOF('GNUTLS_MAC_AES_CMAC_128', headers='gnutls/gnutls.h'): - conf.DEFINE('HAVE_GNUTLS_AES_CMAC', 1) - else: - Logs.warn('No gnutls support for AES CMAC') -+""" --- -2.17.1 - diff --git a/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch b/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch deleted file mode 100644 index d4ceb5ce9..000000000 --- a/meta-networking/recipes-connectivity/samba/samba/0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch +++ /dev/null @@ -1,79 +0,0 @@ -From ba6bc5459cf148dd617fd9cd38dd50c3a9b5d706 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Mon, 31 May 2021 15:50:48 +0800 -Subject: [PATCH] source3/wscript: disable check fcntl F_OWNER_EX - -It fails on cross-compilation. - -Fixes configure error: - Checking whether fcntl supports flags to send direct I/O availability signals: UNKNOWN - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao ---- - source3/wscript | 48 ------------------------------------------------ - 1 file changed, 48 deletions(-) - -diff --git a/source3/wscript b/source3/wscript -index adc31ce..f6de0a6 100644 ---- a/source3/wscript -+++ b/source3/wscript -@@ -1168,54 +1168,6 @@ err: - #include - #include - #include --#include -- --int main(void) --{ -- int sockfd, ret; -- struct f_owner_ex owner, get_owner; -- -- sockfd = socket(AF_UNIX, SOCK_STREAM, 0); -- if (sockfd == -1) { -- goto err; -- } -- -- owner.type = F_OWNER_PID; -- owner.pid = getpid(); -- -- ret = fcntl(sockfd, F_SETOWN_EX, &owner); -- if (ret == -1) { -- goto err; -- } -- -- ret = fcntl(sockfd, F_GETOWN_EX, &get_owner); -- if (ret == -1) { -- goto err; -- } -- -- if (get_owner.type != F_OWNER_PID) { -- goto err; -- } -- -- if (get_owner.pid != getpid()) { -- goto err; -- } -- -- close(sockfd); -- exit(0); --err: -- close(sockfd); -- exit(1); --}''', -- 'HAVE_F_OWNER_EX', -- addmain=False, -- execute=True, -- msg="Checking whether fcntl supports flags to send direct I/O availability signals") -- -- conf.CHECK_CODE(''' --#include --#include --#include - #include - - #define DATA "hinttest.fcntl" --- -2.17.1 - diff --git a/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch b/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch deleted file mode 100644 index a0b751034..000000000 --- a/meta-networking/recipes-connectivity/samba/samba/0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 9942bca2e276c7b4c7696a08594258430c4c5bb5 Mon Sep 17 00:00:00 2001 -From: Yi Zhao -Date: Thu, 3 Jun 2021 09:39:56 +0800 -Subject: [PATCH] source3/wscript: disable check fcntl RW_HINTS - -It fails on cross-compilation for musl. - -Fixes configure error: - Checking whether fcntl supports setting/geting hints: UNKNOWN - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Yi Zhao ---- - source3/wscript | 61 ------------------------------------------------- - 1 file changed, 61 deletions(-) - -diff --git a/source3/wscript b/source3/wscript -index f6de0a6..3e260c1 100644 ---- a/source3/wscript -+++ b/source3/wscript -@@ -1164,67 +1164,6 @@ err: - execute=True, - msg="Checking whether fcntl lock supports open file description locks") - -- conf.CHECK_CODE(''' --#include --#include --#include --#include -- --#define DATA "hinttest.fcntl" -- --int main(void) --{ -- uint64_t hint, get_hint; -- int fd; -- -- fd = open(DATA, O_RDONLY | O_CREAT | O_EXCL); -- if (fd == -1) { -- goto err; -- } -- -- hint = RWH_WRITE_LIFE_SHORT; -- int ret = fcntl(fd, F_SET_RW_HINT, &hint); -- if (ret == -1) { -- goto err; -- } -- -- ret = fcntl(fd, F_GET_RW_HINT, &get_hint); -- if (ret == -1) { -- goto err; -- } -- -- if (get_hint != RWH_WRITE_LIFE_SHORT) { -- goto err; -- } -- -- hint = RWH_WRITE_LIFE_EXTREME; -- ret = fcntl(fd, F_SET_FILE_RW_HINT, &hint); -- if (ret == -1) { -- goto err; -- } -- -- ret = fcntl(fd, F_GET_FILE_RW_HINT, &get_hint); -- if (ret == -1) { -- goto err; -- } -- -- if (get_hint != RWH_WRITE_LIFE_EXTREME) { -- goto err; -- } -- -- close(fd); -- unlink(DATA); -- exit(0); --err: -- close(fd); -- unlink(DATA); -- exit(1); --}''', -- 'HAVE_RW_HINTS', -- addmain=False, -- execute=True, -- msg="Checking whether fcntl supports setting/geting hints") -- - conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtim.tv_nsec', - define='HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC') # Linux, Solaris - conf.CHECK_STRUCTURE_MEMBER('struct stat', 'st_mtimensec', --- -2.17.1 - diff --git a/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb b/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb index 0a5dbe9c9..d51ec54d5 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.14.10.bb @@ -20,10 +20,6 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://0003-Add-config-option-without-valgrind.patch \ file://0004-Add-options-to-configure-the-use-of-libbsd.patch \ file://0005-samba-build-dnsserver_common-code.patch \ - file://0006-samba-defeat-iconv-test.patch \ - file://0007-wscript_configure_system_gnutls-disable-check-gnutls.patch \ - file://0008-source3-wscript-disable-check-fcntl-F_OWNER_EX.patch \ - file://0009-source3-wscript-disable-check-fcntl-RW_HINTS.patch \ file://0001-Fix-pyext_PATTERN-for-cross-compilation.patch \ "