From: Jackie Huang Date: Wed, 13 Nov 2019 01:36:41 +0000 (+0800) Subject: meta-oran: fix license for images and packagegroups X-Git-Tag: bronze-rc0~106 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=b0035656bffa7bc0355493a1747b11e3b150d80a;p=pti%2Frtp.git meta-oran: fix license for images and packagegroups Change the license from MIT to Apache-2.0 for images and packagegroups. Issue-ID: INF-4 Signed-off-by: Jackie Huang Change-Id: Iccd2dcb667dc593002f0a977bebc5d5efec23b71 --- diff --git a/meta-oran/README b/meta-oran/README index 7811e72..3281dcd 100644 --- a/meta-oran/README +++ b/meta-oran/README @@ -35,20 +35,14 @@ stated in the associated recipe (.bb file) unless otherwise stated. The metadata is under the following license unless otherwise stated. -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/meta-oran/recipes-base/images/oran-image-inf-guest.bb b/meta-oran/recipes-base/images/oran-image-inf-guest.bb index 5e77467..f0f54be 100644 --- a/meta-oran/recipes-base/images/oran-image-inf-guest.bb +++ b/meta-oran/recipes-base/images/oran-image-inf-guest.bb @@ -3,10 +3,8 @@ # DESCRIPTION = "An image suitable for a O-RAN INF guest." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" require recipes-base/images/oran-image-inf-minimal.bb diff --git a/meta-oran/recipes-base/images/oran-image-inf-host.bb b/meta-oran/recipes-base/images/oran-image-inf-host.bb index 688ffa3..de8e565 100644 --- a/meta-oran/recipes-base/images/oran-image-inf-host.bb +++ b/meta-oran/recipes-base/images/oran-image-inf-host.bb @@ -3,10 +3,8 @@ # DESCRIPTION = "An image suitable for a O-RAN INF host." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" require recipes-base/images/oran-image-inf-minimal.bb diff --git a/meta-oran/recipes-base/images/oran-image-inf-minimal.bb b/meta-oran/recipes-base/images/oran-image-inf-minimal.bb index 005d077..0a248d0 100644 --- a/meta-oran/recipes-base/images/oran-image-inf-minimal.bb +++ b/meta-oran/recipes-base/images/oran-image-inf-minimal.bb @@ -3,10 +3,8 @@ # DESCRIPTION = "An image suitable for a minimal O-RAN guest or host." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" IMAGE_INSTALL = " \ packagegroup-core-boot \ diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb index a50eb69..6c9d672 100644 --- a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb +++ b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb @@ -1,12 +1,22 @@ # # Copyright (C) 2019 Wind River Systems, Inc. # +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. DESCRIPTION = "Packagegroup for ORAN packages" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend b/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend index 890928c..9b4fcc1 100644 --- a/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend +++ b/meta-oran/recipes-base/packagegroups/packagegroup-self-hosted.bbappend @@ -1,3 +1,18 @@ +# +# Copyright (C) 2019 Wind River Systems, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + REQUIRED_DISTRO_FEATURES_remove = "x11 opengl" PACKAGES_remove = "packagegroup-self-hosted-graphics" RDEPENDS_packagegroup-self-hosted_remove = "packagegroup-self-hosted-graphics"