Revert "license.bbclass: fix copying license directories failed"

This reverts commit e58a1499accd74d3e6fe4f899711d4c680ebc18f.

It depends on other functionality not backported to dora.

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 247b154f80ac5a1f7eea240b6dd3c0795ca22052..b00ebb12e2c1b29eb3abc10397297a5c8aa29d8a 100644 (file)
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -68,16 +68,15 @@ license_create_manifest() {
                if [ -n "${COPY_LIC_DIRS}" ]; then
                        for pkg in ${INSTALLED_PKGS}; do
                                mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}
-                               pkged_pn="$(oe-pkgdata-util lookup-recipe ${PKGDATA_DIR} ${pkg})"
-                               for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do
+                               for lic in `ls ${LICENSE_DIRECTORY}/${pkg}`; do
                                        # 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_}" = "${lic}" ]; then
-                                               cp ${LICENSE_DIRECTORY}/${pkged_pn}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic}
+                                               cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic}
                                        else
                                                if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then
-                                                       cp ${LICENSE_DIRECTORY}/${pkged_pn}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/
+                                                       cp ${LICENSE_DIRECTORY}/${pkg}/${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/
                                                fi
                                                ln -s ../${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic}
                                        fi