summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChan Lee <chan45.lee@samsung.com>2017-05-24 15:00:06 +0900
committerChan Lee <chan45.lee@samsung.com>2017-06-01 12:39:07 +0900
commit44652613c26e39f50aa21d7382e1e8c00b5700e1 (patch)
tree2f8cef3ec52c2c491900dbab39f923e07d50b046
parent2f7e7fc026c9294b6e8269b3acb1bc67de97ac7a (diff)
downloadqemu-accel-44652613c26e39f50aa21d7382e1e8c00b5700e1.tar.gz
qemu-accel-44652613c26e39f50aa21d7382e1e8c00b5700e1.tar.bz2
qemu-accel-44652613c26e39f50aa21d7382e1e8c00b5700e1.zip
One line bash condition in a rpm script could cause scriptlet error like below, "warning: %post(qemu-accel-XXXX) scriptlet failed, exit status 1" because '[ ]' returns with 1 exit status when the expression parameter is false. You can refer to following page, https://en.wikipedia.org/wiki/Test_(Unix)#Exit_status Currently the condition is useless so it could be removed. Change-Id: I25ae94ec7ad1f98bd84a127ea8a6a5c7aab21e32 Signed-off-by: Chan Lee <chan45.lee@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 0cad174..3bccb4d 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -355,7 +355,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 $(dirname %{_rpmconfigdir}) && ln -s /usr/lib/rpm %{_rpmconfigdir}"' %{_sourcedir}/baselibs.conf
+sed -i -e '/post "/a post "echo '%{our_path}/lib' >> /etc/ld.so.conf"\n' %{_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 35fa679..53c4b65 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -355,7 +355,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 $(dirname %{_rpmconfigdir}) && ln -s /usr/lib/rpm %{_rpmconfigdir}"' %{_sourcedir}/baselibs.conf
+sed -i -e '/post "/a post "echo '%{our_path}/lib' >> /etc/ld.so.conf"\n' %{_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 f3764ee..96148c8 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -352,7 +352,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 $(dirname %{_rpmconfigdir}) && ln -s /usr/lib/rpm %{_rpmconfigdir}"' %{_sourcedir}/baselibs.conf
+sed -i -e '/post "/a post "echo '%{our_path}/lib' >> /etc/ld.so.conf"\n' %{_sourcedir}/baselibs.conf
# Set rpm config directory corresponding to architecture
mkdir -p %{buildroot}%{_sysconfdir}/profile.d/