Patchworkβ [oe] python-setuptools: Version bump to 0.6c11

login
register
about
Submitter Michael Lippautz
Date 2010-02-22 16:54:10
Message ID <1266857650-5557-1-git-send-email-michael.lippautz@gmail.com>
Download mbox | patch
Permalink /patch/1617/
State Changes Requested
Headers show

Comments

Michael Lippautz - 2010-02-22 16:54:10
* Adds python module 'pkg_resources'.

Signed-off-by: Michael Lippautz <michael.lippautz@gmail.com>
---
 .../python-setuptools/fix-log-usage-0.6c11.patch   |   18 ++++++++++++++++
 recipes/python/python-setuptools_0.6c11.bb         |   22 ++++++++++++++++++++
 2 files changed, 40 insertions(+), 0 deletions(-)
 create mode 100644 recipes/python/python-setuptools/fix-log-usage-0.6c11.patch
 create mode 100644 recipes/python/python-setuptools_0.6c11.bb
Stefan Schmidt - 2010-03-26 21:57:31
Hello.

Mickey, do you have a moment to review and comment on this python related patch?

regards
Stefan Schmidt

On Mon, 2010-02-22 at 17:54, Michael Lippautz wrote:
> * Adds python module 'pkg_resources'.
> 
> Signed-off-by: Michael Lippautz <michael.lippautz@gmail.com>
> ---
>  .../python-setuptools/fix-log-usage-0.6c11.patch   |   18 ++++++++++++++++
>  recipes/python/python-setuptools_0.6c11.bb         |   22 ++++++++++++++++++++
>  2 files changed, 40 insertions(+), 0 deletions(-)
>  create mode 100644 recipes/python/python-setuptools/fix-log-usage-0.6c11.patch
>  create mode 100644 recipes/python/python-setuptools_0.6c11.bb
> 
> diff --git a/recipes/python/python-setuptools/fix-log-usage-0.6c11.patch b/recipes/python/python-setuptools/fix-log-usage-0.6c11.patch
> new file mode 100644
> index 0000000..b860700
> --- /dev/null
> +++ b/recipes/python/python-setuptools/fix-log-usage-0.6c11.patch
> @@ -0,0 +1,18 @@
> +--- a/setuptools/command/sdist.py	2010-02-22 14:57:56.000000000 +0100
> ++++ b/setuptools/command/sdist.py	2010-02-22 14:57:31.000000000 +0100
> +@@ -1,6 +1,5 @@
> + from distutils.command.sdist import sdist as _sdist
> + from distutils.util import convert_path
> +-from distutils import log
> + from glob import glob
> + import os, re, sys, pkg_resources
> + 
> +@@ -94,7 +93,7 @@
> +         try: svnver = int(data.splitlines()[0])
> +         except: pass
> +         if svnver<8:
> +-            log.warn("unrecognized .svn/entries format in %s", dirname)
> ++            print("unrecognized .svn/entries format in %s", dirname)
> +             return           
> +         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
> +             if not record or len(record)>=6 and record[5]=="delete":
> diff --git a/recipes/python/python-setuptools_0.6c11.bb b/recipes/python/python-setuptools_0.6c11.bb
> new file mode 100644
> index 0000000..bccafa4
> --- /dev/null
> +++ b/recipes/python/python-setuptools_0.6c11.bb
> @@ -0,0 +1,22 @@
> +DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages"
> +HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
> +SECTION = "devel/python"
> +PRIORITY = "optional"
> +LICENSE = "MIT"
> +DEPENDS_${PN}-native = "python-native"
> +RDEPENDS_${PN} = "python-distutils python-compression"
> +PR = "ml3"
> +
> +SRC_URI = "\
> +  http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz;name=setuptools \
> +  file://fix-log-usage-0.6c11.patch;patch=1 \
> +"
> +SRC_URI[setuptools.md5sum] = "7df2a529a074f613b509fb44feefe74e"
> +SRC_URI[setuptools.sha256sum] = "630fea9b726320b73ee3ca6ff61732cb32675b0389be658080fe46383b87a1d3"
> +
> +SRCNAME = "setuptools"
> +S = "${WORKDIR}/${SRCNAME}-${PV}"
> +
> +inherit distutils
> +
> +BBCLASSEXTEND = "native"
> -- 
> 1.6.4.4
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Michael Lauer - 2010-03-27 10:11:09
Acked-by: Michael 'Mickey' Lauer <mlauer@vanille-media.de>

Cheers,

:M:

Am 26.03.2010 um 22:57 schrieb Stefan Schmidt  
<stefan@datenfreihafen.org>:

