* [PATCH] python: Fix re-execution problem due to patching configure and configure.in
@ 2012-04-16 9:47 Richard Purdie
2012-04-16 10:50 ` Koen Kooi
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2012-04-16 9:47 UTC (permalink / raw)
To: openembedded-core
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>
---
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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] python: Fix re-execution problem due to patching configure and configure.in
2012-04-16 9:47 [PATCH] python: Fix re-execution problem due to patching configure and configure.in Richard Purdie
@ 2012-04-16 10:50 ` Koen Kooi
2012-04-16 11:10 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2012-04-16 10:50 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] python: Fix re-execution problem due to patching configure and configure.in
2012-04-16 10:50 ` Koen Kooi
@ 2012-04-16 11:10 ` Richard Purdie
2012-04-16 11:27 ` Koen Kooi
0 siblings, 1 reply; 6+ messages in thread
From: Richard Purdie @ 2012-04-16 11:10 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] python: Fix re-execution problem due to patching configure and configure.in
2012-04-16 11:10 ` Richard Purdie
@ 2012-04-16 11:27 ` Koen Kooi
2012-04-16 15:31 ` Steve Sakoman
0 siblings, 1 reply; 6+ messages in thread
From: Koen Kooi @ 2012-04-16 11:27 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] python: Fix re-execution problem due to patching configure and configure.in
2012-04-16 11:27 ` Koen Kooi
@ 2012-04-16 15:31 ` Steve Sakoman
2012-04-16 15:51 ` Richard Purdie
0 siblings, 1 reply; 6+ messages in thread
From: Steve Sakoman @ 2012-04-16 15:31 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] python: Fix re-execution problem due to patching configure and configure.in
2012-04-16 15:31 ` Steve Sakoman
@ 2012-04-16 15:51 ` Richard Purdie
0 siblings, 0 replies; 6+ messages in thread
From: Richard Purdie @ 2012-04-16 15:51 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-16 16:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-16 9:47 [PATCH] python: Fix re-execution problem due to patching configure and configure.in Richard Purdie
2012-04-16 10:50 ` Koen Kooi
2012-04-16 11:10 ` Richard Purdie
2012-04-16 11:27 ` Koen Kooi
2012-04-16 15:31 ` Steve Sakoman
2012-04-16 15:51 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox