From 0992dbb4bcd3bd8893e66d634dafa3206e1edc59 Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Tue, 2 Aug 2016 10:48:55 -0400 Subject: [PATCH] remove duplicate license that already exists in meta-oe Signed-off-by: Derek Straka --- conf/layer.conf | 2 -- files/common-licenses/GPL-2.0-with-linking-exception | 11 ----------- recipes-deps/libgit2/libgit2.inc | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 files/common-licenses/GPL-2.0-with-linking-exception diff --git a/conf/layer.conf b/conf/layer.conf index ee72806..8b2d116 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -8,7 +8,5 @@ BBFILE_COLLECTIONS += "rust-layer" BBFILE_PATTERN_rust-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_rust-layer = "7" -LICENSE_PATH += "${LAYERDIR}/files/common-licenses" - # Override security flags require conf/distro/include/rust_security_flags.inc diff --git a/files/common-licenses/GPL-2.0-with-linking-exception b/files/common-licenses/GPL-2.0-with-linking-exception deleted file mode 100644 index 6427f33..0000000 --- a/files/common-licenses/GPL-2.0-with-linking-exception +++ /dev/null @@ -1,11 +0,0 @@ -LINKING EXCEPTION - -In addition to the permissions in the GNU General Public License, the authors -give you unlimited permission to link the compiled version of this library into -combinations with other programs, and to distribute those combinations without -any restriction coming from the use of this file. (The General Public License -restrictions do apply in other respects; for example, they cover modification -of the file, and distribution when not linked into a combined executable.) - - -insert GPL v2 text here diff --git a/recipes-deps/libgit2/libgit2.inc b/recipes-deps/libgit2/libgit2.inc index bce48dd..ef3103d 100644 --- a/recipes-deps/libgit2/libgit2.inc +++ b/recipes-deps/libgit2/libgit2.inc @@ -1,6 +1,6 @@ SUMMARY = "the Git linkable library" HOMEPAGE = "http://libgit2.github.com/" -LICENSE = "GPL-2.0-with-linking-exception" +LICENSE = "GPL-2.0-with-GCC-exception" DEPENDS = "openssl zlib"