aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-11 07:55:37 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-11 07:55:37 -0700
commite57a86a68ecd059478f087ac7453c6f9253fa887 (patch)
tree7b945a05efebfcfef4e6f1c3f7f3bc85b017f6f5
parent18f34944696a8098daf33a94bc2f532deb217d0a (diff)
downloadopenembedded-core-contrib-e57a86a68ecd059478f087ac7453c6f9253fa887.tar.gz
openembedded-core-contrib-e57a86a68ecd059478f087ac7453c6f9253fa887.tar.bz2
openembedded-core-contrib-e57a86a68ecd059478f087ac7453c6f9253fa887.zip
Revert "license.bbclass: fix copying license directories failed"
This reverts commit e58a1499accd74d3e6fe4f899711d4c680ebc18f. It depends on other functionality not backported to dora.
-rw-r--r--meta/classes/license.bbclass7
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() {
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