diff --git a/fix-brp-ldconfig-riscv-default-library-directory.patch b/fix-brp-ldconfig-riscv-default-library-directory.patch new file mode 100644 index 0000000000000000000000000000000000000000..5a448b7bcede524bd0bcda85986f2fd9fbbe6dd5 --- /dev/null +++ b/fix-brp-ldconfig-riscv-default-library-directory.patch @@ -0,0 +1,15 @@ +--- openEuler-rpm-config/brp-ldconfig 2020-08-20 17:13:06.000000000 +0800 ++++ openEuler-rpm-config/brp-ldconfig.new 2023-03-08 19:45:58.241036244 +0800 +@@ -5,4 +5,12 @@ + exit 0 + fi + ++riscv64_lp64d=0 ++if [ "$HOSTTYPE" = "riscv64" -a -e $RPM_BUILD_ROOT/usr/lib64 -a ! -e $RPM_BUILD_ROOT/usr/lib64/lp64d ]; then ++ ln -s . $RPM_BUILD_ROOT/usr/lib64/lp64d ++ riscv64_lp64d=1 ++fi + /sbin/ldconfig -N -r "$RPM_BUILD_ROOT" ++if [ $riscv64_lp64d = 1 ]; then ++ rm -f $RPM_BUILD_ROOT/usr/lib64/lp64d ++fi diff --git a/openEuler-rpm-config.spec b/openEuler-rpm-config.spec index 6a7d755bf43e3fcc63b0ccfadafce521b22d0bb6..b6f3ffe877d5bdeb578f25c2bfb463765675f21c 100644 --- a/openEuler-rpm-config.spec +++ b/openEuler-rpm-config.spec @@ -3,7 +3,7 @@ Name: %{vendor}-rpm-config Version: 30 -Release: 36 +Release: 37 License: GPL+ Summary: specific rpm configuration files URL: https://gitee.com/openeuler/openEuler-rpm-config @@ -28,6 +28,7 @@ Patch14: backport-kmp-feature.patch Patch15: 0001-add-loongarch64-for-golang_arches.patch Patch16: fix-config-error-for-loongarch64.patch Patch17: Feature-support-EBS-sign-for-IMA-digest-list.patch +Patch18: fix-brp-ldconfig-riscv-default-library-directory.patch Provides: python-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} Provides: python2-rpm-macros = %{?epoch:%{epoch}:}%{version}-%{release} @@ -78,6 +79,10 @@ Requires: %{_bindir}/grep Requires: %{_bindir}/sed Requires: %{_bindir}/xargs +%if "%{_arch}" == "riscv64" +Requires: coreutils +%endif + # -fstack-clash-protection and -fcf-protection require GCC 8. Conflicts: gcc < 7 @@ -135,6 +140,9 @@ sed -i "s/__vendor/%{vendor}/g" `grep "__vendor" -rl %{buildroot}%{_rpmconfigdir %{rpmvdir}/find-requires.ksyms %changelog +* Fri Mar 24 2023 laokz - 30-37 +- fix riscv64 default library directory of brp-ldconfig + * Fri Mar 17 2023 Xinliang Liu - 30-36 - Fix kmod rpm install failed.