folkslinux
/
VMware-Photon-OS
mirror of https://github.com/vmware/photon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <photon-checkins@vmware.com>
Reviewed-by: Sharath George
This commit is contained in:
suezzelur 2020-04-21 19:04:44 -07:00 committed by Sharath George
parent 73df3969f2
commit a3c0949af5
5 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -521,7 +521,8 @@ photon-stage:
@test -d $(PHOTON_SRCS_DIR) || $(MKDIR) -p $(PHOTON_SRCS_DIR) @test -d $(PHOTON_SRCS_DIR) || $(MKDIR) -p $(PHOTON_SRCS_DIR)
@test -d $(PHOTON_LOGS_DIR) || $(MKDIR) -p $(PHOTON_LOGS_DIR) @test -d $(PHOTON_LOGS_DIR) || $(MKDIR) -p $(PHOTON_LOGS_DIR)
@install -m 444 $(SRCROOT)/COPYING $(PHOTON_STAGE)/COPYING @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 # Clean build environment

14
NOTICE
View File

@ -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.

7
NOTICE-Apachev2 Normal file
View File

@ -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.

6
NOTICE-GPL2.0 Normal file
View File

@ -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.

3
support/image-builder/iso/mk-install-iso.sh
View File

@ -37,7 +37,8 @@ mkdir -p $INITRD
chmod 755 $INITRD chmod 755 $INITRD
cp $SCRIPT_PATH/open_source_license.txt $WORKINGDIR/ 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 # 1. install rpms into initrd path
cat > ${WORKINGDIR}/photon-local.repo <<EOF cat > ${WORKINGDIR}/photon-local.repo <<EOF