fix executables with name for armv7hl architecturesandbox/dkson95/armv7hl

Change-Id: I42ec917550c4b1d1d7063030c45fc311294f6efd

4 files changed, 16 insertions, 0 deletions

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index 1c9c9fb..c47798c 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -522,6 +522,10 @@ sed -i -e "s,#PLUGIN_POSTUN#,ln -sf liblto_plugin.so.0 ${target_liblto_plugin},"
 awk '/post "/ && !x {print "  post \"echo export\\ CLANG_NO_LIBDIR_SUFFIX=1 >> /etc/profile\""; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }
 
+%{?armv7hl:
+awk '/post "/ && !x {print "  post \"cd /usr/bin/ && cp armv7l-tizen-linux-gnueabi-gcc armv7hl-tizen-linux-gnueabihf-gcc && cp armv7l-tizen-linux-gnueabi-g++ armv7hl-tizen-linux-gnueabihf-g++ && cp armv7l-tizen-linux-gnueabi-c++ armv7hl-tizen-linux-gnueabihf-c++ && cp cpp armv7hl-tizen-linux-gnueabihf-cpp && sed -e s/armv7l-tizen-linux-gnueabi/armv7hl-tizen-linux-gnueabihf/g -i /usr/lib/rpm/macros && sed -e s/armv7l/armv7hl/g -i /usr/lib/rpm/macros\""; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
+}
+
 %{?multilib:
 awk '/post "/ && !x {print "  post \"echo '%{emul_path}/lib' >> /etc/ld.so.conf\"\n"; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index ecdb4d6..a2c011d 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -522,6 +522,10 @@ sed -i -e "s,#PLUGIN_POSTUN#,ln -sf liblto_plugin.so.0 ${target_liblto_plugin},"
 awk '/post "/ && !x {print "  post \"echo export\\ CLANG_NO_LIBDIR_SUFFIX=1 >> /etc/profile\""; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }
 
+%{?armv7hl:
+awk '/post "/ && !x {print "  post \"cd /usr/bin/ && cp armv7l-tizen-linux-gnueabi-gcc armv7hl-tizen-linux-gnueabihf-gcc && cp armv7l-tizen-linux-gnueabi-g++ armv7hl-tizen-linux-gnueabihf-g++ && cp armv7l-tizen-linux-gnueabi-c++ armv7hl-tizen-linux-gnueabihf-c++ && cp cpp armv7hl-tizen-linux-gnueabihf-cpp && sed -e s/armv7l-tizen-linux-gnueabi/armv7hl-tizen-linux-gnueabihf/g -i /usr/lib/rpm/macros && sed -e s/armv7l/armv7hl/g -i /usr/lib/rpm/macros\""; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
+}
+
 %{?multilib:
 awk '/post "/ && !x {print "  post \"echo '%{emul_path}/lib' >> /etc/ld.so.conf\"\n"; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index 98d0dc1..daa06b0 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -522,6 +522,10 @@ sed -i -e "s,#PLUGIN_POSTUN#,ln -sf liblto_plugin.so.0 ${target_liblto_plugin},"
 awk '/post "/ && !x {print "  post \"echo export\\ CLANG_NO_LIBDIR_SUFFIX=1 >> /etc/profile\""; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }
 
+%{?armv7hl:
+awk '/post "/ && !x {print "  post \"cd /usr/bin/ && cp armv7l-tizen-linux-gnueabi-gcc armv7hl-tizen-linux-gnueabihf-gcc && cp armv7l-tizen-linux-gnueabi-g++ armv7hl-tizen-linux-gnueabihf-g++ && cp armv7l-tizen-linux-gnueabi-c++ armv7hl-tizen-linux-gnueabihf-c++ && cp cpp armv7hl-tizen-linux-gnueabihf-cpp && sed -e s/armv7l-tizen-linux-gnueabi/armv7hl-tizen-linux-gnueabihf/g -i /usr/lib/rpm/macros && sed -e s/armv7l/armv7hl/g -i /usr/lib/rpm/macros\""; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
+}
+
 %{?multilib:
 awk '/post "/ && !x {print "  post \"echo '%{emul_path}/lib' >> /etc/ld.so.conf\"\n"; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index 0767396..990a074 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -519,6 +519,10 @@ sed -i -e "s,#PLUGIN_POSTUN#,ln -sf liblto_plugin.so.0 ${target_liblto_plugin},"
 awk '/post "/ && !x {print "  post \"echo export\\ CLANG_NO_LIBDIR_SUFFIX=1 >> /etc/profile\""; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }
 
+%{?armv7hl:
+awk '/post "/ && !x {print "  post \"cd /usr/bin/ && cp armv7l-tizen-linux-gnueabi-gcc armv7hl-tizen-linux-gnueabihf-gcc && cp armv7l-tizen-linux-gnueabi-g++ armv7hl-tizen-linux-gnueabihf-g++ && cp armv7l-tizen-linux-gnueabi-c++ armv7hl-tizen-linux-gnueabihf-c++ && cp cpp armv7hl-tizen-linux-gnueabihf-cpp && sed -e s/armv7l-tizen-linux-gnueabi/armv7hl-tizen-linux-gnueabihf/g -i /usr/lib/rpm/macros && sed -e s/armv7l/armv7hl/g -i /usr/lib/rpm/macros\""; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
+}
+
 %{?multilib:
 awk '/post "/ && !x {print "  post \"echo '%{emul_path}/lib' >> /etc/ld.so.conf\"\n"; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }