diff options
author | Elizabeth Flanagan <elizabeth.flanagan@intel.com> | 2012-05-30 16:34:40 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-05 23:04:59 +0100 |
commit | f25a6c09daf00bc7d1d6af00998340c76dcc91e1 (patch) | |
tree | 4709155eab1136c43fcc1a6dcbb4705ec3859581 /meta | |
parent | 7f713b64bfa1be8d41d1c8c8e18770c1f3ab8e74 (diff) | |
download | poky-f25a6c09daf00bc7d1d6af00998340c76dcc91e1.tar.gz |
license.bbclass: Adding PV to package.manifest
Per request, adding the package version to the package manifest
file.
(From OE-Core rev: bf216369f3131ad38c0b2b92620e4805ca9eecb9)
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/license.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 6c4a6739f2..a5374969dc 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -90,11 +90,13 @@ license_create_manifest() { | |||
90 | for filename in $files; do | 90 | for filename in $files; do |
91 | pkged_pn="$(sed -n 's/^PN: //p' ${filename})" | 91 | pkged_pn="$(sed -n 's/^PN: //p' ${filename})" |
92 | pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})" | 92 | pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})" |
93 | pkged_pv="$(sed -n 's/^PV: //p' ${filename})" | ||
93 | # check to see if the package name exists in the manifest. if so, bail. | 94 | # check to see if the package name exists in the manifest. if so, bail. |
94 | if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then | 95 | if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then |
95 | # exclude local recipes | 96 | # exclude local recipes |
96 | if [ ! "${pkged_pn}" = "*locale*" ]; then | 97 | if [ ! "${pkged_pn}" = "*locale*" ]; then |
97 | echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest | 98 | echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest |
99 | echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest | ||
98 | echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest | 100 | echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest |
99 | echo "LICENSE: " >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest | 101 | echo "LICENSE: " >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest |
100 | for lic in ${pkged_lic}; do | 102 | for lic in ${pkged_lic}; do |