license.bbclass: fix missing of license files on ubuntu build host
cover license.bbclass: fix missing of license files on ubuntu build host
From: Chen Qi <[email protected]>
The following changes since commit ea92671d9823e3667d6ced7ac2af20f991da404d:
bitbake: cooker: replace "w" file opening mode with "a" mode (2013-11-12 17:01:37 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib ChenQi/license-files
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=ChenQi/license-files
Chen Qi (1):
license.bbclass: fix missing of license files on ubuntu build host
meta/classes/license.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/1 license.bbclass: fix missing of license files on ubuntu build host
From: Chen Qi <[email protected]>
The license_create_manifest function contains bashism, this will lead to unexpected results on ubuntu build host, as sh is linked to dash on ubuntu. Even if COPY_LIC_MANIFEST and COPY_LIC_DIRS are enabled, the license files will still be missing on target.
This patch fixes the above problem.
[YOCTO #5549]
--- meta/classes/license.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/license.bbclass +2 -2
@@ -72,9 +72,9 @@ license_create_manifest() { # Really don't need to copy the generics as they're # represented in the manifest and in the actual pkg licenses # Doing so would make your image quite a bit larger - if [[ "${lic}" != "generic_"* ]]; then + if [ "${lic#generic_}" = "${lic}" ]; then cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} - elif [[ "${lic}" == "generic_"* ]]; then + else if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/ fi
Signature · 1 line
1.7.9.5