Revert "license.bbclass: fix copying license directories failed"
This reverts commit e58a1499ac
.
It depends on other functionality not backported to dora.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
d0e55dd0ef
commit
9e89b4eec4
|
@ -68,16 +68,15 @@ license_create_manifest() {
|
||||||
if [ -n "${COPY_LIC_DIRS}" ]; then
|
if [ -n "${COPY_LIC_DIRS}" ]; then
|
||||||
for pkg in ${INSTALLED_PKGS}; do
|
for pkg in ${INSTALLED_PKGS}; do
|
||||||
mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}
|
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}/${pkg}`; do
|
||||||
for lic in `ls ${LICENSE_DIRECTORY}/${pkged_pn}`; do
|
|
||||||
# Really don't need to copy the generics as they're
|
# Really don't need to copy the generics as they're
|
||||||
# represented in the manifest and in the actual pkg licenses
|
# represented in the manifest and in the actual pkg licenses
|
||||||
# Doing so would make your image quite a bit larger
|
# Doing so would make your image quite a bit larger
|
||||||
if [ "${lic#generic_}" = "${lic}" ]; then
|
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
|
else
|
||||||
if [ ! -f ${IMAGE_ROOTFS}/usr/share/common-licenses/${lic} ]; then
|
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
|
fi
|
||||||
ln -s ../${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic}
|
ln -s ../${lic} ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}/${lic}
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue