[oe-commits] Hongxu Jia : license.bbclass: fix license_create_manifest failed

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 39f8658033c886fedefc9038a673f9a5edad7d26
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=39f8658033c886fedefc9038a673f9a5edad7d26

Author: Hongxu Jia <hongxu.jia at windriver.com>
Date:   Mon Jan 27 09:49:08 2014 +0800

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 at windriver.com>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>

---

 meta/classes/license.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 16cadf9..c668783 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