From 86a0b141155af71fd94ce3d2432e295a079f0916 Mon Sep 17 00:00:00 2001 From: Slava Barinov Date: Tue, 21 Feb 2017 12:40:59 +0300 Subject: Add support for hard-coded /usr/lib/rpm for transition period Change-Id: I4e654ab4edee46321eb26cd55a29fcd0d0d8ec98 Signed-off-by: Slava Barinov --- packaging/qemu-accel-aarch64.spec | 2 +- packaging/qemu-accel-armv7l.spec | 2 +- packaging/qemu-accel.spec.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec index dc18388..461ca7a 100644 --- a/packaging/qemu-accel-aarch64.spec +++ b/packaging/qemu-accel-aarch64.spec @@ -333,7 +333,7 @@ sed -i -e "s,#PLUGIN_POSTIN#,ln -sf %{our_path}${gcc_install_dir}/liblto_plugin. sed -i -e "s,#PLUGIN_POSTUN#,ln -sf liblto_plugin.so.0 ${gcc_install_dir}/liblto_plugin.so," %{_sourcedir}/baselibs.conf %{?multilib: -sed -i -e '/post "/a post "echo '%{our_path}/lib' >> /etc/ld.so.conf"\n post "[ ! -e %{_rpmconfigdir} ] && mkdir -p %{_libdir} && ln -s %{libdir}/rpm %{_rpmconfigdir}"' %{_sourcedir}/baselibs.conf +sed -i -e '/post "/a post "echo '%{our_path}/lib' >> /etc/ld.so.conf"\n post "[ ! -e %{_rpmconfigdir} ] && mkdir -p $(dirname %{_rpmconfigdir}) && ln -s /usr/lib/rpm %{_rpmconfigdir}"' %{_sourcedir}/baselibs.conf # Set rpm config directory corresponding to architecture mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec index dca7949..dd16df5 100644 --- a/packaging/qemu-accel-armv7l.spec +++ b/packaging/qemu-accel-armv7l.spec @@ -333,7 +333,7 @@ sed -i -e "s,#PLUGIN_POSTIN#,ln -sf %{our_path}${gcc_install_dir}/liblto_plugin. sed -i -e "s,#PLUGIN_POSTUN#,ln -sf liblto_plugin.so.0 ${gcc_install_dir}/liblto_plugin.so," %{_sourcedir}/baselibs.conf %{?multilib: -sed -i -e '/post "/a post "echo '%{our_path}/lib' >> /etc/ld.so.conf"\n post "[ ! -e %{_rpmconfigdir} ] && mkdir -p %{_libdir} && ln -s %{libdir}/rpm %{_rpmconfigdir}"' %{_sourcedir}/baselibs.conf +sed -i -e '/post "/a post "echo '%{our_path}/lib' >> /etc/ld.so.conf"\n post "[ ! -e %{_rpmconfigdir} ] && mkdir -p $(dirname %{_rpmconfigdir}) && ln -s /usr/lib/rpm %{_rpmconfigdir}"' %{_sourcedir}/baselibs.conf # Set rpm config directory corresponding to architecture mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in index 0b79cc6..bb78149 100644 --- a/packaging/qemu-accel.spec.in +++ b/packaging/qemu-accel.spec.in @@ -330,7 +330,7 @@ sed -i -e "s,#PLUGIN_POSTIN#,ln -sf %{our_path}${gcc_install_dir}/liblto_plugin. sed -i -e "s,#PLUGIN_POSTUN#,ln -sf liblto_plugin.so.0 ${gcc_install_dir}/liblto_plugin.so," %{_sourcedir}/baselibs.conf %{?multilib: -sed -i -e '/post "/a post "echo '%{our_path}/lib' >> /etc/ld.so.conf"\n post "[ ! -e %{_rpmconfigdir} ] && mkdir -p %{_libdir} && ln -s %{libdir}/rpm %{_rpmconfigdir}"' %{_sourcedir}/baselibs.conf +sed -i -e '/post "/a post "echo '%{our_path}/lib' >> /etc/ld.so.conf"\n post "[ ! -e %{_rpmconfigdir} ] && mkdir -p $(dirname %{_rpmconfigdir}) && ln -s /usr/lib/rpm %{_rpmconfigdir}"' %{_sourcedir}/baselibs.conf # Set rpm config directory corresponding to architecture mkdir -p %{buildroot}%{_sysconfdir}/profile.d/ -- cgit v1.2.3