From a3c0949af50bc9ce77b80004deaaf94f37374051 Mon Sep 17 00:00:00 2001 From: suezzelur Date: Tue, 21 Apr 2020 19:04:44 -0700 Subject: [PATCH] Update NOTICE file Change-Id: If1708dca3701ac25f6066fad2d7fc00880529f32 Conflicts: common/data/build_install_options_all.json Change-Id: I04da926868dd1bfc89c20c7e8703994492fb3c97 Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/9619 Tested-by: gerrit-photon Reviewed-by: Sharath George --- Makefile | 3 ++- NOTICE | 14 -------------- NOTICE-Apachev2 | 7 +++++++ NOTICE-GPL2.0 | 6 ++++++ support/image-builder/iso/mk-install-iso.sh | 3 ++- 5 files changed, 17 insertions(+), 16 deletions(-) delete mode 100644 NOTICE create mode 100644 NOTICE-Apachev2 create mode 100644 NOTICE-GPL2.0 diff --git a/Makefile b/Makefile index b3ff79bb82..5c0d0f64a3 100644 --- a/Makefile +++ b/Makefile @@ -521,7 +521,8 @@ photon-stage: @test -d $(PHOTON_SRCS_DIR) || $(MKDIR) -p $(PHOTON_SRCS_DIR) @test -d $(PHOTON_LOGS_DIR) || $(MKDIR) -p $(PHOTON_LOGS_DIR) @install -m 444 $(SRCROOT)/COPYING $(PHOTON_STAGE)/COPYING - @install -m 444 $(SRCROOT)/NOTICE $(PHOTON_STAGE)/NOTICE + @install -m 444 $(SRCROOT)/NOTICE-GPL2.0 $(PHOTON_STAGE)/NOTICE-GPL2.0 + @install -m 444 $(SRCROOT)/NOTICE-Apachev2 $(PHOTON_STAGE)/NOTICE-Apachev2 #_______________________________________________________________________________ # Clean build environment diff --git a/NOTICE b/NOTICE deleted file mode 100644 index 78dcf53604..0000000000 --- a/NOTICE +++ /dev/null @@ -1,14 +0,0 @@ -NOTICE - -Photon OS v3.0 - -Copyright © 2014-2019 VMware, Inc. All Rights Reserved. - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License (GPL) version 2.0 or for the "libtdnf" source, under the terms of the GNU Lesser General Public License (LGPL) version 2.1, as published by the Free Software Foundation. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTIBILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License version 2.0 and LGPL version 2.1 for more details. - -You should have received a copy of the GPL version 2 and LGPL version 2.1 along with this program. If not, see https://www.gnu.org/licenses/gpl-2.0.html and https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - -The full text of the GPL v2.0 and LGPL v2.1 are provided in the COPYING file. Some files may be comprised of various open source software components, each of which has its own license that is located in the source code of the respective component. - diff --git a/NOTICE-Apachev2 b/NOTICE-Apachev2 new file mode 100644 index 0000000000..47ae8bdc32 --- /dev/null +++ b/NOTICE-Apachev2 @@ -0,0 +1,7 @@ +Photon +Copyright 2015-2020 VMware, Inc. All Rights Reserved. + +This product is licensed to you under the Apache 2.0 license (the "License"). You may not use this product except in compliance with the Apache 2.0 License. + +This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. + diff --git a/NOTICE-GPL2.0 b/NOTICE-GPL2.0 new file mode 100644 index 0000000000..dbacf90be4 --- /dev/null +++ b/NOTICE-GPL2.0 @@ -0,0 +1,6 @@ +Photon +Copyright 2015-2020 VMware, Inc. All Rights Reserved. + +This product is licensed to you under the GNU GENERAL PUBLIC LICENSE Version 2 license (the "License"). You may not use this product except in compliance with the GPL 2.0 License. + +This product may include a number of subcomponents with separate copyright notices and license terms. Your use of these subcomponents is subject to the terms and conditions of the subcomponent's license, as noted in the LICENSE file. diff --git a/support/image-builder/iso/mk-install-iso.sh b/support/image-builder/iso/mk-install-iso.sh index 396441640b..2d92c1555f 100755 --- a/support/image-builder/iso/mk-install-iso.sh +++ b/support/image-builder/iso/mk-install-iso.sh @@ -37,7 +37,8 @@ mkdir -p $INITRD chmod 755 $INITRD cp $SCRIPT_PATH/open_source_license.txt $WORKINGDIR/ -cp $STAGE_PATH/NOTICE $WORKINGDIR/ +cp $STAGE_PATH/NOTICE-Apachev2 $WORKINGDIR/ +cp $STAGE_PATH/NOTICE-GPL2.0 $WORKINGDIR/ # 1. install rpms into initrd path cat > ${WORKINGDIR}/photon-local.repo <