summaryrefslogtreecommitdiffstats
path: root/meta/files/common-licenses/Apache-2.0
diff options
context:
space:
mode:
authorBeth Flanagan <elizabeth.flanagan@intel.com>2011-06-15 13:52:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 23:44:49 +0100
commit7cd2ac0e40d854bab9a32512018aff6172500c0e (patch)
tree99366a7b07db9f0b53bb9d411f0016f36982616d /meta/files/common-licenses/Apache-2.0
parent879a7f819b7f38cda82d97489af433310aabfed1 (diff)
downloadpoky-7cd2ac0e40d854bab9a32512018aff6172500c0e.tar.gz
common-licenses: Additions and corrections
I've added more licenses from SPDX and corrected the gcc license so that it is a. parsable and b. accurate to the SPDX standard. I've also done some cleanup of license text and gdb's LICENSE field. (From OE-Core rev: e47343d12ee571281238bbf5663b074c0e32049f) Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files/common-licenses/Apache-2.0')
-rw-r--r--meta/files/common-licenses/Apache-2.04
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/files/common-licenses/Apache-2.0 b/meta/files/common-licenses/Apache-2.0
index d645695673..b3201abff2 100644
--- a/meta/files/common-licenses/Apache-2.0
+++ b/meta/files/common-licenses/Apache-2.0
@@ -1,4 +1,5 @@
1 1
2
2 Apache License 3 Apache License
3 Version 2.0, January 2004 4 Version 2.0, January 2004
4 http://www.apache.org/licenses/ 5 http://www.apache.org/licenses/
@@ -180,7 +181,7 @@
180 181
181 To apply the Apache License to your work, attach the following 182 To apply the Apache License to your work, attach the following
182 boilerplate notice, with the fields enclosed by brackets "[]" 183 boilerplate notice, with the fields enclosed by brackets "[]"
183 replaced with your own identifying information. (Don't include 184 replaced with your own identifying information. (Don`t include
184 the brackets!) The text should be enclosed in the appropriate 185 the brackets!) The text should be enclosed in the appropriate
185 comment syntax for the file format. We also recommend that a 186 comment syntax for the file format. We also recommend that a
186 file or class name and description of purpose be included on the 187 file or class name and description of purpose be included on the
@@ -200,3 +201,4 @@
200 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 201 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201 See the License for the specific language governing permissions and 202 See the License for the specific language governing permissions and
202 limitations under the License. 203 limitations under the License.
204