!84 【轻量级 PR】：fix issues IB3SOC

From: @yang-chaohao Reviewed-by: @wangchong1995924 Signed-off-by: @wangchong1995924
fix issues IB3SOC
2024-11-14 03:03:19 +00:00 · 2024-11-14 02:39:56 +00:00 · 2024-11-07 06:16:01 +00:00 · 2024-11-06 14:22:56 +08:00 · 2024-07-24 01:40:48 +00:00 · 2024-07-23 09:36:37 +08:00
4 changed files with 121 additions and 35 deletions
--- a/19
+++ b/19
@ -1,19 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBEwtJWoBCACpiY2rGA6T0ceBi92X88/QclytVBjtDRohOVzs3pmIPh3ULqsW
-G323nmyKbKQBBSjh9OnuO9Y09VG8mzr/w9YV0Ix4cI9/HDTERZ2+TR5u+VNn5J5h
-yvwQSN/FEK6oH2+mz7O0yUNleN7UltR4MOEkHIoAhIvv+1AQQKN3OM8oalz+3gv/
-zz9rAoQczQzT7QWOtBrsRMZgBrKXY/TpJrpVSO3Hx8CnbhKGtLxCCrxZ5v7hh1ht
-3CRAr2+h5bDA9KP6vBZWKEs7NgcvtZFDY6EJc7AoApr3phX9hHE2+snTxe82DkFT
-uA69C8wLyjPCoSy+tcaCqJKOZelNy9RN/WKRABEBAAG0RE9yYWNsZSBPU1MgZ3Jv
-dXAgKE9wZW4gU291cmNlIFNvZnR3YXJlIGdyb3VwKSA8YnVpbGRAb3NzLm9yYWNs
-ZS5jb20+iQE8BBMBAgAmAhsDBgsJCAcDAgQVAggDBBYCAwECHgECF4AFAlNhkUEF
-CSaOl9cACgkQcvl7dOxVHwNHFQf9G2ZI5ZH8T1VASvQteTyUR7uNgqXEbJhi9zZO
-7EO26+wzkj9EGLmH1COdUApZ1cINsYfGGgUJT5mfcRV3yYZbwc4AZJbJe0z7C5Yu
-ZLs5W0ryV4bzIqcWnVphIAOwmxMxIVGz8Cr1Dsyyal7ORgYzdfOppYetwtZ+J+Wn
-/oVgFkh9v19l/CltBkRh2SqgUZYfCoELo7hUzLNh7cw2av8rcSUKSH3ra9MvpYfS
-ANCnouzbgKix1gD6niT3pm1s5II3VuQ2vEcJunnoRFci9FzLXelTuL00MvuxERr7
-Fsqm1/D2JfKDbE09qy5bLWrWaTM6zOFQKN7F2edY2uaukLT6/w==
-=Djed
-----END PGP PUBLIC KEY BLOCK-----
--- a/50
+++ b/50
@ -0,0 +1,50 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+RvdQJiP2pHXAQpBJduIgGAQsGDCk
+=WmUf
+-----END PGP PUBLIC KEY BLOCK-----
--- a/generic-repos.spec
+++ b/generic-repos.spec
@ -2,7 +2,7 @@

 Name:           %{vendor}-repos
 Version:        1.0
-Release:        2.9
+Release:        4.2
 Summary:        %{vendor} package repositories
 License:        Mulan PSL v2

@ -11,9 +11,9 @@ Provides:       %{vendor}-repos
 Requires:       %{vendor}-gpg-keys = %{version}-%{release}

 Source2:        generic.repo
-Source3:        RPM-GPG-KEY
 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
@ -33,7 +33,11 @@ This package provides the RPM signature keys.
 # 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/
-mv $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-generic $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-%{vendor}
+%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 -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d

@ -47,6 +51,36 @@ install -m 644 %{_sourcedir}/generic.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vend
 /etc/pki/rpm-gpg/

 %changelog
+* Wed Nov 13 2024 wangchong <wangchong56@huawei.com> - 1.0-4.2
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:fix issues IB3SOC
+
+* Wed Nov 6 2024 wangchong <wangchong56@huawei.com> - 1.0-3.3
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:modify repo
+
+* Mon Jun 17 2024 fuyong <fuyong29@h-partners.com> - 1.0-3.2
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:configure metalink in repo
+
+* Thu Feb 29 2024 wangchong <wangchong56@huawei.com> - 1.0-3.1
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:add ebs key
+
+* Thu Mar 4 2021 openEuler Buildteam <buildteam@openeuler.org> - 1.0-3.0
+- Type:NA
+- ID:NA
+- SUG:NA
+- DESC:delete unneeded GPG KEY and enable update repo
+
 * Wed May 6 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.0-2.9
 - Type:NA
 - ID:NA
--- a/generic.repo
+++ b/generic.repo
@ -9,42 +9,63 @@

 [OS]
 name=OS
-baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/
+baseurl=https://repo.openeuler.org/openEuler-24.03-LTS-SP1/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-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-24.03-LTS-SP1/OS/$basearch/RPM-GPG-KEY-openEuler

 [everything]
 name=everything
-baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/
+baseurl=https://repo.openeuler.org/openEuler-24.03-LTS-SP1/everything/$basearch/
+metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/everything&arch=$basearch
+metadata_expire=1h
 enabled=1
 gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/everything/$basearch/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-24.03-LTS-SP1/everything/$basearch/RPM-GPG-KEY-openEuler

 [EPOL]
 name=EPOL
-baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/EPOL/$basearch/
+baseurl=https://repo.openeuler.org/openEuler-24.03-LTS-SP1/EPOL/main/$basearch/
+metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/EPOL/main&arch=$basearch
+metadata_expire=1h
 enabled=1
 gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-24.03-LTS-SP1/OS/$basearch/RPM-GPG-KEY-openEuler

 [debuginfo]
 name=debuginfo
-baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/
+baseurl=https://repo.openeuler.org/openEuler-24.03-LTS-SP1/debuginfo/$basearch/
+metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/debuginfo&arch=$basearch
+metadata_expire=1h
 enabled=1
 gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/debuginfo/$basearch/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-24.03-LTS-SP1/debuginfo/$basearch/RPM-GPG-KEY-openEuler

 [source]
 name=source
-baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/source/
+baseurl=https://repo.openeuler.org/openEuler-24.03-LTS-SP1/source/
+metalink=https://mirrors.openeuler.org/metalink?repo=$releasever&arch=source
+metadata_expire=1h
 enabled=1
 gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/source/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-24.03-LTS-SP1/source/RPM-GPG-KEY-openEuler

 [update]
 name=update
-baseurl=http://repo.openeuler.org/openEuler-20.03-LTS/update/$basearch/
-enabled=0
+baseurl=https://repo.openeuler.org/openEuler-24.03-LTS-SP1/update/$basearch/
+metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/update&arch=$basearch
+metadata_expire=1h
+enabled=1
 gpgcheck=1
-gpgkey=http://repo.openeuler.org/openEuler-20.03-LTS/OS/$basearch/RPM-GPG-KEY-openEuler
+gpgkey=http://repo.openeuler.org/openEuler-24.03-LTS-SP1/OS/$basearch/RPM-GPG-KEY-openEuler
+
+[update-source]
+name=update-source
+baseurl=https://repo.openeuler.org/openEuler-24.03-LTS-SP1/update/source/
+metalink=https://mirrors.openeuler.org/metalink?repo=$releasever/update&arch=source
+metadata_expire=1h
+enabled=1
+gpgcheck=1
+gpgkey=http://repo.openeuler.org/openEuler-24.03-LTS-SP1/source/RPM-GPG-KEY-openEuler
Author	SHA1	Message	Date
openeuler-ci-bot	0698c2b6c0	!84 【轻量级 PR】：fix issues IB3SOC From: @yang-chaohao Reviewed-by: @wangchong1995924 Signed-off-by: @wangchong1995924	2024-11-14 03:03:19 +00:00
杨超豪	979947eacf	fix issues IB3SOC issue link:https://gitee.com/src-openeuler/openEuler-repos/issues/IB3SOC?from=project-issue Signed-off-by: 杨超豪 <yangchaohao@huawei.com>	2024-11-14 02:39:56 +00:00
openeuler-ci-bot	717e0bf12b	!82 modify repo From: @wangchong1995924 Reviewed-by: @overweight Signed-off-by: @overweight	2024-11-07 06:16:01 +00:00
wangchong1995924	898f3cad95	modify repo	2024-11-06 14:22:56 +08:00
openeuler-ci-bot	51ac88c86a	!70 configure metalink in repo for openEuler-24.03-LTS-Next From: @Coopermassaki Reviewed-by: @overweight Signed-off-by: @overweight	2024-07-24 01:40:48 +00:00
Coopersaki	c138f5b4c9	configure metalink in repo for openEuler-24.03-LTS-Next	2024-07-23 09:36:37 +08:00
openeuler-ci-bot	47f4aa7404	!63 添加EulerMaker rpm签名公钥 From: @small_leek Reviewed-by: @wangchong1995924 Signed-off-by: @wangchong1995924	2024-02-29 03:18:19 +00:00
wangchong1995924	e3b7b980fc	add ebs key	2024-02-29 10:51:04 +08:00
openeuler-ci-bot	fe8ed45080	!14 openEuler-repos: delete unneeded GPG KEY and enable update repo From: @openeuler-basic Reviewed-by: @overweight Signed-off-by: @overweight	2021-03-04 17:10:22 +08:00
Yangyang Shen	af85e76e84	delete unneeded GPG KEY and enable update repo	2021-03-04 16:37:02 +08:00