[oe-commits] Mark Hatle : license.bbclass: Avoid grep error message
git at git.openembedded.org
git at git.openembedded.org
Thu Feb 14 15:19:49 UTC 2013
Module: openembedded-core.git
Branch: danny
Commit: 178f0d6abfb443ed5d4cc5dab51fc2b78ffade2b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=178f0d6abfb443ed5d4cc5dab51fc2b78ffade2b
Author: Mark Hatle <mark.hatle at windriver.com>
Date: Sat Dec 1 12:26:00 2012 -0600
license.bbclass: Avoid grep error message
Touch a file that is later greped to make sure it exists.
Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/license.bbclass | 3 ++-
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}"
license_create_manifest() {
mkdir -p ${LICENSE_DIRECTORY}/${IMAGE_NAME}
# Get list of installed packages
- list_installed_packages | grep -v "locale" |sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
+ list_installed_packages | grep -v "locale" | sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`
LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest"
# remove existing license.manifest file
@@ -21,6 +21,7 @@ license_create_manifest() {
rm ${LICENSE_MANIFEST}
fi
# list of installed packages is broken for deb
+ touch ${LICENSE_MANIFEST}
for pkg in ${INSTALLED_PKGS}; do
# not the best way to do this but licenses are not arch dependant iirc
filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1`
More information about the Openembedded-commits
mailing list