summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNiko Mauno <niko.mauno@vaisala.com>2024-10-01 04:58:18 +0000
committerKhem Raj <raj.khem@gmail.com>2024-09-30 23:54:17 -0700
commit9cc9e47a72e5343cf2a6d3d69f70330df64a15c9 (patch)
treed32fbce2827718f7eb0269f35301f6e3129607c8
parent4ccccf20f78807b3a48acc6c8c6f13ddee2ecbfd (diff)
downloadmeta-openembedded-9cc9e47a72e5343cf2a6d3d69f70330df64a15c9.tar.gz
mysql-python: Remove obsolete recipe
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 <niko.mauno@vaisala.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb6
-rw-r--r--meta-oe/recipes-dbs/mysql/mysql-python/0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch34
-rw-r--r--meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb26
3 files changed, 0 insertions, 66 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb
index 6f31283fb3..9523e78ddd 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 = "\
13 packagegroup-meta-oe-crypto \ 13 packagegroup-meta-oe-crypto \
14 packagegroup-meta-oe-bsp \ 14 packagegroup-meta-oe-bsp \
15 packagegroup-meta-oe-dbs \ 15 packagegroup-meta-oe-dbs \
16 packagegroup-meta-oe-dbs-python2 \
17 packagegroup-meta-oe-devtools \ 16 packagegroup-meta-oe-devtools \
18 packagegroup-meta-oe-extended \ 17 packagegroup-meta-oe-extended \
19 packagegroup-meta-oe-extended-python2 \ 18 packagegroup-meta-oe-extended-python2 \
@@ -40,7 +39,6 @@ RDEPENDS:packagegroup-meta-oe = "\
40 packagegroup-meta-oe-core \ 39 packagegroup-meta-oe-core \
41 packagegroup-meta-oe-crypto \ 40 packagegroup-meta-oe-crypto \
42 packagegroup-meta-oe-dbs \ 41 packagegroup-meta-oe-dbs \
43 ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-dbs-python2", "", d)} \
44 packagegroup-meta-oe-devtools \ 42 packagegroup-meta-oe-devtools \
45 packagegroup-meta-oe-extended \ 43 packagegroup-meta-oe-extended \
46 ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-extended-python2", "", d)} \ 44 ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "packagegroup-meta-oe-extended-python2", "", d)} \
@@ -225,10 +223,6 @@ RDEPENDS:packagegroup-meta-oe-dbs ="\
225" 223"
226RDEPENDS:packagegroup-meta-oe-dbs:remove:libc-musl:powerpc = "rocksdb" 224RDEPENDS:packagegroup-meta-oe-dbs:remove:libc-musl:powerpc = "rocksdb"
227 225
228RDEPENDS:packagegroup-meta-oe-dbs-python2 ="\
229 ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', 'mysql-python', '', d), "", d)} \
230"
231
232RDEPENDS:packagegroup-meta-oe-devtools ="\ 226RDEPENDS:packagegroup-meta-oe-devtools ="\
233 abseil-cpp \ 227 abseil-cpp \
234 apitrace \ 228 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 173241ea5c..0000000000
--- 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 @@
1From 45436592aa64308b2ab46f84c6107c6d7de0a3ec Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 6 Mar 2019 00:16:17 -0800
4Subject: [PATCH] _mysql.c: fix compilation with MariaDB 10.3.13
5
6Use standard API function MYSQL_OPT_RECONNECT
7instead of direct modification of internal structures
8which does not work for MariaDB.
9
10Upstream-Status: Pending
11
12Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
13---
14 _mysql.c | 9 ++++++++-
15 1 file changed, 8 insertions(+), 1 deletion(-)
16
17--- a/_mysql.c
18+++ b/_mysql.c
19@@ -2002,7 +2002,14 @@ _mysql_ConnectionObject_ping(
20 int r, reconnect = -1;
21 if (!PyArg_ParseTuple(args, "|I", &reconnect)) return NULL;
22 check_connection(self);
23- if ( reconnect != -1 ) self->connection.reconnect = reconnect;
24+ if ( reconnect != -1 ) {
25+#if MYSQL_VERSION_ID >= 50013
26+ my_bool recon = reconnect;
27+ mysql_options(&self->connection, MYSQL_OPT_RECONNECT, &recon);
28+#else
29+ self->connection.reconnect = reconnect;
30+#endif
31+ }
32 Py_BEGIN_ALLOW_THREADS
33 r = mysql_ping(&(self->connection));
34 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 15f6b6fb9a..0000000000
--- a/meta-oe/recipes-dbs/mysql/mysql-python_1.2.5.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1SUMMARY = "Python interface to MySQL"
2HOMEPAGE = "https://github.com/farcepest/MySQLdb1"
3SECTION = "devel/python"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a4263"
6
7DEPENDS = "mysql5"
8
9SRCNAME = "MySQL-python"
10
11SRC_URI = "https://pypi.python.org/packages/source/M/${SRCNAME}/${SRCNAME}-${PV}.zip \
12 file://0001-_mysql.c-fix-compilation-with-MariaDB-with-10.3.13.patch \
13"
14SRC_URI[md5sum] = "654f75b302db6ed8dc5a898c625e030c"
15SRC_URI[sha256sum] = "811040b647e5d5686f84db415efd697e6250008b112b6909ba77ac059e140c74"
16
17S = "${WORKDIR}/${SRCNAME}-${PV}"
18
19SKIP_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)}"
20
21inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "setuptools", "", d)}
22
23python() {
24 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
25 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
26}