1 files changed, 23 insertions, 26 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index e520a4ceeb..96fdb46155 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -77,34 +77,31 @@ license_create_manifest() {
    list_installed_packages | grep -v "locale" |sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
    INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`
    # list of installed packages is broken for deb
-    if [ ${IMAGE_PKGTYPE} != "deb" ]; then
+    for pkg in ${INSTALLED_PKGS}; do
+        # not the best way to do this but licenses are not arch dependant iirc
-        for pkg in ${INSTALLED_PKGS}; do
+        files=`find ${TMPDIR}/pkgdata/*/runtime -name ${pkg}| head -1`
-            # not the best way to do this but licenses are not arch dependant iirc
+        for filename in $files; do
-            files=`find ${TMPDIR}/pkgdata/*/runtime -name ${pkg}| head -1`
+            pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
-            for filename in $files; do
+            pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/  */ /g; p }' ${filename})"
-                pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
+            # check to see if the package name exists in the manifest. if so, bail.
-                pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/  */ /g; p }' ${filename})"
+            if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then
-                # check to see if the package name exists in the manifest. if so, bail.
+                # exclude local recipes
-                if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then
+                if [ ! "${pkged_pn}" = "*locale*" ]; then
-                    # exclude local recipes
+                    echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
-                    if [ ! "${pkged_pn}" = "*locale*" ]; then
+                    echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
-                        echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+                    echo "LICENSE: " >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
-                        echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+                    for lic in ${pkged_lic}; do
-                        echo "LICENSE: " >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+                        if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
-                        for lic in ${pkged_lic}; do
+                            echo ${lic}|sed s'/generic_//'g >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
-                            if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
+                        else
-                                echo ${lic}|sed s'/generic_//'g >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+                            echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
-                            else
+                        fi
-                                echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+                    done
-                            fi
+                    echo "" >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
-                        done
-                        echo "" >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
-                    fi
                fi
-            done
+            fi
        done
-    fi
+    done
    # Two options here:
    # - Just copy the manifest

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index e520a4ceeb..96fdb46155 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass
@@ -77,34 +77,31 @@ license_create_manifest() {
77	list_installed_packages \| grep -v "locale" \|sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest	77	list_installed_packages \| grep -v "locale" \|sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
78	INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`	78	INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`
79	# list of installed packages is broken for deb	79	# list of installed packages is broken for deb
80	if [ ${IMAGE_PKGTYPE} != "deb" ]; then	80	for pkg in ${INSTALLED_PKGS}; do
81		81	# not the best way to do this but licenses are not arch dependant iirc
82	for pkg in ${INSTALLED_PKGS}; do	82	files=`find ${TMPDIR}/pkgdata/*/runtime -name ${pkg}\| head -1`
83	# not the best way to do this but licenses are not arch dependant iirc	83	for filename in $files; do
84	files=`find ${TMPDIR}/pkgdata/*/runtime -name ${pkg}\| head -1`	84	pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
85	for filename in $files; do	85	pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+\|&()]/ /g; s/ / /g; p }' ${filename})"
86	pkged_pn="$(sed -n 's/^PN: //p' ${filename})"	86	# check to see if the package name exists in the manifest. if so, bail.
87	pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+\|&()]/ /g; s/ / /g; p }' ${filename})"	87	if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then
88	# check to see if the package name exists in the manifest. if so, bail.	88	# exclude local recipes
89	if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then	89	if [ ! "${pkged_pn}" = "locale" ]; then
90	# exclude local recipes	90	echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
91	if [ ! "${pkged_pn}" = "locale" ]; then	91	echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
92	echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest	92	echo "LICENSE: " >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
93	echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest	93	for lic in ${pkged_lic}; do
94	echo "LICENSE: " >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest	94	if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
95	for lic in ${pkged_lic}; do	95	echo ${lic}\|sed s'/generic_//'g >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
96	if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then	96	else
97	echo ${lic}\|sed s'/generic_//'g >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest	97	echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
98	else	98	fi
99	echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest	99	done
100	fi	100	echo "" >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
101	done
102	echo "" >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
103	fi
104	fi	101	fi
105	done	102	fi
106	done	103	done
107	fi	104	done
108		105
109	# Two options here:	106	# Two options here:
110	# - Just copy the manifest	107	# - Just copy the manifest