* [PATCH 1/6] insane.bbclass: remove workdir from package_qa_check_license()
2016-04-27 2:20 [PATCH 0/6 V2] nsane.bbclass: package_qa_check_license -> populate_lic_qa_checksum Robert Yang
@ 2016-04-27 2:20 ` Robert Yang
2016-04-27 2:20 ` [PATCH 2/6] insane.bbclass: package_qa_check_license -> populate_lic_qa_checksum Robert Yang
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Robert Yang @ 2016-04-27 2:20 UTC (permalink / raw)
To: openembedded-core
The parameter workdir is not used in package_qa_check_license()
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/insane.bbclass | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index c57b217..a1d23d0 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -672,7 +672,7 @@ def package_qa_check_symlink_to_sysroot(path, name, d, elf, messages):
trimmed = path.replace(os.path.join (d.getVar("PKGDEST", True), name), "")
package_qa_add_message(messages, "symlink-to-sysroot", "Symlink %s in %s points to TMPDIR" % (trimmed, name))
-def package_qa_check_license(workdir, d):
+def package_qa_check_license(d):
"""
Check for changes in the license files
"""
@@ -1211,7 +1211,7 @@ Missing inherit gettext?""" % (gt, config))
# Check license variables
###########################################################################
- package_qa_check_license(workdir, d)
+ package_qa_check_license(d)
###########################################################################
# Check unrecognised configure options (with a white list)
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/6] insane.bbclass: package_qa_check_license -> populate_lic_qa_checksum
2016-04-27 2:20 [PATCH 0/6 V2] nsane.bbclass: package_qa_check_license -> populate_lic_qa_checksum Robert Yang
2016-04-27 2:20 ` [PATCH 1/6] insane.bbclass: remove workdir from package_qa_check_license() Robert Yang
@ 2016-04-27 2:20 ` Robert Yang
2016-04-27 2:20 ` [PATCH 3/6] packagegroup.bbclass: set LICENSE and LIC_FILES_CHKSUM Robert Yang
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Robert Yang @ 2016-04-27 2:20 UTC (permalink / raw)
To: openembedded-core
The package_qa_check_license() was in do_qa_configure which had a
potential problem, when the recipe sets do_configure[noexec] = "1", then
the license checking won't run, which may hidden license issues. Rename
it to populate_lic_qa_checksum() and run in do_populate_lic[postfuncs] which
is more reasonable (when no populate license, no license checking).
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/insane.bbclass | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index a1d23d0..097dc3a 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -672,7 +672,9 @@ def package_qa_check_symlink_to_sysroot(path, name, d, elf, messages):
trimmed = path.replace(os.path.join (d.getVar("PKGDEST", True), name), "")
package_qa_add_message(messages, "symlink-to-sysroot", "Symlink %s in %s points to TMPDIR" % (trimmed, name))
-def package_qa_check_license(d):
+# Check license variables
+do_populate_lic[postfuncs] += "populate_lic_qa_checksum"
+python populate_lic_qa_checksum() {
"""
Check for changes in the license files
"""
@@ -753,6 +755,7 @@ def package_qa_check_license(d):
msg = pn + ": LIC_FILES_CHKSUM is not specified for " + url
msg = msg + "\n" + pn + ": The md5 checksum is " + md5chksum
package_qa_handle_error("license-checksum", msg, d)
+}
def package_qa_check_staged(path,d):
"""
@@ -1208,12 +1211,6 @@ Rerun configure task after fixing this.""")
Missing inherit gettext?""" % (gt, config))
###########################################################################
- # Check license variables
- ###########################################################################
-
- package_qa_check_license(d)
-
- ###########################################################################
# Check unrecognised configure options (with a white list)
###########################################################################
if bb.data.inherits_class("autotools", d):
@@ -1261,8 +1258,8 @@ python do_qa_unpack() {
#addtask qa_staging after do_populate_sysroot before do_build
do_populate_sysroot[postfuncs] += "do_qa_staging "
-# Check broken config.log files, for packages requiring Gettext which don't
-# have it in DEPENDS and for correct LIC_FILES_CHKSUM
+# Check broken config.log files, for packages requiring Gettext which
+# don't have it in DEPENDS.
#addtask qa_configure after do_configure before do_compile
do_configure[postfuncs] += "do_qa_configure "
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/6] packagegroup.bbclass: set LICENSE and LIC_FILES_CHKSUM
2016-04-27 2:20 [PATCH 0/6 V2] nsane.bbclass: package_qa_check_license -> populate_lic_qa_checksum Robert Yang
2016-04-27 2:20 ` [PATCH 1/6] insane.bbclass: remove workdir from package_qa_check_license() Robert Yang
2016-04-27 2:20 ` [PATCH 2/6] insane.bbclass: package_qa_check_license -> populate_lic_qa_checksum Robert Yang
@ 2016-04-27 2:20 ` Robert Yang
2016-04-27 2:20 ` [PATCH 4/6] packagegroup-foo.bb: remove LICENSE = "MIT" Robert Yang
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Robert Yang @ 2016-04-27 2:20 UTC (permalink / raw)
To: openembedded-core
* Use "??=" in bitbake.conf to set LICENSE, so that it can overrided by
packagegroup.bbclass and recipes.
* Use "?=" to set LICENSE and LIC_FILES_CHKSUM to MIT by default
in packagegroup.bbclass, this won't impact any packagegroup recipes
which use non-MIT license, since they can be overrided by the recipe.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/classes/packagegroup.bbclass | 5 +++++
meta/conf/bitbake.conf | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 38bdbd3..3674894 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -14,6 +14,11 @@ PACKAGE_ARCH ?= "all"
# Fully expanded - so it applies the overrides as well
PACKAGE_ARCH_EXPANDED := "${PACKAGE_ARCH}"
+LICENSE ?= "MIT"
+LIC_FILES_CHKSUM ?= "${@oe.utils.ifelse(d.getVar('LICENSE', True) == 'MIT', \
+ 'file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420', \
+ '')}"
+
inherit ${@oe.utils.ifelse(d.getVar('PACKAGE_ARCH_EXPANDED', True) == 'all', 'allarch', '')}
# This automatically adds -dbg and -dev flavours of all PACKAGES
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 40796aa..66646c8 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -247,7 +247,7 @@ SUMMARY_${PN}-doc ?= "${SUMMARY} - Documentation files"
DESCRIPTION_${PN}-doc ?= "${DESCRIPTION} \
This package contains documentation."
-LICENSE = "INVALID"
+LICENSE ??= "INVALID"
MAINTAINER = "OE-Core Developers <openembedded-core@lists.openembedded.org>"
HOMEPAGE = ""
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/6] packagegroup-foo.bb: remove LICENSE = "MIT"
2016-04-27 2:20 [PATCH 0/6 V2] nsane.bbclass: package_qa_check_license -> populate_lic_qa_checksum Robert Yang
` (2 preceding siblings ...)
2016-04-27 2:20 ` [PATCH 3/6] packagegroup.bbclass: set LICENSE and LIC_FILES_CHKSUM Robert Yang
@ 2016-04-27 2:20 ` Robert Yang
2016-04-27 2:20 ` [PATCH 5/6] meta-world-pkgdata: add LIC_FILES_CHKSUM Robert Yang
2016-04-27 2:20 ` [PATCH 6/6] libxsettings-client: fix COPYING file Robert Yang
5 siblings, 0 replies; 7+ messages in thread
From: Robert Yang @ 2016-04-27 2:20 UTC (permalink / raw)
To: openembedded-core
It has been set in packagegroup.bbclass.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-core/packagegroups/packagegroup-base.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-nfs.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb | 1 -
.../packagegroups/packagegroup-core-standalone-sdk-target.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb | 1 -
meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 1 -
meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb | 1 -
meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb | 1 -
meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 1 -
meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb | 1 -
meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb | 1 -
meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb | 1 -
meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | 1 -
meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | 1 -
meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | 1 -
23 files changed, 23 deletions(-)
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 9e40b28..2e94fde 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -1,5 +1,4 @@
SUMMARY = "Merge machine and distro options to create a basic machine task/package"
-LICENSE = "MIT"
PR = "r83"
#
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index bac93b8..04bc0f2 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -4,7 +4,6 @@
SUMMARY = "Minimal boot requirements"
DESCRIPTION = "The minimal set of packages required to boot the system"
-LICENSE = "MIT"
PR = "r17"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
index 74ed247..78cc65d 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-buildessential.bb
@@ -4,7 +4,6 @@
#
SUMMARY = "Essential build dependencies"
-LICENSE = "MIT"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb
index e7b013d..c45463f 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-eclipse-debug.bb
@@ -1,5 +1,4 @@
SUMMARY = "Remote debugging tools for Eclipse integration"
-LICENSE = "MIT"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 1882d3a..b345e31 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -3,7 +3,6 @@
#
SUMMARY = "NFS package groups"
-LICENSE = "MIT"
PR = "r2"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index bee1665..ea07e98 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -3,7 +3,6 @@
#
SUMMARY = "Software development tools"
-LICENSE = "MIT"
PR = "r9"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index e99946f..5ec3f6c 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
@@ -1,5 +1,4 @@
SUMMARY = "Dropbear SSH client/server"
-LICENSE = "MIT"
PR = "r1"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index 32d20e6..703f956 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
@@ -1,5 +1,4 @@
SUMMARY = "OpenSSH SSH client/server"
-LICENSE = "MIT"
PR = "r1"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
index 6997f39..274e11a 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
@@ -1,6 +1,5 @@
SUMMARY = "Target packages for the standalone SDK"
PR = "r8"
-LICENSE = "MIT"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index 82347b9..9fc2b0e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
@@ -3,7 +3,6 @@
#
SUMMARY = "Debugging tools"
-LICENSE = "MIT"
inherit packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index ff2b577..71b3651 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -3,7 +3,6 @@
#
SUMMARY = "Profiling tools"
-LICENSE = "MIT"
PR = "r3"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index e8d585e..5938d7e 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -3,7 +3,6 @@
#
SUMMARY = "Testing tools/applications"
-LICENSE = "MIT"
PR = "r2"
diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index 180dd96..d551147 100644
--- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
@@ -1,6 +1,5 @@
SUMMARY = "Host SDK package for cross canadian toolchain"
PN = "packagegroup-cross-canadian-${MACHINE}"
-LICENSE = "MIT"
inherit cross-canadian packagegroup
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 225204d..aa88cf9 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -5,7 +5,6 @@
SUMMARY = "Self-hosting"
DESCRIPTION = "Packages required to run the build system"
PR = "r13"
-LICENSE = "MIT"
inherit packagegroup distro_features_check
# rdepends on libx11-dev
diff --git a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb b/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
index e831860..b037057 100644
--- a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
+++ b/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
@@ -1,5 +1,4 @@
SUMMARY = "Provides a small set of tools for development on the device"
-LICENSE = "MIT"
PR = "r1"
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
index 1d7e608..f33b43e 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
@@ -5,7 +5,6 @@
SUMMARY = "Standard full-featured Linux system"
DESCRIPTION = "Package group bringing in packages needed for a more traditional full-featured Linux system"
PR = "r6"
-LICENSE = "MIT"
inherit packagegroup
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index a29c3d7..2b6b7a5 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -5,7 +5,6 @@
SUMMARY = "Linux Standard Base (LSB)"
DESCRIPTION = "Packages required to satisfy the Linux Standard Base (LSB) specification"
PR = "r10"
-LICENSE = "MIT"
inherit packagegroup distro_features_check
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 5734b27..87c700e 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -3,7 +3,6 @@
#
SUMMARY = "Clutter package groups"
-LICENSE = "MIT"
PR = "r6"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index a657a1a..5ead60d 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
@@ -1,5 +1,4 @@
SUMMARY = "DirectFB without X11"
-LICENSE = "MIT"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
index 17301a0..db3dfe3 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
@@ -1,6 +1,5 @@
SUMMARY = "Basic X11 session"
DESCRIPTION = "Packages required to set up a basic working X11 session"
-LICENSE = "MIT"
PR = "r1"
inherit packagegroup distro_features_check
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
index c53f1b7..6b50028 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb
@@ -3,7 +3,6 @@
#
SUMMARY = "X11 display server"
-LICENSE = "MIT"
PR = "r40"
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
index 3537d8c..4291424 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb
@@ -2,7 +2,6 @@
# Copyright (C) 2011 Intel Corporation
#
-LICENSE = "MIT"
PR = "r40"
inherit packagegroup distro_features_check
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 8ba4923..913e8cd 100644
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -3,7 +3,6 @@
#
SUMMARY = "Sato desktop"
-LICENSE = "MIT"
PR = "r33"
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/6] meta-world-pkgdata: add LIC_FILES_CHKSUM
2016-04-27 2:20 [PATCH 0/6 V2] nsane.bbclass: package_qa_check_license -> populate_lic_qa_checksum Robert Yang
` (3 preceding siblings ...)
2016-04-27 2:20 ` [PATCH 4/6] packagegroup-foo.bb: remove LICENSE = "MIT" Robert Yang
@ 2016-04-27 2:20 ` Robert Yang
2016-04-27 2:20 ` [PATCH 6/6] libxsettings-client: fix COPYING file Robert Yang
5 siblings, 0 replies; 7+ messages in thread
From: Robert Yang @ 2016-04-27 2:20 UTC (permalink / raw)
To: openembedded-core
Fixed:
ERROR: meta-world-pkgdata-1.0-r0 do_populate_lic: QA Issue: meta-world-pkgdata: Recipe file does not have license file information (LIC_FILES_CHKSUM) [license-checksum]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-core/meta/meta-world-pkgdata.bb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/meta/recipes-core/meta/meta-world-pkgdata.bb b/meta/recipes-core/meta/meta-world-pkgdata.bb
index 3c5db50..b3989cd 100644
--- a/meta/recipes-core/meta/meta-world-pkgdata.bb
+++ b/meta/recipes-core/meta/meta-world-pkgdata.bb
@@ -1,5 +1,7 @@
SUMMARY = "Pulls in pkgdata for world"
LICENSE = "MIT"
+LIC_FILES_CHKSUM ?= "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
INHIBIT_DEFAULT_DEPS = "1"
addtask do_allpackagedata before do_build
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 6/6] libxsettings-client: fix COPYING file
2016-04-27 2:20 [PATCH 0/6 V2] nsane.bbclass: package_qa_check_license -> populate_lic_qa_checksum Robert Yang
` (4 preceding siblings ...)
2016-04-27 2:20 ` [PATCH 5/6] meta-world-pkgdata: add LIC_FILES_CHKSUM Robert Yang
@ 2016-04-27 2:20 ` Robert Yang
5 siblings, 0 replies; 7+ messages in thread
From: Robert Yang @ 2016-04-27 2:20 UTC (permalink / raw)
To: openembedded-core
Fixed:
* Move the code of copy COPYING file from do_configure_append() to
do_patch[postfuncs] since we had moved license-checksum from
do_package_qa to do_populate_lic.
* Add xsettings-client.c and xsettings-common.c to LIC_FILES_CHKSUM.
* Update comments.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../libxsettings-client/libxsettings-client_0.10.bb | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
index 67c5e27..9e9336e 100644
--- a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
+++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb
@@ -9,7 +9,9 @@ SECTION = "x/libs"
LICENSE = "MIT-style"
LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
file://xsettings-client.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
- file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
+ file://xsettings-client.c;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
+ file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \
+ file://xsettings-common.c;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b"
DEPENDS = "virtual/libx11"
PR = "r5"
@@ -31,10 +33,11 @@ inherit autotools gettext distro_features_check
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
-do_configure_prepend() {
- # This package doesn't ship with its own COPYING file and
- # autotools will install a GPLv2 one instead of the actual MIT-style license here.
- # Add the correct license here to avoid confusion.
+do_patch[postfuncs] += "update_copying_file"
+update_copying_file() {
+ # This package ships with a GPLv2 COPYING file, but the author says
+ # it is actual MIT-style license, add the correct license here to
+ # avoid confusion.
cp -f ${WORKDIR}/MIT-style-license ${S}/COPYING
}
--
2.7.4
^ permalink raw reply related [flat|nested] 7+ messages in thread