From 51356f3e83e4f96bd2886b214a39d348b760d011 Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Tue, 31 Mar 2020 12:50:50 +0800 Subject: [PATCH 1/2] add default repo for openEuler 20.03 LTS --- generic-repos.spec | 30 +++++++++++--------------- generic.repo | 51 ++++++++++++++++++++++++++++++++++++++++++++ generic_aarch64.repo | 9 -------- generic_x86_64.repo | 9 -------- 4 files changed, 63 insertions(+), 36 deletions(-) create mode 100644 generic.repo delete mode 100644 generic_aarch64.repo delete mode 100644 generic_x86_64.repo diff --git a/generic-repos.spec b/generic-repos.spec index 172321f..69d374c 100644 --- a/generic-repos.spec +++ b/generic-repos.spec @@ -2,7 +2,7 @@ Name: %{vendor}-repos Version: 1.0 -Release: 2.5 +Release: 2.6 Summary: %{vendor} package repositories License: Mulan PSL v1 @@ -10,11 +10,10 @@ Provides: system-repos Provides: %{vendor}-repos Requires: %{vendor}-gpg-keys = %{version}-%{release} -Source2: generic_aarch64.repo +Source2: generic.repo Source3: RPM-GPG-KEY -Source4: generic_x86_64.repo -Source7: RPM-GPG-KEY-generic -Source8: LICENSE +Source4: RPM-GPG-KEY-generic +Source5: LICENSE %description %{vendor} package repository files for yum and dnf along with gpg public keys @@ -37,28 +36,23 @@ install -m 644 %{_sourcedir}/RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/ mv $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-generic $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-%{vendor} install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d -%ifarch aarch64 -install -m 644 %{_sourcedir}/generic_aarch64.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vendor}_aarch64.repo -%endif -%ifarch x86_64 -install -m 644 %{_sourcedir}/generic_x86_64.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vendor}_x86_64.repo -%endif +install -m 644 %{_sourcedir}/generic.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vendor}.repo %files %dir /etc/yum.repos.d -%ifarch aarch64 -%config(noreplace) /etc/yum.repos.d/%{vendor}_aarch64.repo -%endif - -%ifarch x86_64 -%config(noreplace) /etc/yum.repos.d/%{vendor}_x86_64.repo -%endif +%config(noreplace) /etc/yum.repos.d/%{vendor}.repo %files -n %{vendor}-gpg-keys /etc/pki/rpm-gpg/ %changelog +* Tue Mar 31 2020 openEuler Buildteam - 1.0-2.5 +- Type:NA +- ID:NA +- SUG:NA +- DESC:add default repo for openEuler-20.03-LTS + * Mon Dec 23 2019 openEuler Buildteam - 1.0-2.4 - Type:NA - ID:NA diff --git a/generic.repo b/generic.repo new file mode 100644 index 0000000..8c779bb --- /dev/null +++ b/generic.repo @@ -0,0 +1,51 @@ +#Copyright (c) [2019] Huawei Technologies Co., Ltd. +#generic-repos 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 +#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. + +[OS] +name=OS +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler + +[everything] +name=everything +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/RPM-GPG-KEY-openEuler + +[EPOL] +name=EPOL +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler + +[debuginfo] +name=debuginfo +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/RPM-GPG-KEY-openEuler + +[source] +name=source +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/source/ +enabled=1 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/source/RPM-GPG-KEY-openEuler + +[update] +name=update +baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/update/$basearch/ +enabled=0 +gpgcheck=1 +gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler diff --git a/generic_aarch64.repo b/generic_aarch64.repo deleted file mode 100644 index 3f13f3a..0000000 --- a/generic_aarch64.repo +++ /dev/null @@ -1,9 +0,0 @@ -#Copyright (c) [2019] Huawei Technologies Co., Ltd. -#generic-repos 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 -#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. diff --git a/generic_x86_64.repo b/generic_x86_64.repo deleted file mode 100644 index 3f13f3a..0000000 --- a/generic_x86_64.repo +++ /dev/null @@ -1,9 +0,0 @@ -#Copyright (c) [2019] Huawei Technologies Co., Ltd. -#generic-repos 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 -#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. -- Gitee From 956d8a8648a2480d87f204ad19bde45c80e245ad Mon Sep 17 00:00:00 2001 From: openeuler-basic Date: Wed, 8 Apr 2020 10:29:57 +0800 Subject: [PATCH 2/2] modify repo --- generic-repos.spec | 14 +++++++++++++- generic.repo | 1 - 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/generic-repos.spec b/generic-repos.spec index 69d374c..31f2eaa 100644 --- a/generic-repos.spec +++ b/generic-repos.spec @@ -2,7 +2,7 @@ Name: %{vendor}-repos Version: 1.0 -Release: 2.6 +Release: 2.7 Summary: %{vendor} package repositories License: Mulan PSL v1 @@ -47,6 +47,18 @@ install -m 644 %{_sourcedir}/generic.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vend /etc/pki/rpm-gpg/ %changelog +* Wed Apr 8 2020 openEuler Buildteam - 1.0-2.7 +- Type:NA +- ID:NA +- SUG:NA +- DESC:modify repo + +* Wed Apr 8 2020 openEuler Buildteam - 1.0-2.6 +- Type:NA +- ID:NA +- SUG:NA +- DESC:add missing changelog + * Tue Mar 31 2020 openEuler Buildteam - 1.0-2.5 - Type:NA - ID:NA diff --git a/generic.repo b/generic.repo index 8c779bb..b240d68 100644 --- a/generic.repo +++ b/generic.repo @@ -1,4 +1,3 @@ -#Copyright (c) [2019] Huawei Technologies Co., Ltd. #generic-repos 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: -- Gitee