summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Barinov <v.barinov@samsung.com>2017-02-21 12:40:59 +0300
committerSlava Barinov <v.barinov@samsung.com>2017-02-21 12:40:59 +0300
commit86a0b141155af71fd94ce3d2432e295a079f0916 (patch)
tree76dc6cf8e10757923b0e58a5223cfe945e762073
parent1c7c4d29774576f6902e31e20fbf377559a9b140 (diff)
downloadqemu-accel-sandbox/vbarinov/lib64.tar.gz
qemu-accel-sandbox/vbarinov/lib64.tar.bz2
qemu-accel-sandbox/vbarinov/lib64.zip
Add support for hard-coded /usr/lib/rpm for transition periodsandbox/vbarinov/lib64
Change-Id: I4e654ab4edee46321eb26cd55a29fcd0d0d8ec98 Signed-off-by: Slava Barinov <v.barinov@samsung.com>
-rw-r--r--packaging/qemu-accel-aarch64.spec2
-rw-r--r--packaging/qemu-accel-armv7l.spec2
-rw-r--r--packaging/qemu-accel.spec.in2
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/