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

Tom Rini tom_rini at mentor.com
Wed Aug 18 01:14:58 UTC 2010


Jason Kridner wrote:
> Signed-off-by: Jason Kridner <jkridner at 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





More information about the Openembedded-devel mailing list