> Hello.
>
> Mickey, do you have a moment to review and comment on this python  
> related patch?
>
> regards
> Stefan Schmidt
>
> On Mon, 2010-02-22 at 17:54, Michael Lippautz wrote:
>> * Adds python module 'pkg_resources'.
>>
>> Signed-off-by: Michael Lippautz <michael.lippautz@gmail.com>
>> ---
>> .../python-setuptools/fix-log-usage-0.6c11.patch   |   18 ++++++++++ 
>> ++++++
>> recipes/python/python-setuptools_0.6c11.bb         |   22 ++++++++++ 
>> ++++++++++
>> 2 files changed, 40 insertions(+), 0 deletions(-)
>> create mode 100644 recipes/python/python-setuptools/fix-log- 
>> usage-0.6c11.patch
>> create mode 100644 recipes/python/python-setuptools_0.6c11.bb
>>
>> diff --git a/recipes/python/python-setuptools/fix-log- 
>> usage-0.6c11.patch b/recipes/python/python-setuptools/fix-log- 
>> usage-0.6c11.patch
>> new file mode 100644
>> index 0000000..b860700
>> --- /dev/null
>> +++ b/recipes/python/python-setuptools/fix-log-usage-0.6c11.patch
>> @@ -0,0 +1,18 @@
>> +--- a/setuptools/command/sdist.py    2010-02-22 14:57:56.000000000  
>> +0100
>> ++++ b/setuptools/command/sdist.py    2010-02-22 14:57:31.000000000  
>> +0100
>> +@@ -1,6 +1,5 @@
>> + from distutils.command.sdist import sdist as _sdist
>> + from distutils.util import convert_path
>> +-from distutils import log
>> + from glob import glob
>> + import os, re, sys, pkg_resources
>> +
>> +@@ -94,7 +93,7 @@
>> +         try: svnver = int(data.splitlines()[0])
>> +         except: pass
>> +         if svnver<8:
>> +-            log.warn("unrecognized .svn/entries format in %s",  
>> dirname)
>> ++            print("unrecognized .svn/entries format in %s",  
>> dirname)
>> +             return
>> +         for record in map(str.splitlines, data.split('\n\x0c\n') 
>> [1:]):
>> +             if not record or len(record)>=6 and record[5] 
>> =="delete":
>> diff --git a/recipes/python/python-setuptools_0.6c11.bb b/recipes/ 
>> python/python-setuptools_0.6c11.bb
>> new file mode 100644
>> index 0000000..bccafa4
>> --- /dev/null
>> +++ b/recipes/python/python-setuptools_0.6c11.bb
>> @@ -0,0 +1,22 @@
>> +DESCRIPTION = "Download, build, install, upgrade, and uninstall  
>> Python packages"
>> +HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
>> +SECTION = "devel/python"
>> +PRIORITY = "optional"
>> +LICENSE = "MIT"
>> +DEPENDS_${PN}-native = "python-native"
>> +RDEPENDS_${PN} = "python-distutils python-compression"
>> +PR = "ml3"
>> +
>> +SRC_URI = "\
>> +  http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz;name=setuptools 
>>  \
>> +  file://fix-log-usage-0.6c11.patch;patch=1 \
>> +"
>> +SRC_URI[setuptools.md5sum] = "7df2a529a074f613b509fb44feefe74e"
>> +SRC_URI[setuptools.sha256sum] =  
>> "630fea9b726320b73ee3ca6ff61732cb32675b0389be658080fe46383b87a1d3"
>> +
>> +SRCNAME = "setuptools"
>> +S = "${WORKDIR}/${SRCNAME}-${PV}"
>> +
>> +inherit distutils
>> +
>> +BBCLASSEXTEND = "native"
>> -- 
>> 1.6.4.4
>>
>>
>> _______________________________________________
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded- 
>> devel
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Stefan Schmidt - 2010-03-27 12:06:18
Hello.

On Mon, 2010-02-22 at 17:54, Michael Lippautz wrote:
> * Adds python module 'pkg_resources'.

I was going to apply this, but it fails during patching:

