[PATCH] quilt: disable packaged staging on native builds

[PATCH] quilt: disable packaged staging on native builds

[Jason Kridner]

Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
---
 recipes/quilt/quilt-native.inc |    3 +++
 recipes/quilt/quilt_0.48.bb    |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/recipes/quilt/quilt-native.inc b/recipes/quilt/quilt-native.inc
index 10d8183..f422b63 100644
--- a/recipes/quilt/quilt-native.inc
+++ b/recipes/quilt/quilt-native.inc
@@ -6,6 +6,9 @@ RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
 FILESPATHPKG =. quilt-${PV}
 INHIBIT_AUTOTOOLS_DEPS = "1"
 
+# Several packages fail to patch when using quilt from packaged staging
+PSTAGING_DISABLED_virtclass-native = "1"
+
 inherit autotools native
 
 PATCHTOOL = "patch"
diff --git a/recipes/quilt/quilt_0.48.bb b/recipes/quilt/quilt_0.48.bb
index 0a066df..99dc2a2 100644
--- a/recipes/quilt/quilt_0.48.bb
+++ b/recipes/quilt/quilt_0.48.bb
@@ -1,6 +1,6 @@
 require quilt-package.inc
 
-PR="r1"
+PR="r2"
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
-- 
1.5.6.4

Re: [PATCH] quilt: disable packaged staging on native builds

[Frans Meulenbroeks]

2010/8/17 Jason Kridner <jkridner@beagleboard.org>:
>
> Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
> ---
>  recipes/quilt/quilt-native.inc |    3 +++
>  recipes/quilt/quilt_0.48.bb    |    2 +-
>  2 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/recipes/quilt/quilt-native.inc b/recipes/quilt/quilt-native.inc
> index 10d8183..f422b63 100644
> --- a/recipes/quilt/quilt-native.inc
> +++ b/recipes/quilt/quilt-native.inc
> @@ -6,6 +6,9 @@ RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
>  FILESPATHPKG =. quilt-${PV}
>  INHIBIT_AUTOTOOLS_DEPS = "1"
>
> +# Several packages fail to patch when using quilt from packaged staging
> +PSTAGING_DISABLED_virtclass-native = "1"
> +
>  inherit autotools native
>
>  PATCHTOOL = "patch"
> diff --git a/recipes/quilt/quilt_0.48.bb b/recipes/quilt/quilt_0.48.bb
> index 0a066df..99dc2a2 100644
> --- a/recipes/quilt/quilt_0.48.bb
> +++ b/recipes/quilt/quilt_0.48.bb
> @@ -1,6 +1,6 @@
>  require quilt-package.inc
>
> -PR="r1"
> +PR="r2"
>
>  SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
>  SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
> --
> 1.5.6.4

I have some concerns with this patch.
I have a quilt native in my pstage dir from aug 7. (pstage is outside TMPDIR)
Just did a bitbake beagleboard-demo-image after removing TMPDIR, with
quilt-native and quite some other packages in my pstage dir.
I am at "Running task 7313 of 11636", lots of packages have been
compiled and no patch has failed.

My proposal is to put this patch on hold until proven to be an issue
by someone else.

Frans

Re: [PATCH] quilt: disable packaged staging on native builds

[Chris Larson]

On Tue, Aug 17, 2010 at 1:03 PM, Frans Meulenbroeks <
fransmeulenbroeks@gmail.com> wrote:

> 2010/8/17 Jason Kridner <jkridner@beagleboard.org>:
> >
> > Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
> > ---
> >  recipes/quilt/quilt-native.inc |    3 +++
> >  recipes/quilt/quilt_0.48.bb    |    2 +-
> >  2 files changed, 4 insertions(+), 1 deletions(-)
> >
> > diff --git a/recipes/quilt/quilt-native.inc
> b/recipes/quilt/quilt-native.inc
> > index 10d8183..f422b63 100644
> > --- a/recipes/quilt/quilt-native.inc
> > +++ b/recipes/quilt/quilt-native.inc
> > @@ -6,6 +6,9 @@ RDEPENDS_${PN} = "diffstat-native patch-native
> bzip2-native util-linux-native"
> >  FILESPATHPKG =. quilt-${PV}
> >  INHIBIT_AUTOTOOLS_DEPS = "1"
> >
> > +# Several packages fail to patch when using quilt from packaged staging
> > +PSTAGING_DISABLED_virtclass-native = "1"
> > +
> >  inherit autotools native
> >
> >  PATCHTOOL = "patch"
> > diff --git a/recipes/quilt/quilt_0.48.bb b/recipes/quilt/quilt_0.48.bb
> > index 0a066df..99dc2a2 100644
> > --- a/recipes/quilt/quilt_0.48.bb
> > +++ b/recipes/quilt/quilt_0.48.bb
> > @@ -1,6 +1,6 @@
> >  require quilt-package.inc
> >
> > -PR="r1"
> > +PR="r2"
> >
> >  SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
> >  SRC_URI[sha256sum] =
> "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
> > --
> > 1.5.6.4
>
> I have some concerns with this patch.
> I have a quilt native in my pstage dir from aug 7. (pstage is outside
> TMPDIR)
> Just did a bitbake beagleboard-demo-image after removing TMPDIR, with
> quilt-native and quite some other packages in my pstage dir.
> I am at "Running task 7313 of 11636", lots of packages have been
> compiled and no patch has failed.
>
> My proposal is to put this patch on hold until proven to be an issue
> by someone else.


