aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCliff Brake <cbrake@bec-systems.com>2010-06-02 14:03:15 -0400
committerCliff Brake <cbrake@bec-systems.com>2010-06-07 12:33:24 -0400
commitdd61383cc90c3083c1321fa896fb6b135d5d133b (patch)
treeebecfc885f5cc2571c106e94ba2be7c1ee19aa5f
parent5e813f8a9e1b607233f3794b2c981ce1d8c84fac (diff)
downloadopenembedded-dd61383cc90c3083c1321fa896fb6b135d5d133b.tar.gz
openembedded-dd61383cc90c3083c1321fa896fb6b135d5d133b.tar.bz2
openembedded-dd61383cc90c3083c1321fa896fb6b135d5d133b.zip
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@mentor.com> Acked-by: Koen Kooi <k-kooi@ti.com> Acked-by: Khem Raj <raj.khem@gmail.com
-rw-r--r--classes/packaged-staging.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 83f35788bc..68c973a9c7 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