Thanks for the cleanup, it would be cool to shed some more perhaps. I had to resolve merge conflicts to get this staged into master-next, please check if all is ok on master-next
On Mon, Sep 30, 2024 at 5:06 AM Niko Mauno <[email protected]> wrote: > > 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 <[email protected]> > --- > .../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 <[email protected]> > -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 <[email protected]> > ---- > - _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.') > -} > -- > 2.39.2 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#112606): https://lists.openembedded.org/g/openembedded-devel/message/112606 Mute This Topic: https://lists.openembedded.org/mt/108734363/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
