Patchwork [meta-oe] python-mysqldb: import from OE classic, update to 1.2.3

login
register
mail settings
Submitter Peter Bigot
Date Dec. 31, 2011, 5:32 p.m.
Message ID <1325352759-321-1-git-send-email-bigotp@acm.org>
Download mbox | patch
Permalink /patch/17925/
State New, archived
Headers show

Comments

Peter Bigot - Dec. 31, 2011, 5:32 p.m.
From: "Peter A. Bigot" <bigotp@acm.org>

Changes from classic recipe:

* Corrected license description based on text in README.

* Switched to setuptools since distutils produced an egg that had x86
  encoded in it.

* Old site.patch no longer necessary; threadsafe is False in this version.
---
 .../python/python-mysqldb/mysqlpath.patch          |   18 +++++++++++++++
 .../python/python-mysqldb_1.2.3.bb                 |   24 ++++++++++++++++++++
 2 files changed, 42 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/python/python-mysqldb/mysqlpath.patch
 create mode 100644 meta-oe/recipes-devtools/python/python-mysqldb_1.2.3.bb
Koen Kooi - Dec. 31, 2011, 7:40 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 31-12-11 18:32, Peter A. Bigot schreef:
> From: "Peter A. Bigot" <bigotp@acm.org>
> 

> +++ b/meta-oe/recipes-devtools/python/python-mysqldb_1.2.3.bb @@ -0,0
> +1,24 @@ +DESCRIPTION = "Python interface to MySQL" +HOMEPAGE =
> "http://sourceforge.net/projects/mysql-python/" +SECTION =
> "devel/python" +# "GPL or the original license based on Python 1.5.2's
> license" +LICENSE = "GPL"

That really needs a version specifier for the GPL version.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk7/ZTYACgkQMkyGM64RGpFc8wCcCU8ufb4FiToMuk0WYns9eAea
+QkAoJd+xMnAHtk/Sf5eG2eoCusm8D/G
=maSn
-----END PGP SIGNATURE-----
Peter Bigot - Dec. 31, 2011, 9:28 p.m.
On Sat, Dec 31, 2011 at 1:40 PM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Op 31-12-11 18:32, Peter A. Bigot schreef:
>> From: "Peter A. Bigot" <bigotp@acm.org>
>>
>
>> +++ b/meta-oe/recipes-devtools/python/python-mysqldb_1.2.3.bb @@ -0,0
>> +1,24 @@ +DESCRIPTION = "Python interface to MySQL" +HOMEPAGE =
>> "http://sourceforge.net/projects/mysql-python/" +SECTION =
>> "devel/python" +# "GPL or the original license based on Python 1.5.2's
>> license" +LICENSE = "GPL"
>
> That really needs a version specifier for the GPL version.

I agree in theory, but what I quoted is what the author provided in
the README.  It's characterized as an unqualified "GPL" on SourceForge
and the Python Package Index.  There is no COPYING file in the
distribution, hence my use of the README as the license file.  I note
there are several dozen other recipes in meta-openembedded and
openembedded-core that have the same unqualified GPL license.

Digging a little more, the only further source of guidance is _mysql.c
which has the following text in a header comment.  If  we assume the
other files are the same, I can update LICENSE to be GPLv2+.  The
alternative appears to be an HPND equivalent; I don't know how to
represent that, as I can't find any recipes that reference it.

How do you want this resolved?

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version. Alternatively, you may use the original license
reproduced below.

Copyright 1999 by Comstar.net, Inc., Atlanta, GA, US.

                        All Rights Reserved

Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Comstar.net, Inc.
or COMSTAR not be used in advertising or publicity pertaining to
distribution of the software without specific, written prior permission.

COMSTAR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
EVENT SHALL COMSTAR BE LIABLE FOR ANY SPECIAL, INDIRECT OR
CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
PERFORMANCE OF THIS SOFTWARE.



> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.11 (Darwin)
> Comment: GPGTools - http://gpgtools.org
>
> iEYEARECAAYFAk7/ZTYACgkQMkyGM64RGpFc8wCcCU8ufb4FiToMuk0WYns9eAea
> +QkAoJd+xMnAHtk/Sf5eG2eoCusm8D/G
> =maSn
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-devtools/python/python-mysqldb/mysqlpath.patch b/meta-oe/recipes-devtools/python/python-mysqldb/mysqlpath.patch
new file mode 100644
index 0000000..a38da6f
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-mysqldb/mysqlpath.patch
@@ -0,0 +1,18 @@ 
+--- MySQL-python-1.2.3/_mysql.c.orig	2010-06-17 02:21:56.000000000 -0500
++++ MySQL-python-1.2.3/_mysql.c	2011-12-31 09:50:07.888056331 -0600
+@@ -33,11 +33,11 @@
+ #include <windows.h>
+ #include <config-win.h>
+ #else
+-#include "my_config.h"
++#include "mysql/my_config.h"
+ #endif
+-#include "mysql.h"
+-#include "mysqld_error.h"
+-#include "errmsg.h"
++#include "mysql/mysql.h"
++#include "mysql/mysqld_error.h"
++#include "mysql/errmsg.h"
+ 
+ #if PY_VERSION_HEX < 0x02020000
+ # define MyTuple_Resize(t,n,d) _PyTuple_Resize(t, n, d)
diff --git a/meta-oe/recipes-devtools/python/python-mysqldb_1.2.3.bb b/meta-oe/recipes-devtools/python/python-mysqldb_1.2.3.bb
new file mode 100644
index 0000000..69eb47c
--- /dev/null
+++ b/meta-oe/recipes-devtools/python/python-mysqldb_1.2.3.bb
@@ -0,0 +1,24 @@ 
+DESCRIPTION = "Python interface to MySQL"
+HOMEPAGE = "http://sourceforge.net/projects/mysql-python/"
+SECTION = "devel/python"
+# "GPL or the original license based on Python 1.5.2's license"
+LICENSE = "GPL"
+LIC_FILES_CHKSUM = "file://README;md5=f92e5d60b213d35288bc14f18e1e31b4"
+DEPENDS = "mysql5"
+
+SRC_URI = "\
+  ${SOURCEFORGE_MIRROR}/mysql-python/MySQL-python-${PV}.tar.gz \
+  file://mysqlpath.patch \
+"
+SRC_URI[md5sum] = "215eddb6d853f6f4be5b4afc4154292f"
+SRC_URI[sha256sum] = "7de66fbbf923634e7c965aeaefa74642ba75ae20ee1cefcefc3009595b7a7e6e"
+
+SRCNAME = "MySQL-python"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit setuptools
+
+do_install_append() {
+    install -d ${D}${datadir}/doc/${PN}/
+    install -m 0644 ${S}/doc/*.txt ${D}${datadir}/doc/${PN}/
+}