summaryrefslogtreecommitdiffstats
path: root/meta/files/common-licenses/GPL-2.0-with-GCC-exception
diff options
context:
space:
mode:
authorBeth 'pidge' Flanagan <flanagan.beth@gmail.com>2012-05-16 18:25:45 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 21:11:47 +0100
commit774f93e8d3a7fa454c7e7dc20e7d52b04b60062e (patch)
treeb11efa3da11627eb1d8670b93ff5f1b34710f740 /meta/files/common-licenses/GPL-2.0-with-GCC-exception
parent535cfa538bacb723b99e46afbae743640a56466a (diff)
downloadpoky-774f93e8d3a7fa454c7e7dc20e7d52b04b60062e.tar.gz
common-licenses: Adding/updating to current
[YOCTO #2230] 1.1+ had some incorrect license text. This corrects that text and adds licenses that didn't exist in 1.1+. (From OE-Core rev: 43bd89eb195f56afef12e52ed58a2f0cad9c73db) Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files/common-licenses/GPL-2.0-with-GCC-exception')
-rw-r--r--meta/files/common-licenses/GPL-2.0-with-GCC-exception13
1 files changed, 12 insertions, 1 deletions
diff --git a/meta/files/common-licenses/GPL-2.0-with-GCC-exception b/meta/files/common-licenses/GPL-2.0-with-GCC-exception
index 5d0beb8efa..ff8de09dc7 100644
--- a/meta/files/common-licenses/GPL-2.0-with-GCC-exception
+++ b/meta/files/common-licenses/GPL-2.0-with-GCC-exception
@@ -2,5 +2,16 @@
2insert GPL v2 text here 2insert GPL v2 text here
3 3
4GCC Linking Exception 4GCC Linking Exception
5In addition to the permissions in the GNU General Public License, the Free Software Foundation gives you unlimited permission to link the compiled version of this file 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 combine executable.) 5In addition to the permissions in the GNU General Public License, the Free
6Software Foundation gives you unlimited permission to link the compiled version
7of this file into combinations with other programs, and to distribute those
8combinations without any restriction coming from the use of this file. (The
9General Public License restrictions do apply in other respects; for example,
10they cover modification of the file, and distribution when not linked into a
11combine executable.)
12
13
14
15
16
6 17