summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-11-07 23:58:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-14 13:20:59 +0000
commitfffdba90578b2eeb4dc87c5ba388f6080f0a7d90 (patch)
tree4c8eb462d0df9ac149d9894db03d86a93ef458ea
parent0d3a95b64d2b16c203ded227d29d571cb2eaad5c (diff)
downloadpoky-fffdba90578b2eeb4dc87c5ba388f6080f0a7d90.tar.gz
acpica: upgrade to 20191018
The upstream tarballs now have a unified source license of Intel|BSD|GPLv2 and the old BSD|GPLv2 tarballs are deprecated. Add the Intel license to the license collection, update the LICENSE field, and update the license checksum to actually point at a license fragment. (From OE-Core rev: 84f046187e5794d6723094e3aafab057ea396d3e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/files/common-licenses/Intel105
-rw-r--r--meta/recipes-extended/acpica/acpica_20191018.bb (renamed from meta/recipes-extended/acpica/acpica_20190816.bb)12
2 files changed, 111 insertions, 6 deletions
diff --git a/meta/files/common-licenses/Intel b/meta/files/common-licenses/Intel
new file mode 100644
index 0000000000..29ddf57a8c
--- /dev/null
+++ b/meta/files/common-licenses/Intel
@@ -0,0 +1,105 @@
11. Copyright Notice
2
3Some or all of this work - Copyright (c) 1999 - 2017, Intel Corp.
4All rights reserved.
5
62. License
7
82.1. This is your license from Intel Corp. under its intellectual property
9rights. You may have additional license terms from the party that provided
10you this software, covering your right to use that party's intellectual
11property rights.
12
132.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
14copy of the source code appearing in this file ("Covered Code") an
15irrevocable, perpetual, worldwide license under Intel's copyrights in the
16base code distributed originally by Intel ("Original Intel Code") to copy,
17make derivatives, distribute, use and display any portion of the Covered
18Code in any form, with the right to sublicense such rights; and
19
202.3. Intel grants Licensee a non-exclusive and non-transferable patent
21license (with the right to sublicense), under only those claims of Intel
22patents that are infringed by the Original Intel Code, to make, use, sell,
23offer to sell, and import the Covered Code and derivative works thereof
24solely to the minimum extent necessary to exercise the above copyright
25license, and in no event shall the patent license extend to any additions
26to or modifications of the Original Intel Code. No other license or right
27is granted directly or by implication, estoppel or otherwise;
28
29The above copyright and patent license is granted only if the following
30conditions are met:
31
323. Conditions
33
343.1. Redistribution of Source with Rights to Further Distribute Source.
35Redistribution of source code of any substantial portion of the Covered
36Code or modification with rights to further distribute source must include
37the above Copyright Notice, the above License, this list of Conditions,
38and the following Disclaimer and Export Compliance provision. In addition,
39Licensee must cause all Covered Code to which Licensee contributes to
40contain a file documenting the changes Licensee made to create that Covered
41Code and the date of any change. Licensee must include in that file the
42documentation of any changes made by any predecessor Licensee. Licensee
43must include a prominent statement that the modification is derived,
44directly or indirectly, from Original Intel Code.
45
463.2. Redistribution of Source with no Rights to Further Distribute Source.
47Redistribution of source code of any substantial portion of the Covered
48Code or modification without rights to further distribute source must
49include the following Disclaimer and Export Compliance provision in the
50documentation and/or other materials provided with distribution. In
51addition, Licensee may not authorize further sublicense of source of any
52portion of the Covered Code, and must include terms to the effect that the
53license from Licensee to its licensee is limited to the intellectual
54property embodied in the software Licensee provides to its licensee, and
55not to intellectual property embodied in modifications its licensee may
56make.
57
583.3. Redistribution of Executable. Redistribution in executable form of any
59substantial portion of the Covered Code or modification must reproduce the
60above Copyright Notice, and the following Disclaimer and Export Compliance
61provision in the documentation and/or other materials provided with the
62distribution.
63
643.4. Intel retains all right, title, and interest in and to the Original
65Intel Code.
66
673.5. Neither the name Intel nor any other trademark owned or controlled by
68Intel shall be used in advertising or otherwise to promote the sale, use or
69other dealings in products derived from or relating to the Covered Code
70without prior written authorization from Intel.
71
724. Disclaimer and Export Compliance
73
744.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
75HERE. ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
76IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT, ASSISTANCE,
77INSTALLATION, TRAINING OR OTHER SERVICES. INTEL WILL NOT PROVIDE ANY
78UPDATES, ENHANCEMENTS OR EXTENSIONS. INTEL SPECIFICALLY DISCLAIMS ANY
79IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
80PARTICULAR PURPOSE.
81
824.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
83OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
84COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
85SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
86CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
87HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES. THESE LIMITATIONS
88SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
89LIMITED REMEDY.
90
914.3. Licensee shall not export, either directly or indirectly, any of this
92software or system incorporating such software without first obtaining any
93required license or other approval from the U. S. Department of Commerce or
94any other agency or department of the United States Government. In the
95event Licensee exports any such software from the United States or
96re-exports any such software from a foreign destination, Licensee shall
97ensure that the distribution and export/re-export of the software is in
98compliance with all laws, regulations, orders, or other restrictions of the
99U.S. Export Administration Regulations. Licensee agrees that neither it nor
100any of its subsidiaries will export/re-export any technical data, process,
101software, or service, directly or indirectly, to any country for which the
102United States government or any agency thereof requires an export license,
103other governmental approval, or letter of assurance, without first obtaining
104such license, approval or letter.
105
diff --git a/meta/recipes-extended/acpica/acpica_20190816.bb b/meta/recipes-extended/acpica/acpica_20191018.bb
index 8f79974775..4692275762 100644
--- a/meta/recipes-extended/acpica/acpica_20190816.bb
+++ b/meta/recipes-extended/acpica/acpica_20191018.bb
@@ -9,19 +9,19 @@ ACPI tables."
9HOMEPAGE = "http://www.acpica.org/" 9HOMEPAGE = "http://www.acpica.org/"
10SECTION = "console/tools" 10SECTION = "console/tools"
11 11
12LICENSE = "BSD | GPLv2" 12LICENSE = "Intel | BSD | GPLv2"
13LIC_FILES_CHKSUM = "file://generate/unix/readme.txt;md5=204407e197c1a01154a48f6c6280c3aa" 13LIC_FILES_CHKSUM = "file://source/compiler/aslcompile.c;beginline=7;endline=150;md5=b5690d9ef8d54b2b1e1cc98aad64cd87"
14 14
15COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux" 15COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
16 16
17DEPENDS = "bison flex bison-native" 17DEPENDS = "bison flex bison-native"
18 18
19SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz" 19SRC_URI = "https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz"
20SRC_URI[md5sum] = "6a73b1e34715916fa31132dbe11008b0" 20SRC_URI[md5sum] = "539a0252bcb42c383ceeaeb12ae9a60d"
21SRC_URI[sha256sum] = "888e80f3bb77381620a5ead208e1a1be06f3ea66ddc8cfdfa62811cae5f03752" 21SRC_URI[sha256sum] = "029db4014600e4b771b11a84276d2d76eb40fb26eabc85864852ef1f962be95f"
22UPSTREAM_CHECK_URI = "https://acpica.org/downloads" 22UPSTREAM_CHECK_URI = "https://acpica.org/downloads"
23 23
24S = "${WORKDIR}/acpica-unix2-${PV}" 24S = "${WORKDIR}/acpica-unix-${PV}"
25 25
26inherit update-alternatives 26inherit update-alternatives
27 27