From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- meta-openembedded/meta-oe/licenses/Khronos | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 meta-openembedded/meta-oe/licenses/Khronos (limited to 'meta-openembedded/meta-oe/licenses/Khronos') diff --git a/meta-openembedded/meta-oe/licenses/Khronos b/meta-openembedded/meta-oe/licenses/Khronos new file mode 100644 index 000000000..7afedf6cf --- /dev/null +++ b/meta-openembedded/meta-oe/licenses/Khronos @@ -0,0 +1,35 @@ +Copyright (c) 2016 The Khronos Group Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software source and associated documentation files (the "Materials"), +to deal in the Materials without restriction, including without limitation +the rights to use, copy, modify, compile, merge, publish, distribute, +sublicense, and/or sell copies of the Materials, and to permit persons to +whom the Materials are furnished to do so, subject the following terms and +conditions: + +All modifications to the Materials used to create a binary that is +distributed to third parties shall be provided to Khronos with an +unrestricted license to use for the purposes of implementing bug fixes and +enhancements to the Materials; + +If the binary is used as part of an OpenCL(TM) implementation, whether binary +is distributed together with or separately to that implementation, then +recipient must become an OpenCL Adopter and follow the published OpenCL +conformance process for that implementation, details at: +http://www.khronos.org/conformance/; + +The above copyright notice, the OpenCL trademark license, and this permission +notice shall be included in all copies or substantial portions of the +Materials. + +THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE MATERIALS OR THE USE OR OTHER DEALINGS IN +THE MATERIALS. + +OpenCL is a trademark of Apple Inc. used under license by Khronos. + -- cgit v1.2.3