From 96904cf394d9b3aa2645e5e529b438098cbacf59 Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Thu, 7 May 2020 15:02:42 +0800 Subject: [PATCH] modify license info in files --- generic-release-1.0/autorun-template | 10 +++++----- generic-release-1.0/color.sh | 10 +++++----- generic-release-1.0/performance.sh | 10 +++++----- generic-release-1.0/supportinfo | 10 +++++----- generic-release-1.0/system-info.sh | 10 +++++----- generic-release.spec | 5 ++++- 6 files changed, 29 insertions(+), 26 deletions(-) diff --git a/generic-release-1.0/autorun-template b/generic-release-1.0/autorun-template index 3e9d798..22a0264 100644 --- a/generic-release-1.0/autorun-template +++ b/generic-release-1.0/autorun-template @@ -1,13 +1,13 @@ #!/bin/sh #Copyright (c) [2019] Huawei Technologies Co., Ltd. -#generic-release is licensed under the Mulan PSL v1. -#You can use this software according to the terms and conditions of the Mulan PSL v1. -#You may obtain a copy of Mulan PSL v1 at: -# http://license.coscl.org.cn/MulanPSL +#generic-release is licensed under the Mulan PSL v2. +#You can use this software according to the terms and conditions of the Mulan PSL v2. +#You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 #THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR #IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR #PURPOSE. -#See the Mulan PSL v1 for more details. +#See the Mulan PSL v2 for more details. dir=$(echo $0 |sed 's/autorun//') cd "$dir" diff --git a/generic-release-1.0/color.sh b/generic-release-1.0/color.sh index f146ce4..0e6ae8a 100644 --- a/generic-release-1.0/color.sh +++ b/generic-release-1.0/color.sh @@ -1,13 +1,13 @@ #/bin/bash #Copyright (c) [2019] Huawei Technologies Co., Ltd. -#generic-release is licensed under the Mulan PSL v1. -#You can use this software according to the terms and conditions of the Mulan PSL v1. -#You may obtain a copy of Mulan PSL v1 at: -# http://license.coscl.org.cn/MulanPSL +#generic-release is licensed under the Mulan PSL v2. +#You can use this software according to the terms and conditions of the Mulan PSL v2. +#You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 #THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR #IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR #PURPOSE. -#See the Mulan PSL v1 for more details. +#See the Mulan PSL v2 for more details. alias ls='ls --color=auto' alias ll='ls -lh' diff --git a/generic-release-1.0/performance.sh b/generic-release-1.0/performance.sh index 6267bea..27559d8 100644 --- a/generic-release-1.0/performance.sh +++ b/generic-release-1.0/performance.sh @@ -1,13 +1,13 @@ #/bin/bash #Copyright (c) [2019] Huawei Technologies Co., Ltd. -#generic-release is licensed under the Mulan PSL v1. -#You can use this software according to the terms and conditions of the Mulan PSL v1. -#You may obtain a copy of Mulan PSL v1 at: -# http://license.coscl.org.cn/MulanPSL +#generic-release is licensed under the Mulan PSL v2. +#You can use this software according to the terms and conditions of the Mulan PSL v2. +#You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 #THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR #IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR #PURPOSE. -#See the Mulan PSL v1 for more details. +#See the Mulan PSL v2 for more details. CPUNO=`cat /proc/cpuinfo|grep processor|wc -l` export GOMP_CPU_AFFINITY=0-$[CPUNO - 1] diff --git a/generic-release-1.0/supportinfo b/generic-release-1.0/supportinfo index 7090deb..6644b6b 100644 --- a/generic-release-1.0/supportinfo +++ b/generic-release-1.0/supportinfo @@ -1,12 +1,12 @@ # Copyright (c) [2019] Huawei Technologies Co., Ltd. -# generic-release is licensed under the Mulan PSL v1. -# You can use this software according to the terms and conditions of the Mulan PSL v1. -# You may obtain a copy of Mulan PSL v1 at: -# http://license.coscl.org.cn/MulanPSL +# generic-release is licensed under the Mulan PSL v2. +# You can use this software according to the terms and conditions of the Mulan PSL v2. +# You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 #THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR #IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR #PURPOSE. -#See the Mulan PSL v1 for more details. +#See the Mulan PSL v2 for more details. # # supported hardware descriptor for openEuler 1.0 # diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index 211f66e..a4e9254 100644 --- a/generic-release-1.0/system-info.sh +++ b/generic-release-1.0/system-info.sh @@ -1,13 +1,13 @@ #/bin/bash #Copyright (c) [2019] Huawei Technologies Co., Ltd. -#generic-release is licensed under the Mulan PSL v1. -#You can use this software according to the terms and conditions of the Mulan PSL v1. -#You may obtain a copy of Mulan PSL v1 at: -# http://license.coscl.org.cn/MulanPSL +#generic-release is licensed under the Mulan PSL v2. +#You can use this software according to the terms and conditions of the Mulan PSL v2. +#You may obtain a copy of Mulan PSL v2 at: +# http://license.coscl.org.cn/MulanPSL2 #THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR #IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR #PURPOSE. -#See the Mulan PSL v1 for more details. +#See the Mulan PSL v2 for more details. # Welcome welcome=$(uname -r) diff --git a/generic-release.spec b/generic-release.spec index 6650d81..ad329f1 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,7 +5,7 @@ %define dist_release_version 8 %define generic_version 20.03 %define generic_patch_level LTS -%define generic_release 34 +%define generic_release 35 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -136,6 +136,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/performance.sh %changelog +* Thu May 7 2020 shenyangyang - 1.0-35 +- Modify the license info in files + * Wed Apr 29 2020 shenyangyang - 1.0-34 - Change license of mulan to v2 -- Gitee