[OE-core] [PATCH 1/1] license.bbclass: Adding PV to package.manifest
Saul Wold
sgw at linux.intel.com
Fri Jun 1 07:12:32 UTC 2012
On 05/30/2012 04:39 PM, Elizabeth Flanagan wrote:
> Per request, adding the package version to the package manifest
> file.
>
> Signed-off-by: Elizabeth Flanagan<elizabeth.flanagan at intel.com>
> ---
> 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 6c4a673..a537496 100644
> --- a/meta/classes/license.bbclass
> +++ b/meta/classes/license.bbclass
> @@ -90,11 +90,13 @@ license_create_manifest() {
> for filename in $files; do
> pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
> pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})"
> + pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
> # check to see if the package name exists in the manifest. if so, bail.
> if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then
> # exclude local recipes
> if [ ! "${pkged_pn}" = "*locale*" ]; then
> echo "PACKAGE NAME:" ${pkg}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
> + echo "PACKAGE VERSION:" ${pkged_pv}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
> echo "RECIPE NAME:" ${pkged_pn}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
> echo "LICENSE: ">> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
> for lic in ${pkged_lic}; do
Beth,
Your patches don't seem to apply together, if I apply one the other
fails or the reverse.
Can you rebase appropriately
Sau!
More information about the Openembedded-core
mailing list