diff --git a/generic-repos.spec b/generic-repos.spec index 6074dd009d53b33d037d9310e7b60a7dc660591a..0a33193ce29735c445fc286737791d45d9ec62ad 100644 --- a/generic-repos.spec +++ b/generic-repos.spec @@ -1,8 +1,9 @@ %global vendor %{?_vendor:%{_vendor}}%{!?_vendor:openEuler} +%bcond_with riscv64_default_repo_subarch_override Name: %{vendor}-repos Version: 1.0 -Release: 5.3 +Release: 5.4 Summary: %{vendor} package repositories License: Mulan PSL v2 @@ -14,6 +15,9 @@ Source2: generic.repo Source4: RPM-GPG-KEY-generic Source5: LICENSE Source6: RPM-GPG-KEY-EBS +%ifarch riscv64 +BuildRequires: sed +%endif %description %{vendor} package repository files for yum and dnf along with gpg public keys @@ -26,6 +30,21 @@ This package provides the RPM signature keys. %prep +%ifarch riscv64 +# riscv64 subarch specific changes (approved) +# Expected values: `rva23`, `rva20` +## Default: `OS/riscv64` -> `OS/riscv64/rva23/riscv64` +## Overrided: `OS/riscv64` -> `OS/riscv64/${EXAMPLE}/riscv64` +%if %{with riscv64_default_repo_subarch_override} +%if 0%{?riscv64_default_repo_subarch_override_name} +%else +%define riscv64_default_repo_subarch_override_name rva20 +%endif +%else +%define riscv64_default_repo_subarch_override_name rva23 +%endif +sed -ie "s#/\$basearch#/riscv64/%{riscv64_default_repo_subarch_override_name}/\$basearch#g" %{_sourcedir}/generic.repo +%endif %build @@ -51,6 +70,12 @@ install -m 644 %{_sourcedir}/generic.repo $RPM_BUILD_ROOT/etc/yum.repos.d/%{vend /etc/pki/rpm-gpg/ %changelog +* Thu Dec 18 2025 jchzhou - 1.0-5.4 +- Type:NA +- ID:NA +- SUG:NA +- DESC:add riscv64 subarch specific changes + * Tue Oct 14 2025 yangchaohao - 1.0-5.3 - Type:NA - ID:NA