diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-03-25 18:20:36 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-25 11:17:20 +0000 |
commit | e44e75e57673baf1cd8021df562c03dec04258fc (patch) | |
tree | 676728ebed65fe3518d2a26fa7bc4d1aaff0c6df /meta/classes | |
parent | 023c35795ff8edd79bb27848a01dd49239f052d4 (diff) | |
download | poky-e44e75e57673baf1cd8021df562c03dec04258fc.tar.gz |
license.bbclass: fix copying license directories failed
For each recipe, it populated license files to ${LICENSE_DIRECTORY}/${PN},
such as kernel's license dir was ${LICENSE_DIRECTORY}/kernel-3.10.17-yocto-standard;
In do_rootfs task, it copied license directories from ${LICENSE_DIRECTORY}/
${pkg}, and ${pkg} was listed in ${INSTALLED_PKGS};
We got ${INSTALLED_PKGS} by rpm query, such as the kernel were 'kernel-*',
but the kernel's PN was linux-yocto, so searching ${LICENSE_DIRECTORY}/
kernel-* failed.
Copied license directories from ${LICENSE_DIRECTORY}/${PN} fixed this
issue.
[YOCTO #5572]
(From OE-Core rev: 4e00554dfc68b1aad07e161921c27807511420b1)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/license.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index b00ebb12e2..99cb195d0b 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -68,15 +68,18 @@ license_create_manifest() { | |||
68 | if [ -n "${COPY_LIC_DIRS}" ]; then | 68 | if [ -n "${COPY_LIC_DIRS}" ]; then |
69 | for pkg in ${INSTALLED_PKGS}; do | 69 | for pkg in ${INSTALLED_PKGS}; do |
70 | mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg} | 70 | mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg} |
71 | for lic in `ls ${LICENSE_DIRECTORY}/${pkg}`; do | 71 | pkged_pn="$(sed -n "/^PACKAGE NAME: ${pkg}$/,/^$/ \ |
72 | {s/^RECIPE NAME: //; /^PACKAGE NAME:/d; /^PACKAGE VERSION:/d; /^LICENSE:/d; p}" \ | ||
73 | ${LICENSE_MANIFEST})" | ||
74 | for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do | ||
72 | # Really don't need to copy the generics as they're | 75 | # Really don't need to copy the generics as they're |
73 | # represented in the manifest and in the actual pkg licenses | 76 | # represented in the manifest and in the actual pkg licenses |
74 | # Doing so would make your image quite a bit larger | 77 | # Doing so would make your image quite a bit larger |
75 | if [ "${lic#generic_}" = "${lic}" ]; then | 78 | if [ "${lic#generic_}" = "${lic}" ]; then |
76 | cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} | 79 | cp ${LICENSE_DIRECTORY}/${pkged_pn}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} |
77 | else | 80 | else |
78 | if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then | 81 | if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then |
79 | cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/ | 82 | cp ${LICENSE_DIRECTORY}/${pkged_pn}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/ |
80 | fi | 83 | fi |
81 | ln -s ../${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} | 84 | ln -s ../${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} |
82 | fi | 85 | fi |