summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikko Rapeli <mikko.rapeli@bmw.de>2019-04-11 16:41:49 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-11 21:12:48 +0100
commit645dbc3ce7f6788d0ab1f6286cac41dad2ead2df (patch)
tree9945608391318a1c4206c4f0134ed4501848c323
parent890e0ab069ca459fdfec6b997eaaba35d83300a4 (diff)
downloadpoky-645dbc3ce7f6788d0ab1f6286cac41dad2ead2df.tar.gz
elfutils: remove Elfutils-Exception and include GPLv2 for shared libraries
Elfutils-Exception no longer exists after upstream release 0.154 and commit: commit de2ed97f33139af5c7a0811e4ec66fc896a13cf2 Author: Mark Wielaard <mjw@redhat.com> Date: Tue Jun 5 17:15:16 2012 +0200 NEWS file in the sources says this about switch from GPLv2 to GPLv3 license: https://sourceware.org/git/?p=elfutils.git;a=blob;f=NEWS;h=5a06047f255e3c9a63828953759fd18a4ba9a3f3;hb=HEAD#l362 362 The license is now GPLv2/LGPLv3+ for the libraries and GPLv3+ for stand-alone 363 programs. There is now also a formal CONTRIBUTING document describing how to 364 submit patches. libasm, libdw and libelf are thus covered optionally by GPLv2 license. See also Debian copyright summary for elfutils: https://tracker.debian.org/media/packages/e/elfutils/copyright-0.175-1 (From OE-Core rev: 88188807a6ac9bab738a69f6b4caba9ed092d78f) Signed-off-by: Mikko Rapeli <mikko.rapeli@bmw.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/licenses.conf2
-rw-r--r--meta/files/common-licenses/Elfutils-Exception12
-rw-r--r--meta/recipes-devtools/elfutils/elfutils_0.176.bb14
3 files changed, 14 insertions, 14 deletions
diff --git a/meta/conf/licenses.conf b/meta/conf/licenses.conf
index 1058084d86..7b01c57632 100644
--- a/meta/conf/licenses.conf
+++ b/meta/conf/licenses.conf
@@ -16,7 +16,7 @@ SRC_DISTRIBUTE_LICENSES += "CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0
16SRC_DISTRIBUTE_LICENSES += "CDDL-1.0 CECILL-1.0 CECILL-2.0 CECILL-B CECILL-C" 16SRC_DISTRIBUTE_LICENSES += "CDDL-1.0 CECILL-1.0 CECILL-2.0 CECILL-B CECILL-C"
17SRC_DISTRIBUTE_LICENSES += "ClArtistic CPAL-1.0 CPL-1.0 CUA-OPL-1.0 DSSSL" 17SRC_DISTRIBUTE_LICENSES += "ClArtistic CPAL-1.0 CPL-1.0 CUA-OPL-1.0 DSSSL"
18SRC_DISTRIBUTE_LICENSES += "ECL-1.0 ECL-2.0 eCos-2.0 EDL-1.0 EFL-1.0 EFL-2.0" 18SRC_DISTRIBUTE_LICENSES += "ECL-1.0 ECL-2.0 eCos-2.0 EDL-1.0 EFL-1.0 EFL-2.0"
19SRC_DISTRIBUTE_LICENSES += "Elfutils-Exception Entessa EPL-1.0 EPL-2.0 ErlPL-1.1" 19SRC_DISTRIBUTE_LICENSES += "Entessa EPL-1.0 EPL-2.0 ErlPL-1.1"
20SRC_DISTRIBUTE_LICENSES += "EUDatagrid EUPL-1.0 EUPL-1.1 Fair Frameworx-1.0" 20SRC_DISTRIBUTE_LICENSES += "EUDatagrid EUPL-1.0 EUPL-1.1 Fair Frameworx-1.0"
21SRC_DISTRIBUTE_LICENSES += "FreeType GFDL-1.1 GFDL-1.2 GFDL-1.3 GPL-1.0" 21SRC_DISTRIBUTE_LICENSES += "FreeType GFDL-1.1 GFDL-1.2 GFDL-1.3 GPL-1.0"
22SRC_DISTRIBUTE_LICENSES += "GPL-2.0 GPL-2.0-with-autoconf-exception" 22SRC_DISTRIBUTE_LICENSES += "GPL-2.0 GPL-2.0-with-autoconf-exception"
diff --git a/meta/files/common-licenses/Elfutils-Exception b/meta/files/common-licenses/Elfutils-Exception
deleted file mode 100644
index 627d769126..0000000000
--- a/meta/files/common-licenses/Elfutils-Exception
+++ /dev/null
@@ -1,12 +0,0 @@
1 This file describes the limits of the Exception under which you are allowed
2 to distribute Non-GPL Code in linked combination with Red Hat elfutils.
3 For the full text of the license, please see one of the header files
4 included with the source distribution or the file COPYING found in the
5 top level directory of the source.
6
7 The Approved Interfaces are the functions declared in the files:
8
9 libelf.h
10 libdw.h
11 libdwfl.h
12
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.176.bb b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
index fd901c9c9e..cd824e2901 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.176.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.176.bb
@@ -1,7 +1,7 @@
1SUMMARY = "Utilities and libraries for handling compiled object files" 1SUMMARY = "Utilities and libraries for handling compiled object files"
2HOMEPAGE = "https://sourceware.org/elfutils" 2HOMEPAGE = "https://sourceware.org/elfutils"
3SECTION = "base" 3SECTION = "base"
4LICENSE = "(GPLv3 & Elfutils-Exception)" 4LICENSE = "GPLv2 & LGPLv3+ & GPLv3+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6DEPENDS = "libtool bzip2 zlib virtual/libintl" 6DEPENDS = "libtool bzip2 zlib virtual/libintl"
7DEPENDS_append_libc-musl = " argp-standalone fts " 7DEPENDS_append_libc-musl = " argp-standalone fts "
@@ -53,6 +53,18 @@ BBCLASSEXTEND = "native nativesdk"
53 53
54# Package utilities separately 54# Package utilities separately
55PACKAGES =+ "${PN}-binutils libelf libasm libdw" 55PACKAGES =+ "${PN}-binutils libelf libasm libdw"
56
57# shared libraries are licensed GPLv2 or GPLv3+, binaries GPLv3+
58# according to NEWS file:
59# "The license is now GPLv2/LGPLv3+ for the libraries and GPLv3+ for stand-alone
60# programs. There is now also a formal CONTRIBUTING document describing how to
61# submit patches."
62LICENSE_${PN}-binutils = "GPLv3+"
63LICENSE_${PN} = "GPLv3+"
64LICENSE_libelf = "GPLv2 | LGPLv3+"
65LICENSE_libasm = "GPLv2 | LGPLv3+"
66LICENSE_libdw = "GPLv2 | LGPLv3+"
67
56FILES_${PN}-binutils = "\ 68FILES_${PN}-binutils = "\
57 ${bindir}/eu-addr2line \ 69 ${bindir}/eu-addr2line \
58 ${bindir}/eu-ld \ 70 ${bindir}/eu-ld \