From: wchang kim <wchang.kim@samsung.com>
Date: Thu, 9 Dec 2021 04:42:10 +0000 (+0900)
Subject: Changes the arch name using rpm macro
X-Git-Tag: submit/tizen/20211209.050534^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F05%2F267705%2F1;p=tools%2Fbuilding-blocks.git

Changes the arch name using rpm macro

Change-Id: Iafc4d1362b96a5bc061e0582a76015fc610c255b
---

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index 2f63bd1..4edbe87 100644
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -83,7 +83,7 @@ Source3502:	platform-preset-iot-headed-images.inc
 Source3503:	platform-preset-partitions.inc
 
 Source3800:	platform-preset-boards.inc
-%ifarch armv7l aarch64
+%ifarch %{arm} aarch64
 Source3811:	platform-preset-boards-rpi3-hal-backend.inc
 Source3815:	platform-preset-boards-rpi4-hal-backend.inc
 Source3820:	platform-preset-boards-common.inc
@@ -95,7 +95,7 @@ Source3812:	platform-preset-boards-artik530-hal-backend.inc
 Source3813:	platform-preset-boards-vim3-hal-backend.inc
 Source3814:	platform-preset-boards-c4-hal-backend.inc
 %endif
-%ifarch i586 i686 x86_64
+%ifarch %{ix86} x86_64
 Source3803: platform-preset-boards-emul.inc
 %endif
 
@@ -416,7 +416,7 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE3503}}
 
 %{include_if_mainbuild %{SOURCE3800}}
-%ifarch armv7l aarch64
+%ifarch %{arm} aarch64
 %{include_if_mainbuild %{SOURCE3811}}
 %{include_if_mainbuild %{SOURCE3815}}
 %{include_if_mainbuild %{SOURCE3820}}
@@ -428,7 +428,7 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE3813}}
 %{include_if_mainbuild %{SOURCE3814}}
 %endif
-%ifarch i586 i686 x86_64
+%ifarch %{ix86} x86_64
 %{include_if_mainbuild %{SOURCE3803}}
 %endif
 %package	mapping-files
diff --git a/packaging/domain-features-bootanimation.inc b/packaging/domain-features-bootanimation.inc
index 31fe942..a847451 100644
--- a/packaging/domain-features-bootanimation.inc
+++ b/packaging/domain-features-bootanimation.inc
@@ -7,11 +7,10 @@
 %package sub1-domain_Feature-BootAni
 Summary:	Boot Animation packages
 Requires: boot-animation
-%ifarch armv7l aarch64
-Requires: boot-animation-sound-file-profile_common
-%endif
-%ifarch i586 i686 x86_64
+%ifarch %{ix86} x86_64
 Requires: boot-animation-extension_emulator
+%else
+Requires: boot-animation-sound-file-profile_common
 %endif
 %description sub1-domain_Feature-BootAni
 Tizen block (set of packages) for Boot Animation of Tizen
diff --git a/packaging/platform-preset-boards-emul.inc b/packaging/platform-preset-boards-emul.inc
index 20acfa6..c42c0ba 100644
--- a/packaging/platform-preset-boards-emul.inc
+++ b/packaging/platform-preset-boards-emul.inc
@@ -1,7 +1,7 @@
 # Maintainer: Tizen PM?
 # You need ACK (+1) from the maintainer to be reviewed by building-block maintainers.
 
-%ifarch i586 i686 x86_64
+%ifarch %{ix86} x86_64
 ##############
 ###  EMUL  ###
 ##############
diff --git a/packaging/platform-preset-boards.inc b/packaging/platform-preset-boards.inc
index b329294..5637206 100644
--- a/packaging/platform-preset-boards.inc
+++ b/packaging/platform-preset-boards.inc
@@ -6,7 +6,7 @@ Summary:	Board (Hardware Set) Support Packages (BSP) Presets
 %ifarch armv7l
 Suggests:	%{name}-sub1-Preset_boards-ARTIK530_HAL_Backend
 %endif
-%ifarch armv7l aarch64
+%ifarch %{arm} aarch64
 Suggests:	%{name}-sub1-Preset_boards-COMMON
 Suggests:	%{name}-sub1-Preset_boards-RPI3_HAL_Backend
 Suggests:	%{name}-sub1-Preset_boards-RPI4_HAL_Backend
@@ -15,7 +15,7 @@ Suggests:	%{name}-sub1-Preset_boards-RPI4_HAL_Backend
 Suggests:	%{name}-sub1-Preset_boards-VIM3_HAL_Backend
 Suggests:	%{name}-sub1-Preset_boards-C4_HAL_Backend
 %endif
-%ifarch i586 i686 x86_64
+%ifarch %{ix86} x86_64
 Suggests:	%{name}-sub1-Preset_boards-EMUL
 %endif
 %description root-Preset_boards
diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index cc1011b..2641e3d 100644
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -6,10 +6,10 @@
 ################################
 %package root-Preset_img_headed
 Summary:    IOT Headed Images
-%ifarch armv7l aarch64
+%ifarch %{arm} aarch64
 Suggests:	%{name}-sub1-Preset_img_headed-common
 %endif
-%ifarch i586 i686 x86_64
+%ifarch %{ix86} x86_64
 Suggests:   %{name}-sub1-Preset_img_headed-emulator
 %endif
 
@@ -19,7 +19,7 @@ The IoT Headed Images.
 %files root-Preset_img_headed
 
 
-%ifarch armv7l aarch64
+%ifarch %{arm} aarch64
 #############################
 ### IOT Headed COMMON ###
 #############################
@@ -159,7 +159,7 @@ The packages of Tizen IoT Headed for COMMON.
 
 %endif
 
-%ifarch i586 i686 x86_64
+%ifarch %{ix86} x86_64
 ###########################
 ### IOT Headed Emulator ###
 ###########################
diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc
index 1e7381b..30d9ce4 100644
--- a/packaging/platform-preset-iot-headless-images.inc
+++ b/packaging/platform-preset-iot-headless-images.inc
@@ -6,7 +6,7 @@
 ################################
 %package root-Preset_img_headless
 Summary:    IOT Headless Images
-%ifarch armv7l aarch64
+%ifarch %{arm} aarch64
 Suggests:	%{name}-sub1-Preset_img_headless-common
 %endif
 
@@ -15,7 +15,7 @@ __EXPAND__: preset
 The IoT Headless Images.
 %files root-Preset_img_headless
 
-%ifarch armv7l aarch64
+%ifarch %{arm} aarch64
 ###########################
 ### IOT Headless COMMON ###
 ###########################
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index d9cfaec..26d910e 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -56,9 +56,7 @@ Requires: vconf-internal-keys
 Requires: wpa_supplicant
 Requires: libnss-security-manager
 Requires: security-privilege-manager-extension-iot
-%ifarch armv7l
 Requires: iotjs
-%endif
 #From TRE-1957
 Requires: dbus-tools
 #From TRE-2370