Tizen:3.0:Base, Tizen:Base: Fix qemu / accel packages to use x86_64 host

archtecture

Change-Id: I5545987e75760fa8424986c65d6b165367a090f5
Signed-off-by: Chan Lee <chan45.lee@samsung.com>

diff --git a/Tizen:3.0:Base/_config b/Tizen:3.0:Base/_config
index 94ee02f..8eeb797 100644 (file)
--- a/Tizen:3.0:Base/_config
+++ b/Tizen:3.0:Base/_config
@@ -1,5 +1,3 @@
-Substitute: python-accel-armv7l-cross-arm python-accel-armv7l
-Substitute: python-accel-aarch64-cross-aarch64 python-accel-aarch64
 ################################################################################
 # OBS Project config for Tizen:Base
 #
@@ -68,23 +66,28 @@ Target: aarch64-tizen-linux
 
 ########## cross build ##########
 
+%define build_hostarch x86_64
+Macros:
+%build_hostarch x86_64
+:Macros
+
 %ifarch %arm armv7l aarch64
 Hostarch: x86_64
 # cross build support for the build hosts
-Preinstall: qemu-linux-user-cross
-Runscripts: qemu-linux-user-cross
-Keep: qemu-linux-user-cross
+Preinstall: qemu-linux-user-%{build_hostarch}-cross
+Runscripts: qemu-linux-user-%{build_hostarch}-cross
+Keep: qemu-linux-user-%{build_hostarch}-cross
 %endif
 
 %ifarch armv7l
-Preinstall: qemu-accel-armv7l
-Runscripts: qemu-accel-armv7l
+Preinstall: qemu-accel-%{build_hostarch}-armv7l
+Runscripts: qemu-accel-%{build_hostarch}-armv7l
 Preinstall: libmount libblkid libuuid
 %endif
 
 %ifarch aarch64
-Preinstall: qemu-accel-aarch64
-Runscripts: qemu-accel-aarch64
+Preinstall: qemu-accel-%{build_hostarch}-aarch64
+Runscripts: qemu-accel-%{build_hostarch}-aarch64
 Preinstall: libmount libblkid libuuid
 %endif # aarch64
 
@@ -98,19 +101,22 @@ Macros:
 %if %speedpython
 %ifarch armv7l
 Macros:
-%en_speedpython BuildRequires: python-accel-armv7l
-%no_speedpython BuildRequires: -python-accel-armv7l
+%en_speedpython BuildRequires: python-accel-%{build_hostarch}-armv7l
+%no_speedpython BuildRequires: -python-accel-%{build_hostarch}-armv7l
 :Macros
 %endif
 
 %ifarch aarch64
 Macros:
-%en_speedpython BuildRequires: python-accel-aarch64
-%no_speedpython BuildRequires: -python-accel-aarch64
+%en_speedpython BuildRequires: python-accel-%{build_hostarch}-aarch64
+%no_speedpython BuildRequires: -python-accel-%{build_hostarch}-aarch64
 :Macros
 %endif # aarch64
 %endif
 
+Substitute: python-accel-armv7l-cross-arm python-accel-%{build_hostarch}-armv7l
+Substitute: python-accel-aarch64-cross-aarch64 python-accel-%{build_hostarch}-aarch64
+
 ########## exports for different architectures ##########
 
 ExportFilter: \.armv7l\.rpm$ armv7l

diff --git a/Tizen:Base/_config b/Tizen:Base/_config
index 1bc3913..1a7f859 100644 (file)
--- a/Tizen:Base/_config
+++ b/Tizen:Base/_config
@@ -1,5 +1,3 @@
-Substitute: python-accel-armv7l-cross-arm python-accel-armv7l
-Substitute: python-accel-aarch64-cross-aarch64 python-accel-aarch64
 ################################################################################
 # OBS Project config for Tizen:Base
 #
@@ -76,23 +74,28 @@ Target: aarch64-tizen-linux
 
 ########## cross build ##########
 
+%define build_hostarch x86_64
+Macros:
+%build_hostarch x86_64
+:Macros
+
 %ifarch %arm armv7l aarch64
 Hostarch: x86_64
 # cross build support for the build hosts
-Preinstall: qemu-linux-user-cross
-Runscripts: qemu-linux-user-cross
-Keep: qemu-linux-user-cross
+Preinstall: qemu-linux-user-%{build_hostarch}-cross
+Runscripts: qemu-linux-user-%{build_hostarch}-cross
+Keep: qemu-linux-user-%{build_hostarch}-cross
 %endif
 
 %ifarch armv7l
-Preinstall: qemu-accel-armv7l
-Runscripts: qemu-accel-armv7l
+Preinstall: qemu-accel-%{build_hostarch}-armv7l
+Runscripts: qemu-accel-%{build_hostarch}-armv7l
 Preinstall: libmount libblkid libuuid
 %endif
 
 %ifarch aarch64
-Preinstall: qemu-accel-aarch64
-Runscripts: qemu-accel-aarch64
+Preinstall: qemu-accel-%{build_hostarch}-aarch64
+Runscripts: qemu-accel-%{build_hostarch}-aarch64
 Preinstall: libmount libblkid libuuid
 %endif # aarch64
 
@@ -106,19 +109,22 @@ Macros:
 %if %speedpython
 %ifarch armv7l
 Macros:
-%en_speedpython BuildRequires: python-accel-armv7l
-%no_speedpython BuildRequires: -python-accel-armv7l
+%en_speedpython BuildRequires: python-accel-%{build_hostarch}-armv7l
+%no_speedpython BuildRequires: -python-accel-%{build_hostarch}-armv7l
 :Macros
 %endif
 
 %ifarch aarch64
 Macros:
-%en_speedpython BuildRequires: python-accel-aarch64
-%no_speedpython BuildRequires: -python-accel-aarch64
+%en_speedpython BuildRequires: python-accel-%{build_hostarch}-aarch64
+%no_speedpython BuildRequires: -python-accel-%{build_hostarch}-aarch64
 :Macros
 %endif # aarch64
 %endif
 
+Substitute: python-accel-armv7l-cross-arm python-accel-%{build_hostarch}-armv7l
+Substitute: python-accel-aarch64-cross-aarch64 python-accel-%{build_hostarch}-aarch64
+
 ########## exports for different architectures ##########
 
 ExportFilter: \.armv7l\.rpm$ armv7l