From: Hongxu Jia <hongxu.jia@windriver.com>
Date: Mon, 27 Jan 2014 01:49:08 +0000 (+0800)
Subject: license.bbclass: fix license_create_manifest failed
X-Git-Tag: 2015-4~3721
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=39f8658033c886fedefc9038a673f9a5edad7d26;p=openembedded-core.git

license.bbclass: fix license_create_manifest failed

While rpm incremental image generation enabled, invoked
license_create_manifest failed.
...
| ln: failed to create symbolic link 'tmp/work/qemux86_
64-poky-linux/core-image-base/1.0-r0/rootfs/usr/share/
common-licenses/alsa-conf-base/generic_GPLv2':File exists
| WARNING:tmp/work/qemux86_64-poky-linux/core-image-base/
1.0-r0/temp/run.license_create_manifest.26327:1 exit 1 from
|   ln -s ../${lic}/home/jiahongxu/yocto/build-20140120-
yocto-qemux86-64/tmp/work/qemux86_64-poky-linux/core-image
-base/1.0-r0/rootfs/usr/share/common-licenses/${pkg}/${lic}
...

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 16cadf9e2c..c668783742 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -85,7 +85,7 @@ license_create_manifest() {
 						if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then
 							cp ${LICENSE_DIRECTORY}/${pkged_pn}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/
 						fi
-						ln -s ../${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic}
+						ln -sf ../${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic}
 					fi
 				done
 			done