diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-04-26 19:20:30 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-06 10:31:16 +0100 |
commit | 46bfdecf147e565191d882db30903b1eb43f27c5 (patch) | |
tree | 02bc8ab32b5f0d2674a8d3ebb5f4ff691aaa0416 /meta | |
parent | b13367b10fd7e1c38170d91d175347ad3eab9dac (diff) | |
download | poky-46bfdecf147e565191d882db30903b1eb43f27c5.tar.gz |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb | 13 |
1 files 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 67c5e27776..9e9336e5db 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" | |||
9 | LICENSE = "MIT-style" | 9 | LICENSE = "MIT-style" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ |
11 | file://xsettings-client.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | 11 | file://xsettings-client.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ |
12 | file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" | 12 | file://xsettings-client.c;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ |
13 | file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | ||
14 | file://xsettings-common.c;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" | ||
13 | DEPENDS = "virtual/libx11" | 15 | DEPENDS = "virtual/libx11" |
14 | 16 | ||
15 | PR = "r5" | 17 | PR = "r5" |
@@ -31,10 +33,11 @@ inherit autotools gettext distro_features_check | |||
31 | # depends on virtual/libx11 | 33 | # depends on virtual/libx11 |
32 | REQUIRED_DISTRO_FEATURES = "x11" | 34 | REQUIRED_DISTRO_FEATURES = "x11" |
33 | 35 | ||
34 | do_configure_prepend() { | 36 | do_patch[postfuncs] += "update_copying_file" |
35 | # This package doesn't ship with its own COPYING file and | 37 | update_copying_file() { |
36 | # autotools will install a GPLv2 one instead of the actual MIT-style license here. | 38 | # This package ships with a GPLv2 COPYING file, but the author says |
37 | # Add the correct license here to avoid confusion. | 39 | # it is actual MIT-style license, add the correct license here to |
40 | # avoid confusion. | ||
38 | cp -f ${WORKDIR}/MIT-style-license ${S}/COPYING | 41 | cp -f ${WORKDIR}/MIT-style-license ${S}/COPYING |
39 | } | 42 | } |
40 | 43 | ||