Did you build with TMPDIR in a *different* location using prebuilts?  If not
you didn't prove anything at all about the relocatability of quilt.  If a
package isn't relocatable, it shouldn't be enabled for pstaging, as the
package can't be used reliably.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

Re: [PATCH] quilt: disable packaged staging on native builds

[Frans Meulenbroeks]

2010/8/17 Chris Larson <clarson@kergoth.com>:
> On Tue, Aug 17, 2010 at 1:03 PM, Frans Meulenbroeks <
> fransmeulenbroeks@gmail.com> wrote:
>
>> 2010/8/17 Jason Kridner <jkridner@beagleboard.org>:
>> >
>> > Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
>> > ---
>> >  recipes/quilt/quilt-native.inc |    3 +++
>> >  recipes/quilt/quilt_0.48.bb    |    2 +-
>> >  2 files changed, 4 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/recipes/quilt/quilt-native.inc
>> b/recipes/quilt/quilt-native.inc
>> > index 10d8183..f422b63 100644
>> > --- a/recipes/quilt/quilt-native.inc
>> > +++ b/recipes/quilt/quilt-native.inc
>> > @@ -6,6 +6,9 @@ RDEPENDS_${PN} = "diffstat-native patch-native
>> bzip2-native util-linux-native"
>> >  FILESPATHPKG =. quilt-${PV}
>> >  INHIBIT_AUTOTOOLS_DEPS = "1"
>> >
>> > +# Several packages fail to patch when using quilt from packaged staging
>> > +PSTAGING_DISABLED_virtclass-native = "1"
>> > +
>> >  inherit autotools native
>> >
>> >  PATCHTOOL = "patch"
>> > diff --git a/recipes/quilt/quilt_0.48.bb b/recipes/quilt/quilt_0.48.bb
>> > index 0a066df..99dc2a2 100644
>> > --- a/recipes/quilt/quilt_0.48.bb
>> > +++ b/recipes/quilt/quilt_0.48.bb
>> > @@ -1,6 +1,6 @@
>> >  require quilt-package.inc
>> >
>> > -PR="r1"
>> > +PR="r2"
>> >
>> >  SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
>> >  SRC_URI[sha256sum] =
>> "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"
>> > --
>> > 1.5.6.4
>>
>> I have some concerns with this patch.
>> I have a quilt native in my pstage dir from aug 7. (pstage is outside
>> TMPDIR)
>> Just did a bitbake beagleboard-demo-image after removing TMPDIR, with
>> quilt-native and quite some other packages in my pstage dir.
>> I am at "Running task 7313 of 11636", lots of packages have been
>> compiled and no patch has failed.
>>
>> My proposal is to put this patch on hold until proven to be an issue
>> by someone else.
>
>
> Did you build with TMPDIR in a *different* location using prebuilts?  If not
> you didn't prove anything at all about the relocatability of quilt.  If a
> package isn't relocatable, it shouldn't be enabled for pstaging, as the
> package can't be used reliably.

No, this was with TMPDIR at the same place.

Outside of this (as I also read Tom's reply, so I know there is a fix,
or at least in the works):
There are two reasons to use pstaging:
1: giving them to others so they can rebuild faster
2: keeping them for yourself so you can rm TMPDIR and rebuild faster.
I belong to the second group (and I guess atm most of the pstage users).
But for group 1 relocatability is indeed important.

I guess we should be able to find this (QA step?) by doing a grep in
the package (or image dir) to see TMPDIR is in the executables (and
maybe other files in the image).

One more thing:
If there is a reported failure of pstaging, I would suggest that the
people reporting it would save the offending package so it can be
analysed and compared with the proper package.

Frans.

Re: [PATCH] quilt: disable packaged staging on native builds

[Tom Rini]

Jason Kridner wrote:
> Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
> ---
>  recipes/quilt/quilt-native.inc |    3 +++
>  recipes/quilt/quilt_0.48.bb    |    2 +-
>  2 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes/quilt/quilt-native.inc b/recipes/quilt/quilt-native.inc
> index 10d8183..f422b63 100644
> --- a/recipes/quilt/quilt-native.inc
> +++ b/recipes/quilt/quilt-native.inc
> @@ -6,6 +6,9 @@ RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
>  FILESPATHPKG =. quilt-${PV}
>  INHIBIT_AUTOTOOLS_DEPS = "1"
>  
> +# Several packages fail to patch when using quilt from packaged staging
> +PSTAGING_DISABLED_virtclass-native = "1"
> +
>  inherit autotools native
>  
>  PATCHTOOL = "patch"
> diff --git a/recipes/quilt/quilt_0.48.bb b/recipes/quilt/quilt_0.48.bb
> index 0a066df..99dc2a2 100644
> --- a/recipes/quilt/quilt_0.48.bb
> +++ b/recipes/quilt/quilt_0.48.bb
> @@ -1,6 +1,6 @@
>  require quilt-package.inc
>  
> -PR="r1"
> +PR="r2"
>  
>  SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
>  SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"

After some poking, testing and what I pushed recently, NAK.  What's 
going on here is that we didn't have a real non-legacy staging.  As seen 
in quilt-package.inc, the normal autotools install rules don't move the 
install around for us, so we ended up with, in some cases (No, I can't 
explain why off the top of my head, but yes, I've seen both what Jason 
saw and what Frans saw in the past) empty pstaging packages, which means 
no quilt, and a certain failure to apply patches.  To Chris' concern, 
I've gotten past the point of a patch being applied with quilt-native 
from pstaging from a TMPDIR named differently than what I extracted 
pstaging into.

-- 
Tom Rini
Mentor Graphics Corporation