summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2013-06-12 21:04:18 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2013-06-13 20:17:04 +0200
commitb0bbe06055979e8bcd7a7c8868f8be19eea2bab2 (patch)
tree47c82db85b31f296f9352ba4231435c1e84d7ace
parent6b32859839a1f63b594055a6f769f960a2873313 (diff)
downloadptxdist-b0bbe06055979e8bcd7a7c8868f8be19eea2bab2.tar.gz
ptxdist-b0bbe06055979e8bcd7a7c8868f8be19eea2bab2.tar.xz
flup: fix building for python2.7
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/flup-1.0.2/0001-support-python2.7.patch31
-rwxr-xr-xpatches/flup-1.0.2/autogen.sh2
-rw-r--r--patches/flup-1.0.2/series4
-rw-r--r--patches/flup-1.0.2/setuptools-0.6c11-py2.7.eggbin0 -> 332005 bytes
-rwxr-xr-xpatches/flup-1.0.2/setuptools-0.6c9-py2.6.eggbin328075 -> 0 bytes
5 files changed, 36 insertions, 1 deletions
diff --git a/patches/flup-1.0.2/0001-support-python2.7.patch b/patches/flup-1.0.2/0001-support-python2.7.patch
new file mode 100644
index 000000000..2a2ee1613
--- /dev/null
+++ b/patches/flup-1.0.2/0001-support-python2.7.patch
@@ -0,0 +1,31 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 12 Jun 2013 21:03:22 +0200
+Subject: [PATCH] support python2.7
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ ez_setup.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ez_setup.py b/ez_setup.py
+index d24e845..b48fc0b 100644
+--- a/ez_setup.py
++++ b/ez_setup.py
+@@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``.
+ This file can also be run as a script to install or upgrade setuptools.
+ """
+ import sys
+-DEFAULT_VERSION = "0.6c9"
++DEFAULT_VERSION = "0.6c11"
+ DEFAULT_URL = "http://pypi.python.org/packages/%s/s/setuptools/" % sys.version[:3]
+
+ md5_data = {
+@@ -52,6 +52,8 @@ md5_data = {
+ 'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a',
+ 'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6',
+ 'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a',
++ 'setuptools-0.6c11-py2.7.egg': 'fe1f997bc722265116870bc7919059ea',
++
+ }
+
+ import sys, os
diff --git a/patches/flup-1.0.2/autogen.sh b/patches/flup-1.0.2/autogen.sh
index e4fd0fa05..71b2e73ea 100755
--- a/patches/flup-1.0.2/autogen.sh
+++ b/patches/flup-1.0.2/autogen.sh
@@ -1,4 +1,4 @@
#!/bin/bash
-cp patches/setuptools-0.6c9-py2.6.egg .
+cp patches/setuptools-0.6c11-py2.7.egg .
diff --git a/patches/flup-1.0.2/series b/patches/flup-1.0.2/series
new file mode 100644
index 000000000..b90762fc5
--- /dev/null
+++ b/patches/flup-1.0.2/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-support-python2.7.patch
+# 38422a23875f4810b966c4154441dc57 - git-ptx-patches magic
diff --git a/patches/flup-1.0.2/setuptools-0.6c11-py2.7.egg b/patches/flup-1.0.2/setuptools-0.6c11-py2.7.egg
new file mode 100644
index 000000000..8a51424a4
--- /dev/null
+++ b/patches/flup-1.0.2/setuptools-0.6c11-py2.7.egg
Binary files differ
diff --git a/patches/flup-1.0.2/setuptools-0.6c9-py2.6.egg b/patches/flup-1.0.2/setuptools-0.6c9-py2.6.egg
deleted file mode 100755
index a259f5c84..000000000
--- a/patches/flup-1.0.2/setuptools-0.6c9-py2.6.egg
+++ /dev/null
Binary files differ