[oe] [PATCH] packaged-staging.bbclass: fix issue with no SRC_URI

[Khem Raj]

On (07/06/10 09:40), Cliff Brake wrote:
> On Fri, Jun 4, 2010 at 3:47 PM, Chris Larson <clarson at kergoth.com> wrote:
> > Please change ${srcuri} to $srcuri, so its very clear that its expanded in
> > shell, rather than letting bitbake try to expand it and fail since its unset
> > :)
> >
> > After that, Acked-by: Chris Larson <chris_larson at mentor.com>
> 
> Thanks!  Updated patch attached.  Can I get one more ack?
> 
> Thanks,
> Cliff

> From de0cd8124077b62e96d3c3487b5d8cecab55d837 Mon Sep 17 00:00:00 2001
> From: Cliff Brake <cbrake at bec-systems.com>
> Date: Wed, 2 Jun 2010 14:03:15 -0400
> Subject: [PATCH] packaged-staging.bbclass: fix issue with no SRC_URI
> 
> Currently with srctree, we get errors like the following:
> | + srcuri=
> | + '[' '' == '' ']'
> | + srcuri=OpenEmbedded
> | + echo 'Source: '
> | ++ find /scratch/oe/oe-build/oe/build/angstrom-2008.1/tmp/work/armv5te-angstrom-linux-gnueabi/autotools-demo-1.0-28-g3a96627-r0/staging-pkg '(' -name '*.la' -o -name '*-config' ')' -type f
> | + stage-manager-ipkg-build -o 0 -g 0 /scratch/oe/oe-build/oe/build/angstrom-2008.1/tmp/work/armv5te-angstrom-linux-gnueabi/autotools-demo-1.0-28-g3a96627-r0/staging-pkg /scratch/oe/oe-build/oe/build/angstrom-2008.1/tmp/pstage/angstromglibc
> | *** Error: CONTROL/control is missing field Source
> | The Source field contain the URL's or filenames of the source code and any patches
> | used to build this package.  Either gnu-style tarballs or Debian source packages
> | are acceptable.  Relative filenames may be used if they are distributed in the same
> | directory as the .ipk file.
> |
> | ipkg-build: Please fix the above errors and try again.
> | ERROR: Function staging_packager failed
> NOTE: package autotools-demo-1.0-28-g3a96627-r0: task do_package_stage: Failed
> ERROR: TaskFailed event exception, aborting
> 
> This patch fixes that issue.
> 
> Acked-by: Chris Larson <chris_larson at mentor.com>

Acked-by: Khem Raj <raj.khem at gmail.com

>
> ---
>  classes/packaged-staging.bbclass |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
> index 83f3578..68c973a 100644
> --- a/classes/packaged-staging.bbclass
> +++ b/classes/packaged-staging.bbclass
> @@ -374,7 +374,7 @@ staging_packager () {
>  	if [ "$srcuri" == "" ]; then
>  		srcuri="OpenEmbedded"
>  	fi
> -	echo "Source: ${SRC_URI}"               >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
> +	echo "Source: $srcuri"               >> ${PSTAGE_TMPDIR_STAGE}/CONTROL/control
>  
>  	# Deal with libtool not supporting sysroots
>  	# Need to remove hardcoded paths and fix these when we install the
> -- 
> 1.7.0.4
> 

> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel