Patchwork [05/26] setuptools: Make options for setup.py more flexible

login
register
mail settings
Submitter Saul Wold
Date May 5, 2011, 7:55 a.m.
Message ID <70f1d28d6c05982c3b06abe5ce069705dfd1fee9.1304581769.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/3207/
State New, archived
Headers show

Comments

Saul Wold - May 5, 2011, 7:55 a.m.
From: Gary Thomas <gary@mlbassoc.com>

The setuptools class uses hard-wired options for 'setup.py' during
the install step.  In particular, not all versions of setup.py
support the "--single-version-externally-managed" option.  This
patch allows for a recipe to easily override these options, while
leaving the majority (important) setup options intact.

--
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

>From 0afbe6b9477c207e37009c8ef5aa47b3438640a9 Mon Sep 17 00:00:00 2001
From: Gary Thomas <gary@mlbassoc.com>
Date: Wed, 13 Apr 2011 15:12:57 -0600
Subject: [PATCH] setuptools: Make options for setup.py more flexible

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/setuptools.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
Koen Kooi - May 5, 2011, 8:09 a.m.
I NAK'ed this before, and will NAK it again.

See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-April/001265.html

Op 5 mei 2011, om 09:55 heeft Saul Wold het volgende geschreven:

> From: Gary Thomas <gary@mlbassoc.com>
> 
> The setuptools class uses hard-wired options for 'setup.py' during
> the install step.  In particular, not all versions of setup.py
> support the "--single-version-externally-managed" option.  This
> patch allows for a recipe to easily override these options, while
> leaving the majority (important) setup options intact.
> 
> --
> ------------------------------------------------------------
> Gary Thomas                 |  Consulting for the
> MLB Associates              |    Embedded world
> ------------------------------------------------------------
> 
>> From 0afbe6b9477c207e37009c8ef5aa47b3438640a9 Mon Sep 17 00:00:00 2001
> From: Gary Thomas <gary@mlbassoc.com>
> Date: Wed, 13 Apr 2011 15:12:57 -0600
> Subject: [PATCH] setuptools: Make options for setup.py more flexible
> 
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
> meta/classes/setuptools.bbclass |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/classes/setuptools.bbclass b/meta/classes/setuptools.bbclass
> index ced9509..cf1c224 100644
> --- a/meta/classes/setuptools.bbclass
> +++ b/meta/classes/setuptools.bbclass
> @@ -2,7 +2,8 @@ inherit distutils
> 
> DEPENDS += "python-setuptools-native"
> 
> +DISTUTILS_INSTALL_OPTS ?= "--single-version-externally-managed "
> DISTUTILS_INSTALL_ARGS = "--root=${D} \
> -    --single-version-externally-managed \
> +    ${DISTUTILS_INSTALL_OPTS} \
>     --prefix=${prefix} \
>     --install-data=${datadir}"
> -- 
> 1.7.1.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Saul Wold - May 5, 2011, 8:13 a.m.
On 05/05/2011 01:09 AM, Koen Kooi wrote:
> I NAK'ed this before, and will NAK it again.
>
Sorry, this one slipped in with a load of others, I meant to delete it, 
but it got missed.

RP, Please remove this one

Sau!

> See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-April/001265.html
>
> Op 5 mei 2011, om 09:55 heeft Saul Wold het volgende geschreven:
>
>> From: Gary Thomas<gary@mlbassoc.com>
>>
>> The setuptools class uses hard-wired options for 'setup.py' during
>> the install step.  In particular, not all versions of setup.py
>> support the "--single-version-externally-managed" option.  This
>> patch allows for a recipe to easily override these options, while
>> leaving the majority (important) setup options intact.
>>
>> --
>> ------------------------------------------------------------
>> Gary Thomas                 |  Consulting for the
>> MLB Associates              |    Embedded world
>> ------------------------------------------------------------
>>
>>>  From 0afbe6b9477c207e37009c8ef5aa47b3438640a9 Mon Sep 17 00:00:00 2001
>> From: Gary Thomas<gary@mlbassoc.com>
>> Date: Wed, 13 Apr 2011 15:12:57 -0600
>> Subject: [PATCH] setuptools: Make options for setup.py more flexible
>>
>> Signed-off-by: Gary Thomas<gary@mlbassoc.com>
>> Signed-off-by: Saul Wold<sgw@linux.intel.com>
>> ---
>> meta/classes/setuptools.bbclass |    3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/meta/classes/setuptools.bbclass b/meta/classes/setuptools.bbclass
>> index ced9509..cf1c224 100644
>> --- a/meta/classes/setuptools.bbclass
>> +++ b/meta/classes/setuptools.bbclass
>> @@ -2,7 +2,8 @@ inherit distutils
>>
>> DEPENDS += "python-setuptools-native"
>>
>> +DISTUTILS_INSTALL_OPTS ?= "--single-version-externally-managed "
>> DISTUTILS_INSTALL_ARGS = "--root=${D} \
>> -    --single-version-externally-managed \
>> +    ${DISTUTILS_INSTALL_OPTS} \
>>      --prefix=${prefix} \
>>      --install-data=${datadir}"
>> --
>> 1.7.1.1
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Patch

diff --git a/meta/classes/setuptools.bbclass b/meta/classes/setuptools.bbclass
index ced9509..cf1c224 100644
--- a/meta/classes/setuptools.bbclass
+++ b/meta/classes/setuptools.bbclass
@@ -2,7 +2,8 @@  inherit distutils
 
 DEPENDS += "python-setuptools-native"
 
+DISTUTILS_INSTALL_OPTS ?= "--single-version-externally-managed "
 DISTUTILS_INSTALL_ARGS = "--root=${D} \
-    --single-version-externally-managed \
+    ${DISTUTILS_INSTALL_OPTS} \
     --prefix=${prefix} \
     --install-data=${datadir}"