[oe-commits] [openembedded-core] 42/94: libxsettings-client: fix COPYING file
git at git.openembedded.org
git at git.openembedded.org
Wed Jun 29 18:37:06 UTC 2016
rpurdie pushed a commit to branch krogoth
in repository openembedded-core.
commit 6eb173a6f4e67a9426dd19307a65dde6f3bf8974
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Tue Apr 26 19:20:30 2016 -0700
libxsettings-client: fix COPYING file
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.
(From OE-Core rev: 89332686ac6c756672cbf67c2df70c5150efa998)
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster at mvista.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
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list