diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-12-01 12:26:00 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:31:08 +0000 |
| commit | dde5e6402ad8284d55effc032cfbe1bb21867778 (patch) | |
| tree | 9cf7ba59bb78c3cfd910862a8636705fa102114b | |
| parent | 4d4915a3837a28775e95d739a925df74b197ee33 (diff) | |
| download | poky-dde5e6402ad8284d55effc032cfbe1bb21867778.tar.gz | |
license.bbclass: Avoid grep error message
Touch a file that is later greped to make sure it exists.
(From OE-Core rev: a17bf5d840b5777918f324d26e085498dec86b76)
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.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index c7ca4a636e..66cde1c03e 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
| @@ -13,7 +13,7 @@ do_populate_lic[cleandirs] = "${LICSSTATEDIR}" | |||
| 13 | license_create_manifest() { | 13 | license_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` |
