* [PATCH 1/6] classes/license: define LICENSE_MANIFEST variable
2012-09-11 1:13 [PATCH 0/6] classes/license: various bugfixes and improvements Vladimir Zapolskiy
@ 2012-09-11 1:13 ` Vladimir Zapolskiy
2012-09-11 1:13 ` [PATCH 2/6] classes/license: check license manifest for double records Vladimir Zapolskiy
` (5 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Vladimir Zapolskiy @ 2012-09-11 1:13 UTC (permalink / raw)
To: openembedded-core
Cosmetic change, saves space and reduces code line length.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
meta/classes/license.bbclass | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 432e580..0335f41 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -80,9 +80,10 @@ license_create_manifest() {
# Get list of installed packages
list_installed_packages | grep -v "locale" |sort > ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest
INSTALLED_PKGS=`cat ${LICENSE_DIRECTORY}/${IMAGE_NAME}/package.manifest`
+ LICENSE_MANIFEST="${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest"
# remove existing license.manifest file
- if [ -f ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest ]; then
- rm ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+ if [ -f ${LICENSE_MANIFEST} ]; then
+ rm ${LICENSE_MANIFEST}
fi
# list of installed packages is broken for deb
for pkg in ${INSTALLED_PKGS}; do
@@ -95,18 +96,18 @@ license_create_manifest() {
if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then
# exclude local recipes
if [ ! "${pkged_pn}" = "*locale*" ]; then
- echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
- echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
- echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
- echo "LICENSE: " >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+ echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
+ echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
+ echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
+ echo "LICENSE: " >> ${LICENSE_MANIFEST}
for lic in ${pkged_lic}; do
if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
- echo ${lic}|sed s'/generic_//'g >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+ echo ${lic}|sed s'/generic_//'g >> ${LICENSE_MANIFEST}
else
- echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn}>> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+ echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
fi
done
- echo "" >> ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest
+ echo "" >> ${LICENSE_MANIFEST}
fi
fi
done
@@ -117,7 +118,7 @@ license_create_manifest() {
# With both options set we see a .5 M increase in core-image-minimal
if [ -n "${COPY_LIC_MANIFEST}" ]; then
mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/
- cp ${LICENSE_DIRECTORY}/${IMAGE_NAME}/license.manifest ${IMAGE_ROOTFS}/usr/share/common-licenses/license.manifest
+ cp ${LICENSE_MANIFEST} ${IMAGE_ROOTFS}/usr/share/common-licenses/license.manifest
if [ -n "${COPY_LIC_DIRS}" ]; then
for pkg in ${INSTALLED_PKGS}; do
mkdir -p ${IMAGE_ROOTFS}/usr/share/common-licenses/${pkg}
--
1.7.10
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/6] classes/license: check license manifest for double records
2012-09-11 1:13 [PATCH 0/6] classes/license: various bugfixes and improvements Vladimir Zapolskiy
2012-09-11 1:13 ` [PATCH 1/6] classes/license: define LICENSE_MANIFEST variable Vladimir Zapolskiy
@ 2012-09-11 1:13 ` Vladimir Zapolskiy
2012-09-11 1:13 ` [PATCH 3/6] classes/license: remove redundant nested if statements Vladimir Zapolskiy
` (4 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Vladimir Zapolskiy @ 2012-09-11 1:13 UTC (permalink / raw)
To: openembedded-core
Trivial typo bugfix, avoid multiple records in license.manifest.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
meta/classes/license.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 0335f41..021ab2e 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -93,7 +93,7 @@ license_create_manifest() {
pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})"
pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
# check to see if the package name exists in the manifest. if so, bail.
- if ! grep -q "PACKAGE NAME: ${pkg}" ${filename}; then
+ if ! grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
# exclude local recipes
if [ ! "${pkged_pn}" = "*locale*" ]; then
echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
--
1.7.10
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/6] classes/license: remove redundant nested if statements
2012-09-11 1:13 [PATCH 0/6] classes/license: various bugfixes and improvements Vladimir Zapolskiy
2012-09-11 1:13 ` [PATCH 1/6] classes/license: define LICENSE_MANIFEST variable Vladimir Zapolskiy
2012-09-11 1:13 ` [PATCH 2/6] classes/license: check license manifest for double records Vladimir Zapolskiy
@ 2012-09-11 1:13 ` Vladimir Zapolskiy
2012-09-11 1:18 ` [PATCH 4/6] classes/license: account LICENSE_${pkg} values in manifest Vladimir Zapolskiy
` (3 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Vladimir Zapolskiy @ 2012-09-11 1:13 UTC (permalink / raw)
To: openembedded-core
Cosmetic change, which improves code perception. Also check for locale
packages firstly, this shall improve performance a little.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
meta/classes/license.bbclass | 40 +++++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 021ab2e..8fb66be 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -90,26 +90,32 @@ license_create_manifest() {
# not the best way to do this but licenses are not arch dependant iirc
filename=`ls ${TMPDIR}/pkgdata/*/runtime-reverse/${pkg}| head -1`
pkged_pn="$(sed -n 's/^PN: //p' ${filename})"
+
+ # exclude locale recipes
+ if [ "${pkged_pn}" = "*locale*" ]; then
+ continue
+ fi
+
+ # check to see if the package name exists in the manifest. if so, bail.
+ if grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
+ continue
+ fi
+
pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})"
pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
- # check to see if the package name exists in the manifest. if so, bail.
- if ! grep -q "^PACKAGE NAME: ${pkg}" ${LICENSE_MANIFEST}; then
- # exclude local recipes
- if [ ! "${pkged_pn}" = "*locale*" ]; then
- echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
- echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
- echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
- echo "LICENSE: " >> ${LICENSE_MANIFEST}
- for lic in ${pkged_lic}; do
- if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
- echo ${lic}|sed s'/generic_//'g >> ${LICENSE_MANIFEST}
- else
- echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
- fi
- done
- echo "" >> ${LICENSE_MANIFEST}
+
+ echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
+ echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
+ echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
+ echo "LICENSE: " >> ${LICENSE_MANIFEST}
+ for lic in ${pkged_lic}; do
+ if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
+ echo ${lic}|sed s'/generic_//'g >> ${LICENSE_MANIFEST}
+ else
+ echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
fi
- fi
+ done
+ echo "" >> ${LICENSE_MANIFEST}
done
# Two options here:
--
1.7.10
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 4/6] classes/license: account LICENSE_${pkg} values in manifest
2012-09-11 1:13 [PATCH 0/6] classes/license: various bugfixes and improvements Vladimir Zapolskiy
` (2 preceding siblings ...)
2012-09-11 1:13 ` [PATCH 3/6] classes/license: remove redundant nested if statements Vladimir Zapolskiy
@ 2012-09-11 1:18 ` Vladimir Zapolskiy
2012-09-11 1:18 ` [PATCH 5/6] classes/license: correct license info in lisense.manifest Vladimir Zapolskiy
` (2 subsequent siblings)
6 siblings, 0 replies; 9+ messages in thread
From: Vladimir Zapolskiy @ 2012-09-11 1:18 UTC (permalink / raw)
To: openembedded-core
Trivial change, process LICENSE_${pkg} and LICENSE values. This fixes multiple
cases, when license is not specified at all in license.manifest
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
meta/classes/license.bbclass | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 8fb66be..74a8306 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -101,8 +101,13 @@ license_create_manifest() {
continue
fi
- pkged_lic="$(sed -n '/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }' ${filename})"
pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
+ pkged_name="$(basename $(readlink ${filename}))"
+ pkged_lic="$(sed -n "/^LICENSE_${pkged_name}: /{ s/^LICENSE_${pkged_name}: //; s/[+|&()*]/ /g; s/ */ /g; p }" ${filename})"
+ if [ -z ${pkged_lic} ]; then
+ # fallback checking value of LICENSE
+ pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }" ${filename})"
+ fi
echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
--
1.7.10
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 5/6] classes/license: correct license info in lisense.manifest
2012-09-11 1:13 [PATCH 0/6] classes/license: various bugfixes and improvements Vladimir Zapolskiy
` (3 preceding siblings ...)
2012-09-11 1:18 ` [PATCH 4/6] classes/license: account LICENSE_${pkg} values in manifest Vladimir Zapolskiy
@ 2012-09-11 1:18 ` Vladimir Zapolskiy
2012-09-11 1:18 ` [PATCH 6/6] classes/license: place all found licenses on one line Vladimir Zapolskiy
2012-09-12 17:51 ` [PATCH 0/6] classes/license: various bugfixes and improvements Saul Wold
6 siblings, 0 replies; 9+ messages in thread
From: Vladimir Zapolskiy @ 2012-09-11 1:18 UTC (permalink / raw)
To: openembedded-core
Trivial change, do not cut off plus symbol from license name, otherwise
information about package license is corrupted.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
meta/classes/license.bbclass | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 74a8306..4b5954d 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -103,10 +103,10 @@ license_create_manifest() {
pkged_pv="$(sed -n 's/^PV: //p' ${filename})"
pkged_name="$(basename $(readlink ${filename}))"
- pkged_lic="$(sed -n "/^LICENSE_${pkged_name}: /{ s/^LICENSE_${pkged_name}: //; s/[+|&()*]/ /g; s/ */ /g; p }" ${filename})"
+ pkged_lic="$(sed -n "/^LICENSE_${pkged_name}: /{ s/^LICENSE_${pkged_name}: //; s/[|&()*]/ /g; s/ */ /g; p }" ${filename})"
if [ -z ${pkged_lic} ]; then
# fallback checking value of LICENSE
- pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; s/[+|&()*]/ /g; s/ */ /g; p }" ${filename})"
+ pkged_lic="$(sed -n "/^LICENSE: /{ s/^LICENSE: //; s/[|&()*]/ /g; s/ */ /g; p }" ${filename})"
fi
echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
@@ -114,8 +114,9 @@ license_create_manifest() {
echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
echo "LICENSE: " >> ${LICENSE_MANIFEST}
for lic in ${pkged_lic}; do
- if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
- echo ${lic}|sed s'/generic_//'g >> ${LICENSE_MANIFEST}
+ # to reference a license file trim trailing + symbol
+ if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
+ echo ${lic} >> ${LICENSE_MANIFEST}
else
echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
fi
--
1.7.10
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/6] classes/license: place all found licenses on one line
2012-09-11 1:13 [PATCH 0/6] classes/license: various bugfixes and improvements Vladimir Zapolskiy
` (4 preceding siblings ...)
2012-09-11 1:18 ` [PATCH 5/6] classes/license: correct license info in lisense.manifest Vladimir Zapolskiy
@ 2012-09-11 1:18 ` Vladimir Zapolskiy
2012-09-11 1:51 ` [PATCH 6/6 v2] " Vladimir Zapolskiy
2012-09-12 17:51 ` [PATCH 0/6] classes/license: various bugfixes and improvements Saul Wold
6 siblings, 1 reply; 9+ messages in thread
From: Vladimir Zapolskiy @ 2012-09-11 1:18 UTC (permalink / raw)
To: openembedded-core
Cosmetic change, settle all found licenses into one line and report warning
about missing licenses loudly.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
meta/classes/license.bbclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 4b5954d..82f4d9a 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -112,16 +112,16 @@ license_create_manifest() {
echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
- echo "LICENSE: " >> ${LICENSE_MANIFEST}
+ echo -n "LICENSE:" >> ${LICENSE_MANIFEST}
for lic in ${pkged_lic}; do
# to reference a license file trim trailing + symbol
if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
- echo ${lic} >> ${LICENSE_MANIFEST}
+ echo -n " ${lic}" >> ${LICENSE_MANIFEST}
else
- echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
+ echo "WARNING: The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
fi
done
- echo "" >> ${LICENSE_MANIFEST}
+ echo "\n" >> ${LICENSE_MANIFEST}
done
# Two options here:
--
1.7.10
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 6/6 v2] classes/license: place all found licenses on one line
2012-09-11 1:18 ` [PATCH 6/6] classes/license: place all found licenses on one line Vladimir Zapolskiy
@ 2012-09-11 1:51 ` Vladimir Zapolskiy
0 siblings, 0 replies; 9+ messages in thread
From: Vladimir Zapolskiy @ 2012-09-11 1:51 UTC (permalink / raw)
To: openembedded-core
Cosmetic change, settle all found licenses into one line and report warning
about missing licenses loudly.
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
Changes from v1 to v2:
* interpret backslash escapes in the closing echo
meta/classes/license.bbclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 4b5954d..29fe938 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -112,16 +112,16 @@ license_create_manifest() {
echo "PACKAGE NAME:" ${pkg} >> ${LICENSE_MANIFEST}
echo "PACKAGE VERSION:" ${pkged_pv} >> ${LICENSE_MANIFEST}
echo "RECIPE NAME:" ${pkged_pn} >> ${LICENSE_MANIFEST}
- echo "LICENSE: " >> ${LICENSE_MANIFEST}
+ echo -n "LICENSE:" >> ${LICENSE_MANIFEST}
for lic in ${pkged_lic}; do
# to reference a license file trim trailing + symbol
if [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
- echo ${lic} >> ${LICENSE_MANIFEST}
+ echo -n " ${lic}" >> ${LICENSE_MANIFEST}
else
- echo "WARNING: The license listed, " ${lic} " was not in the licenses collected for " ${pkged_pn} >> ${LICENSE_MANIFEST}
+ echo "WARNING: The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
fi
done
- echo "" >> ${LICENSE_MANIFEST}
+ echo -e "\n" >> ${LICENSE_MANIFEST}
done
# Two options here:
--
1.7.10.4
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 0/6] classes/license: various bugfixes and improvements
2012-09-11 1:13 [PATCH 0/6] classes/license: various bugfixes and improvements Vladimir Zapolskiy
` (5 preceding siblings ...)
2012-09-11 1:18 ` [PATCH 6/6] classes/license: place all found licenses on one line Vladimir Zapolskiy
@ 2012-09-12 17:51 ` Saul Wold
6 siblings, 0 replies; 9+ messages in thread
From: Saul Wold @ 2012-09-12 17:51 UTC (permalink / raw)
To: Vladimir Zapolskiy; +Cc: openembedded-core
On 09/10/2012 06:13 PM, Vladimir Zapolskiy wrote:
> This trivial set of changes fixes several bugs including:
> * check license.manifest for multiple records about the same
> * put precise information about licensing into license.manifest
> * specify licensing of packages, where info is in form of LICENSE_${pkg}
>
> Also the change set has some intention to improve performance and
> source code readability.
>
> Vladimir Zapolskiy (6):
> classes/license: define LICENSE_MANIFEST variable
> classes/license: check license manifest for double records
> classes/license: remove redundant nested if statements
> classes/license: account LICENSE_${pkg} values in manifest
> classes/license: correct license info in lisense.manifest
> classes/license: place all found licenses on one line
>
> meta/classes/license.bbclass | 55 ++++++++++++++++++++++++++----------------
> 1 file changed, 34 insertions(+), 21 deletions(-)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 9+ messages in thread