Patchwork python: Fix re-execution problem due to patching configure and configure.in

login
register
mail settings
Submitter Richard Purdie
Date April 16, 2012, 9:47 a.m.
Message ID <1334569676.16992.67.camel@ted>
Download mbox | patch
Permalink /patch/25913/
State New
Headers show

Comments

Richard Purdie - April 16, 2012, 9:47 a.m.
There was a patch patching both configure and configure.in. Since the recipes
all autoreconf, this is pointless and means subsequent patch tasks fail.

The fix is to only patch configure.in.

[YOCTO #2194]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Koen Kooi - April 16, 2012, 10:50 a.m.
Op 16 apr. 2012, om 11:47 heeft Richard Purdie het volgende geschreven:

> There was a patch patching both configure and configure.in. Since the recipes
> all autoreconf, this is pointless and means subsequent patch tasks fail.
> 
> The fix is to only patch configure.in.
> 
> [YOCTO #2194]
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Since this changes the sources it needs a PR bump.

regards,

Koen
Richard Purdie - April 16, 2012, 11:10 a.m.
On Mon, 2012-04-16 at 12:50 +0200, Koen Kooi wrote:
> Op 16 apr. 2012, om 11:47 heeft Richard Purdie het volgende geschreven:
> 
> > There was a patch patching both configure and configure.in. Since the recipes
> > all autoreconf, this is pointless and means subsequent patch tasks fail.
> > 
> > The fix is to only patch configure.in.
> > 
> > [YOCTO #2194]
> > 
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> Since this changes the sources it needs a PR bump.

It has no effect on the packaged output which was always the criteria
for PR bumps as I understood things.

Cheers,

Richard
Koen Kooi - April 16, 2012, 11:27 a.m.
Op 16 apr. 2012, om 13:10 heeft Richard Purdie het volgende geschreven:

> On Mon, 2012-04-16 at 12:50 +0200, Koen Kooi wrote:
>> Op 16 apr. 2012, om 11:47 heeft Richard Purdie het volgende geschreven:
>> 
>>> There was a patch patching both configure and configure.in. Since the recipes
>>> all autoreconf, this is pointless and means subsequent patch tasks fail.
>>> 
>>> The fix is to only patch configure.in.
>>> 
>>> [YOCTO #2194]
>>> 
>>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> 
>> Since this changes the sources it needs a PR bump.
> 
> It has no effect on the packaged output which was always the criteria
> for PR bumps as I understood things.

But there's the exception for fixing failures like this so people don't have to -c clean(sstate) things.

regards,

Koen
Steve Sakoman - April 16, 2012, 3:31 p.m.
On Mon, Apr 16, 2012 at 4:27 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:

>>> Since this changes the sources it needs a PR bump.
>>
>> It has no effect on the packaged output which was always the criteria
>> for PR bumps as I understood things.
>
> But there's the exception for fixing failures like this so people don't have to -c clean(sstate) things.

Indeed, I had to do a manual -c cleansstate to get the benefit of this
batch of rebuild fixes.  The rebuilds all failed otherwise.

Steve
Richard Purdie - April 16, 2012, 3:51 p.m.
On Mon, 2012-04-16 at 08:31 -0700, Steve Sakoman wrote:
> On Mon, Apr 16, 2012 at 4:27 AM, Koen Kooi <koen@dominion.thruhere.net> wrote:
> 
> >>> Since this changes the sources it needs a PR bump.
> >>
> >> It has no effect on the packaged output which was always the criteria
> >> for PR bumps as I understood things.
> >
> > But there's the exception for fixing failures like this so people don't have to -c clean(sstate) things.
> 
> Indeed, I had to do a manual -c cleansstate to get the benefit of this
> batch of rebuild fixes.  The rebuilds all failed otherwise.

I did go back and add in a bunch of PR fixes but evidently not
enough :/.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch b/meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch
index ed52936..1cb8fea 100644
--- a/meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch
+++ b/meta/recipes-devtools/python/python-native/sys_platform_is_now_always_linux2.patch
@@ -14,17 +14,6 @@  Issue #12326: sys.platform is now always 'linux2' on Linux
 
 Even if Python is compiled on Linux 3.
 
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -2995,6 +2995,7 @@ then
- 	MACHDEP="$ac_md_system$ac_md_release"
- 
- 	case $MACHDEP in
-+	linux*) MACHDEP="linux2";;
- 	cygwin*) MACHDEP="cygwin";;
- 	darwin*) MACHDEP="darwin";;
- 	atheos*) MACHDEP="atheos";;
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in