summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-12-01 18:26:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 15:19:51 (GMT)
commitba10b7ff18c17f6850c7ae64caa286c8fa55e73e (patch)
tree6f91a1fab90323ac56838aff03ce003859c24779
parentce30381a7157bab905851571e3fee0d152fa2763 (diff)
downloadpoky-ba10b7ff18c17f6850c7ae64caa286c8fa55e73e.tar.gz
license.bbclass: Avoid grep error message
Touch a file that is later greped to make sure it exists. (From OE-Core rev: 178f0d6abfb443ed5d4cc5dab51fc2b78ffade2b) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index ec9aa8f..64da8b0 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -13,7 +13,7 @@ do_populate_lic[cleandirs] = "${LICSSTATEDIR}"
13license_create_manifest() { 13license_create_manifest() {
14 mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME} 14 mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME}
15 # Get list of installed packages 15 # Get list of installed packages
16 list_installed_packages | grep -v "locale" |sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest 16 list_installed_packages | grep -v "locale" | sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
17 INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest` 17 INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`
18 LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest" 18 LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest"
19 # remove existing license.manifest file 19 # remove existing license.manifest file
@@ -21,6 +21,7 @@ license_create_manifest() {
21 rm ${LICENSE_MANIFEST} 21 rm ${LICENSE_MANIFEST}
22 fi 22 fi
23 # list of installed packages is broken for deb 23 # list of installed packages is broken for deb
24 touch ${LICENSE_MANIFEST}
24 for pkg in ${INSTALLED_PKGS}; do 25 for pkg in ${INSTALLED_PKGS}; do
25 # not the best way to do this but licenses are not arch dependant iirc 26 # not the best way to do this but licenses are not arch dependant iirc
26 filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1` 27 filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1`