diff options
| -rw-r--r-- | meta/classes/license.bbclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 247b154f80..b00ebb12e2 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
| @@ -68,16 +68,15 @@ 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 | pkged_pn="$(oe-pkgdata-util lookup-recipe ${PKGDATA_DIR} ${pkg})" | 71 | for lic in `ls ${LICENSE_DIRECTORY}/${pkg}`; do |
| 72 | for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do | ||
| 73 | # Really don't need to copy the generics as they're | 72 | # Really don't need to copy the generics as they're |
| 74 | # represented in the manifest and in the actual pkg licenses | 73 | # represented in the manifest and in the actual pkg licenses |
| 75 | # Doing so would make your image quite a bit larger | 74 | # Doing so would make your image quite a bit larger |
| 76 | if [ "${lic#generic_}" = "${lic}" ]; then | 75 | if [ "${lic#generic_}" = "${lic}" ]; then |
| 77 | cp ${LICENSE_DIRECTORY}/${pkged_pn}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} | 76 | cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} |
| 78 | else | 77 | else |
| 79 | if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then | 78 | if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then |
| 80 | cp ${LICENSE_DIRECTORY}/${pkged_pn}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/ | 79 | cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/ |
| 81 | fi | 80 | fi |
| 82 | ln -s ../${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} | 81 | ln -s ../${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic} |
| 83 | fi | 82 | fi |
