packaged-staging.bbclass: fix issue with no SRC_URI
authorCliff Brake <cbrake@bec-systems.com>
Wed, 2 Jun 2010 18:03:15 +0000 (14:03 -0400)
committerCliff Brake <cbrake@bec-systems.com>
Mon, 7 Jun 2010 16:33:24 +0000 (12:33 -0400)
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@mentor.com>
Acked-by: Koen Kooi <k-kooi@ti.com>
Acked-by: Khem Raj <raj.khem@gmail.com
classes/packaged-staging.bbclass

index 83f3578..68c973a 100644 (file)
@@ -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