From patchwork Mon Sep 30 16:25:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Niko Mauno X-Patchwork-Id: 49830 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 BC4D5CE8373 for ; Mon, 30 Sep 2024 16:26:22 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (EUR05-VI1-obe.outbound.protection.outlook.com [40.107.21.106]) by mx.groups.io with SMTP id smtpd.web10.59036.1727713570740389019 for ; Mon, 30 Sep 2024 09:26:13 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@vaisala.com header.s=selector1 header.b=kAvyTlwN; spf=permerror, err=parse error for token &{10 18 spf3.vaisala.com}: parse error for token &{10 18 _spf-dc57.sapsf.eu}: limit exceeded (domain: vaisala.com, ip: 40.107.21.106, mailfrom: niko.mauno@vaisala.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pGGwZY7QzcyAwPC2+HPY+GVJLZC1ZPkHkFXbmKW67HLPqvx57hl6+Hs0DzOfjsCjq1M5WnJo4jQ9KXo2a04uYi8fuAZy3CYnLsV/KY/gRKoGeMHmHCW9PxPxvanVaFG4sPvt3z9/OgEim42y4LoDVZHz0+lsQ3xdd2ESUszQgpfFgVoMEkeFthxaeapBIl1CzzrTZ9SbBvy+h22acoyPmuxkdONTfQGqdz0Jee1YASq/hY9CYulk6AE1aSY5AYWDcAGTDy9sSIPDMp7TVEPeuqMOVc25wZDKemFfX+67+fhy50LoCJ6bh5bB1ddJ/8fCXNrZ7R26O5QAaFa9GWrLlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=SnmMC0Kl0E/NUc4Njj32WfLC7oaHXJ/7FbVg/y4Og7g=; b=h8wxdmnhakQRUHOtcOsCqxvgWEM69jEh1bNiN6FPnsC/pl55z/o59wSYHo6Z3Yjw7Zsm9hbLM9DX2NDLaYnLAggAQMsl0nr5Iia1El2D/UFD/ukXcXyaRVngn3efWjockYw9WfJ3UPAmICDNcMUounvQoiZMMUopPbzVJ+QUMYr6+2SXAFcBfVbgtIXTvyXc6yIquub3I4ENuc06dmpL8wg/SmZlmgGk1BP+jDNYbdf5zazjKxSbDdPU6GmrMYR36+Y50WYZihJVhrteixzw/6Lj9VLuKhsfhxAGYpRWMK4ka6yUIVkOLn5ZqOBjGeeQSV9Mt1WQA+ACWLOaCU6XXg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vaisala.com; dmarc=pass action=none header.from=vaisala.com; dkim=pass header.d=vaisala.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vaisala.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SnmMC0Kl0E/NUc4Njj32WfLC7oaHXJ/7FbVg/y4Og7g=; b=kAvyTlwN6meLUUQ+4usNeDIPO/rKQvkrGU6RuXYQ2Oa0DTYu9lbgRAdGn4ll7Uyl2QhCtXtXPfQzlEQKRVWVDd6gWOtNp4tcr1uDxPJI+obuMpe7+8tJ9Q/zuKfNq4e7qUxWZLNpULBsDYoh8DZO/6ZlkEEp+WFnzJ3Fu4muLl470TpXl3Ksxmmh/t6L3hp8+qtFR7CNRP+9AN5iNpd6zaBNIo8v7bjdKyEhRXDc24RRCHUWKpD5EzXu2q5OyNS2EZRUgut/ceETbgse9sQzO0VyJWW6r8euUMxbtXbsUsIRGjxUuss9Yos5SDSEI1LZLCjq41IdzGCGOuLB+eZtJA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vaisala.com; Received: from AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) by DB8PR06MB6426.eurprd06.prod.outlook.com (2603:10a6:10:12a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8005.26; Mon, 30 Sep 2024 16:26:05 +0000 Received: from AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc]) by AS4PR06MB8447.eurprd06.prod.outlook.com ([fe80::af93:b150:b886:b2bc%6]) with mapi id 15.20.8005.024; Mon, 30 Sep 2024 16:26:05 +0000 From: Niko Mauno To: openembedded-devel@lists.openembedded.org Cc: raj.khem@gmail.com, Niko Mauno Subject: [meta-oe][PATCHv2 1/4] mysql-python: Remove obsolete recipe Date: Mon, 30 Sep 2024 16:25:29 +0000 Message-Id: <20240930162532.4064184-1-niko.mauno@vaisala.com> X-Mailer: git-send-email 2.39.2 X-ClientProxiedBy: AM0PR05CA0083.eurprd05.prod.outlook.com (2603:10a6:208:136::23) To AS4PR06MB8447.eurprd06.prod.outlook.com (2603:10a6:20b:4e2::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR06MB8447:EE_|DB8PR06MB6426:EE_ X-MS-Office365-Filtering-Correlation-Id: d06001e9-02ea-4753-3c6c-08dce16c9553 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|376014|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: Ze2E7sFHCmZA+kLqfsV9kl7oz0flHKA0khqabUmU915oXC2K5YsD6rOdPMBliYZhHeNxkAEjaR63TmzcGQhMaiBi1IK0YqMotbfZn024WSJSO1kTzAJE5q5br92d9TJJzIczAZmrCar+DxdD1F6GhXMvs/gkWBgG8obHEROdL9nQKJvoTVsLf4eORkLg7edckzSCNsjeAvJUzfuNR/KCtUTKT6jJl6UhzjHs5/aPOe4biEonenBYfhrMCN8y9ZnkqltI1nK9Zc0vnA6tGSp1l4AsEEDabQdhIMsnVqytzUjPA9QKb1ZYqvnd+iBARCfou8IDQZF0tyaDCjrbhZ80LeePMVY7+mcHlVgl5Yj5eNdXGKCRiU+8cu4ZaVxDeVALWxyKF/cpg9MikyIFdF4z+pOM9XD+wCtcRsQc1qtrJCMEJxZw75YnGvfA+bsZjKsv91CsGL4GzCD3X7rkXRq3FIt8LizUPlZjZ4ReKLUFMqS9/NBepdRt/U+Af5xmY0ltd0Qu0OJc06+IZPYo1AYr2q+5ynk7zxVND4ul30b/kP3jdjodfuzxKSqNqbRDpcMiCclbsOwqcdqU5dqPD3KaWT9Fj8//XlwZTnIyBJEYDG2ZoK35X91OynyPGV/04haqnkOo1VfVeJrsRiCXtgoWgn63Fex0tvCUwhNq/JXIx7MKuJBzp8GvfZ/7lX27HCeb8crbmqOgTpJd2TIzBVNqmYsW/jM+toFeXGqzy3U6IvzoT1YJ+ax4gXF2mKz/QpSCOVDYK91hKzX065UQ8kdAewJVnQ9ZKAFA2nyl7dTcqnKLFDNHZCfH607W2poiIFR2e+pMvaQ/x01OJFh+pNCsOFbawVJvWb1KAUCrdN4ut5FWQZu77+BVe/udtJLs1mvZi/DeinH6jvK65bdh5ugrfyzpgspJo9NfTCJPlZNpRq/2+AMWq8U9vZ2f3xriDXpPdVq39ptHJ6jRdjlKPEnhr1RhmMJ07+pK6x8qH5bjHaSey5qOHEvSNArtJglREnhCe35XrvOwBuyVMLEFmFnsMpZZX+2+3Kecc4VXEt1b+fya+SLd3HzKCCVMsKJB1fNKpupoRT+bh94YEhdXS/5eC7L3m2lM9VkC2wIZw61SnJspg5AEHGm7qSnlXUs81zohjLp7L7QWS71ouJF58HTOS4BsARJ2XeEihyr5Eytvg7gLy/5TAs/Zq1GvviSWvnscchJLB9XVYyAV934qtcO1C266bSS4snucId5Zw3I079qUdhgBkEfgRVPc7aQ6rLnrKOfTxXFpFbIHfY5HwAJRNw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR06MB8447.eurprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(376014)(1800799024)(38350700014);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: i/CKQkTgHO3ReJNEqgmcEQplfP0fNrylkr4/16q5p9DeeQZy5bPmxq3k7BnRzYUBlg7Jt80RJ1dQhlnBgkpgEmqv0vp3vU5E326HeRuzRTFqUAWoKqi6yY312UqJTSYqN4RDVstk0u1UZf5WWaoenIArnE2gqmawXgj7ws0yf9MazgAQkl6NBdq9PYsvSPBgv7Ag7goL57NfnSf1KmNJvsVCLy1Fgc9qgM7KYgJJU+jeXd7hHW48AyVZRNMiyzuvIg4qcEu+SvYJ58pjwOD5wBf+06bOOXDHUTT9sNHkr2UIKBkq7DTfM3mljpSlm/KEq0qeJUef9T+u+LqSD9ScAg19heOUjeqjejTMWsvoKovdCg6x9r5l8u4FhHZ4R8oNTD2l4Xd+qowNGNvZI/GGgZEnqapoJH4ex5uxl6hdl9ki5xrac50lD8seoxK1bryZ6r2/HUFXV+0yqAIS1Xj+7GAzKsDA//Pat2KEyvI78932ovtuO/A+B2Q7YM5ZBkgYjFKGyseGXPhbvPJhw9cAQ3NrCcLJtla+SjJ3psts7S3Suy234yPdey4IBhEJneC753C83VwEgVRdUYz5/F4YcvIl0S2/JzZJVZqNUkmjfLSbtAZ7yc8t/b+OSo1iC3SIy2HOEQM7Rk+nmjSGRUp9iBYc/tYXxA9+QPfk7fz9r9npvMVZsKcQgGvYhL0E6dOiBA/r8rAZu6vxhuvOXXMwmj6qkTFtd+/nIA7jcdnWsaDM9CLlVklEYSN3Em6lIA5Q1vngMj2r6/7pUTSSxAhshnEgtG5ZE5INPEy4RgncPHZ6uALEPR58Lxc8nXQRMfbEfmGcbs5Z9MCL2Jtbmcyc3wsqsa0cZ2A37Ap/lQloDiP0kU6lBsxz8MXSZlLg2xO53ECfLjNJmis1RhDyDGrxRBWJWFGdMr8qPWRF251uhbVoTXB6SKRQarIMJqe+dYI8XAMq+d/WHH7iasgk0s8EC1ocH/mjjo8KtdWTZOtB/KEVkn+7I5zbEmO+bQYRfQ4i+o03mfv7ti+stoSRsCrqMkEGqoQUzl0pt2tyzXpyPg6eR3ZisW4Ut/RcDkg3pGe+/FIcG8z9g6sbvQf0EDatmtmfKw7CbAV5OuQ31jKC5/nlXf4YE98SOJu9rLi7Ud/RgqNNZWVYmh/aOfc8m8kYofqmTTxJ2QHz8TJUGb9v4ctSII6qrOfRU7hDhyl/Oveukt4284op2YIFeSYHMFoJ7xZb2P0Wn7Opw8d1KpUA5i6ub8je+9AwxQXx4KxoaX+DYQPrWfLeZFDXs0gNSHY8Yy6vO3R1evIj8rocw6dw2tQeVl3znLGUg3CDfP/74xuioiAPL+Z7wX50Rs+lLbszNdVCh9e4IJTvERPh82RnxTD/Nl6KVpY5DAcVtrg/AI3ZSkD9KdENYgJ+TsuO4AwaM069EfR/IcQoJ1SGLPatibEFAVlQaAHz8elNIMR27+0EqjgM+MuzuYmShJiCPN9PnkliuiCtp6sKREt96T6XXk8G/qPwtMGf+mqkwDisSQdEvg1VORJgSDYIMOG9R2Ss7kW6NLYvRvHDpbs4a/pn33FtutlQKnODGuml29YAEz+8klYffZMd1qSqeAj7jmjkmw== X-OriginatorOrg: vaisala.com X-MS-Exchange-CrossTenant-Network-Message-Id: d06001e9-02ea-4753-3c6c-08dce16c9553 X-MS-Exchange-CrossTenant-AuthSource: AS4PR06MB8447.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2024 16:26:05.8723 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 6d7393e0-41f5-4c2e-9b12-4c2be5da5c57 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: guEl9Ywgb9Set0JzG0dif7D/d/1oJJZx2O/quyHns877tekkrWx/UnqVCWpRvReOsbhw2tqjgwUoiuEXLb+CLA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR06MB6426 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 ; Mon, 30 Sep 2024 16:26:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/112610 This recipe depends on meta-python2, master branch of which has not been updated sine February 2022, see https://git.openembedded.org/meta-python2/log/?h=master Also, master branch of the associated source code repository has not been updated since January 2014, see https://github.com/farcepest/MySQLdb1/commits/master/ Thus, remove the obsolete recipe, along with associated packagegroup declarations/references. Signed-off-by: Niko Mauno --- .../packagegroups/packagegroup-meta-oe.bb | 6 ---- ...ompilation-with-MariaDB-with-10.3.13.patch | 34 ------------------- .../recipes-dbs/mysql/mysql-python_1.2.5.bb | 26 -------------- 3 files changed, 66 deletions(-) delete mode 100644 meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch delete mode 100644 meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 6f31283fb..9523e78dd 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -13,7 +13,6 @@ PACKAGES = "\ packagegroup-meta-oe-crypto \ packagegroup-meta-oe-bsp \ packagegroup-meta-oe-dbs \ - packagegroup-meta-oe-dbs-python2 \ packagegroup-meta-oe-devtools \ packagegroup-meta-oe-extended \ packagegroup-meta-oe-extended-python2 \ @@ -40,7 +39,6 @@ RDEPENDS:packagegroup-meta-oe = "\ packagegroup-meta-oe-core \ packagegroup-meta-oe-crypto \ packagegroup-meta-oe-dbs \ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-dbs-python2", "", d)} \ packagegroup-meta-oe-devtools \ packagegroup-meta-oe-extended \ ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-extended-python2", "", d)} \ @@ -225,10 +223,6 @@ RDEPENDS:packagegroup-meta-oe-dbs ="\ " RDEPENDS:packagegroup-meta-oe-dbs:remove:libc-musl:powerpc = "rocksdb" -RDEPENDS:packagegroup-meta-oe-dbs-python2 ="\ - ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'mysql-python', '', d), "", d)} \ -" - RDEPENDS:packagegroup-meta-oe-devtools ="\ abseil-cpp \ apitrace \ diff --git a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch b/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch deleted file mode 100644 index 173241ea5..000000000 --- a/meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 45436592aa64308b2ab46f84c6107c6d7de0a3ec Mon Sep 17 00:00:00 2001 -From: Mingli Yu -Date: Wed, 6 Mar 2019 00:16:17 -0800 -Subject: [PATCH] _mysql.c: fix compilation with MariaDB 10.3.13 - -Use standard API function MYSQL_OPT_RECONNECT -instead of direct modification of internal structures -which does not work for MariaDB. - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu ---- - _mysql.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - ---- a/_mysql.c -+++ b/_mysql.c -@@ -2002,7 +2002,14 @@ _mysql_ConnectionObject_ping( - int r, reconnect = -1; - if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL; - check_connection(self); -- if ( reconnect != -1 ) self->connection.reconnect = reconnect; -+ if ( reconnect != -1 ) { -+#if MYSQL_VERSION_ID >= 50013 -+ my_bool recon = reconnect; -+ mysql_options(&self->connection, MYSQL_OPT_RECONNECT, &recon); -+#else -+ self->connection.reconnect = reconnect; -+#endif -+ } - Py_BEGIN_ALLOW_THREADS - r = mysql_ping(&(self->connection)); - Py_END_ALLOW_THREADS diff --git a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb b/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb deleted file mode 100644 index 15f6b6fb9..000000000 --- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Python interface to MySQL" -HOMEPAGE = "https://github.com/farcepest/MySQLdb1" -SECTION = "devel/python" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "mysql5" - -SRCNAME = "MySQL-python" - -SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \ - file://0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch \ -" -SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c" -SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74" - -S = "${WORKDIR}/${SRCNAME}-${PV}" - -SKIP_RECIPE[mysql-python] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}" - -inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)} - -python() { - if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): - raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') -}