NOTE: Running task 725 of 737 (ID: 1,
/home/stefan/Projekte/OpenEmbedded/build/openmoko/openembedded/recipes/python/python-setuptools_0.6c11.bb,
do_patch)
NOTE: Applying patch 'fix-log-usage-0.6c11.patch'
(openembedded/recipes/python/python-setuptools/fix-log-usage-0.6c11.patch)
ERROR: Error in executing:
/home/stefan/Projekte/OpenEmbedded/build/openmoko/openembedded/recipes/python/python-setuptools_0.6c11.bb
ERROR: Exception:<class 'CmdError'> Message:Command Error: exit status: 1
Output:
Applying patch fix-log-usage-0.6c11.patch
patching file setuptools/command/sdist.py
Hunk #2 FAILED at 93.
1 out of 2 hunks FAILED -- rejects in file setuptools/command/sdist.py
Patch fix-log-usage-0.6c11.patch does not apply (enforce with -f)
ERROR: Printing the environment of the function
ERROR: Error in executing:
/home/stefan/Projekte/OpenEmbedded/build/openmoko/openembedded/recipes/python/python-setuptools_0.6c11.bb
ERROR: Exception:<class 'CmdError'> Message:Command Error: exit status: 1
Output:
Applying patch fix-log-usage-0.6c11.patch
patching file setuptools/command/sdist.py
Hunk #2 FAILED at 93.
1 out of 2 hunks FAILED -- rejects in file setuptools/command/sdist.py
Patch fix-log-usage-0.6c11.patch does not apply (enforce with -f)
ERROR: Printing the environment of the function
ERROR: Error in executing:
/home/stefan/Projekte/OpenEmbedded/build/openmoko/openembedded/recipes/python/python-setuptools_0.6c11.bb
ERROR: Exception:<class 'CmdError'> Message:Command Error: exit status: 1
Output:
Applying patch fix-log-usage-0.6c11.patch
patching file setuptools/command/sdist.py
Hunk #2 FAILED at 93.
1 out of 2 hunks FAILED -- rejects in file setuptools/command/sdist.py
Patch fix-log-usage-0.6c11.patch does not apply (enforce with -f)
ERROR: Printing the environment of the function
ERROR: Build of
/home/stefan/Projekte/OpenEmbedded/build/openmoko/openembedded/recipes/python/python-setuptools_0.6c11.bb
do_patch failed

Would be great if you could fix this and resend. Thanks.

regards
Stefan Schmidt

Patch

diff --git a/recipes/python/python-setuptools/fix-log-usage-0.6c11.patch b/recipes/python/python-setuptools/fix-log-usage-0.6c11.patch
new file mode 100644
index 0000000..b860700
--- /dev/null
+++ b/recipes/python/python-setuptools/fix-log-usage-0.6c11.patch
@@ -0,0 +1,18 @@ 
+--- a/setuptools/command/sdist.py	2010-02-22 14:57:56.000000000 +0100
++++ b/setuptools/command/sdist.py	2010-02-22 14:57:31.000000000 +0100
+@@ -1,6 +1,5 @@
+ from distutils.command.sdist import sdist as _sdist
+ from distutils.util import convert_path
+-from distutils import log
+ from glob import glob
+ import os, re, sys, pkg_resources
+ 
+@@ -94,7 +93,7 @@
+         try: svnver = int(data.splitlines()[0])
+         except: pass
+         if svnver<8:
+-            log.warn("unrecognized .svn/entries format in %s", dirname)
++            print("unrecognized .svn/entries format in %s", dirname)
+             return           
+         for record in map(str.splitlines, data.split('\n\x0c\n')[1:]):
+             if not record or len(record)>=6 and record[5]=="delete":
diff --git a/recipes/python/python-setuptools_0.6c11.bb b/recipes/python/python-setuptools_0.6c11.bb
new file mode 100644
index 0000000..bccafa4
--- /dev/null
+++ b/recipes/python/python-setuptools_0.6c11.bb
@@ -0,0 +1,22 @@ 
+DESCRIPTION = "Download, build, install, upgrade, and uninstall Python packages"
+HOMEPAGE = "http://cheeseshop.python.org/pypi/setuptools"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "MIT"
+DEPENDS_${PN}-native = "python-native"
+RDEPENDS_${PN} = "python-distutils python-compression"
+PR = "ml3"
+
+SRC_URI = "\
+  http://cheeseshop.python.org/packages/source/s/setuptools/${SRCNAME}-${PV}.tar.gz;name=setuptools \
+  file://fix-log-usage-0.6c11.patch;patch=1 \
+"
+SRC_URI[setuptools.md5sum] = "7df2a529a074f613b509fb44feefe74e"
+SRC_URI[setuptools.sha256sum] = "630fea9b726320b73ee3ca6ff61732cb32675b0389be658080fe46383b87a1d3"
+
+SRCNAME = "setuptools"
+S = "${WORKDIR}/${SRCNAME}-${PV}"
+
+inherit distutils
+
+BBCLASSEXTEND = "native"