summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--RPM-GPG-KEY-EBS50
-rw-r--r--generic-repos.spec31
-rw-r--r--generic.repo33
3 files changed, 16 insertions, 98 deletions
diff --git a/RPM-GPG-KEY-EBS b/RPM-GPG-KEY-EBS
deleted file mode 100644
index efabcea..0000000
--- a/RPM-GPG-KEY-EBS
+++ /dev/null
@@ -1,50 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-RvdQJiP2pHXAQpBJduIgGAQsGDCk
-=WmUf
------END PGP PUBLIC KEY BLOCK-----
diff --git a/generic-repos.spec b/generic-repos.spec
index 4a0ff7f..5739b9a 100644
--- a/generic-repos.spec
+++ b/generic-repos.spec
@@ -2,7 +2,7 @@
Name: %{vendor}-repos
Version: 1.0
-Release: 3.4
+Release: 3.1
Summary: %{vendor} package repositories
License: Mulan PSL v2
@@ -13,7 +13,6 @@ Requires: %{vendor}-gpg-keys = %{version}-%{release}
Source2: generic.repo
Source4: RPM-GPG-KEY-generic
Source5: LICENSE
-Source6: RPM-GPG-KEY-EBS
%description
%{vendor} package repository files for yum and dnf along with gpg public keys
@@ -32,12 +31,8 @@ This package provides the RPM signature keys.
%install
# Install the keys
install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-install -m 644 %{_sourcedir}/RPM-GPG-KEY-* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
-%if "%{_gpg_name}"=="private OBS"
- mv $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-generic $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-%{vendor}
-%else
- mv $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-EBS $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-%{vendor}
-%endif
+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
@@ -51,30 +46,12 @@ install -m 644 %{_sourcedir}/generic.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vend
/etc/pki/rpm-gpg/
%changelog
-* Wed Aug 16 2023 jufangqun<jufangqun@huawei.com> - 1.0-3.4
+* Tue Aug 15 2023 jufangqun<jufangqun@huawei.com> - 1.0-3.1
- Type:NA
- ID:NA
- SUG:NA
- DESC:configure metalink in repo
-* Mon Mar 27 2023 wangchong <wangchong56@huawei.com> - 1.0-3.3
-- Type:NA
-- ID:NA
-- SUG:NA
-- DESC:add update source repo
-
-* Mon Feb 20 2023 CaoXueliang <caoxl78320@163.com> - 1.0-3.2
-- Type:NA
-- ID:NA
-- SUG:NA
-- DESC:add GPG key for openEuler-23.03
-
-* Tue Feb 14 2023 wangchong <wangchong56@huawei.com> - 1.0-3.1
-- Type:NA
-- ID:NA
-- SUG:NA
-- DESC:modify repo for openEuler-23.03
-
* Thu Mar 4 2021 openEuler Buildteam <buildteam@openeuler.org> - 1.0-3.0
- Type:NA
- ID:NA
diff --git a/generic.repo b/generic.repo
index f87c9c8..4424d4f 100644
--- a/generic.repo
+++ b/generic.repo
@@ -9,63 +9,54 @@
[OS]
name=OS
-baseurl=http://repo.openeuler.org/openEuler-23.03/OS/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/OS&arch=$basearch
metadata_expire=1h
enabled=1
gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-23.03/OS/$basearch/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler
[everything]
name=everything
-baseurl=http://repo.openeuler.org/openEuler-23.03/everything/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/OS&arch=$basearch
metadata_expire=1h
enabled=1
gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-23.03/everything/$basearch/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/RPM-GPG-KEY-openEuler
[EPOL]
name=EPOL
-baseurl=http://repo.openeuler.org/openEuler-23.03/EPOL/main/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/$basearch/
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/OS&arch=$basearch
metadata_expire=1h
enabled=1
gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-23.03/OS/$basearch/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler
[debuginfo]
name=debuginfo
-baseurl=http://repo.openeuler.org/openEuler-23.03/debuginfo/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/OS&arch=$basearch
metadata_expire=1h
enabled=1
gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-23.03/debuginfo/$basearch/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/RPM-GPG-KEY-openEuler
[source]
name=source
-baseurl=http://repo.openeuler.org/openEuler-23.03/source/
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/source/
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/OS&arch=$basearch
metadata_expire=1h
enabled=1
gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-23.03/source/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/source/RPM-GPG-KEY-openEuler
[update]
name=update
-baseurl=http://repo.openeuler.org/openEuler-23.03/update/$basearch/
+baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/update/$basearch/
metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/OS&arch=$basearch
metadata_expire=1h
enabled=1
gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-23.03/OS/$basearch/RPM-GPG-KEY-openEuler
-
-[update-source]
-name=update-source
-baseurl=http://repo.openeuler.org/openEuler-23.03/update/source/
-metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/OS&arch=$basearch
-metadata_expire=1h
-enabled=1
-gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-23.03/source/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-29 19:05:15 +0000