[Buildroot] [PATCH 1/2] freetype: legal-info: include docs/LICENSE.TXT

[Buildroot] [PATCH 1/2] freetype: legal-info: include docs/LICENSE.TXT

[Peter Korsgaard]

LICENSE.TXT gives an overview and explains in detail that freetype is dual
licensed under the FTL and GPLv2+, so also include it in the license files.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/freetype/freetype.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/freetype/freetype.mk b/package/freetype/freetype.mk
index da9e900e8..57f9b2048 100644
--- a/package/freetype/freetype.mk
+++ b/package/freetype/freetype.mk
@@ -10,7 +10,7 @@ FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype
 FREETYPE_INSTALL_STAGING = YES
 FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)"
 FREETYPE_LICENSE = Dual FTL/GPL-2.0+
-FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT
+FREETYPE_LICENSE_FILES = docs/LICENSE.TXT docs/FTL.TXT docs/GPLv2.TXT
 FREETYPE_DEPENDENCIES = host-pkgconf
 FREETYPE_CONFIG_SCRIPTS = freetype-config
 
-- 
2.11.0

[Buildroot] [PATCH 2/2] icu: legal-info: refer to the real license file

[Peter Korsgaard]

License.html now just contains the string:

The ICU license is now in plain text format, see <a href="./LICENSE">LICENSE</a>.
Update links and software appropriately.

So refer directly to that file instead.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/icu/icu.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/icu/icu.mk b/package/icu/icu.mk
index b9e42de94..a435e471a 100644
--- a/package/icu/icu.mk
+++ b/package/icu/icu.mk
@@ -8,7 +8,7 @@ ICU_VERSION = 58.2
 ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz
 ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION)
 ICU_LICENSE = ICU License
-ICU_LICENSE_FILES = license.html
+ICU_LICENSE_FILES = LICENSE
 
 ICU_DEPENDENCIES = host-icu
 ICU_INSTALL_STAGING = YES
-- 
2.11.0

[Buildroot] [PATCH 1/2] freetype: legal-info: include docs/LICENSE.TXT

[Thomas Petazzoni]

Hello,

On Fri,  7 Apr 2017 16:28:58 +0200, Peter Korsgaard wrote:
> LICENSE.TXT gives an overview and explains in detail that freetype is dual
> licensed under the FTL and GPLv2+, so also include it in the license files.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  package/freetype/freetype.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Both applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[Buildroot] [PATCH 1/2] freetype: legal-info: include docs/LICENSE.TXT

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 > Hello,
 > On Fri,  7 Apr 2017 16:28:58 +0200, Peter Korsgaard wrote:
 >> LICENSE.TXT gives an overview and explains in detail that freetype is dual
 >> licensed under the FTL and GPLv2+, so also include it in the license files.
 >> 
 >> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
 >> ---
 >> package/freetype/freetype.mk | 2 +-
 >> 1 file changed, 1 insertion(+), 1 deletion(-)

 > Both applied. Thanks!

Both committed to 2017.02.x, thanks.

-- 
Bye, Peter Korsgaard