Adding and Using the macro - dotnet_featuresubmit/tizen/20200702.050016accepted/tizen/unified/20200702.141725

Change-Id: Idac20fcb7413b44417328fbe5dc5b9bf8e7aecf1

7 files changed, 20 insertions, 14 deletions

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index d3c2845..cb6a59d 100644
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -3,6 +3,12 @@
 %define debug_package %{nil}
 %define tizen_feature() sed -i 's#\\\(\\\"%{1}\\\".\\\+>\\\).\\\+\\\(</key>\\\)#\\\1%{2}\\\2#' %{_sysconfdir}/config/model-config.xml;
 
+%ifarch armv7l
+%define dotnet_feature "on"
+%else
+%define dotnet_feature "off"
+%endif
+
 Name:		building-blocks
 Version:	6.0.0
 Release:	0
@@ -50,7 +56,7 @@ Source1311: domain-features-diagnostics.inc
 Source1312: domain-features-power_manager.inc
 Source1313: domain-features-mode_supervisor.inc
 
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 Source1400:	domain-csapis.inc
 Source1401:	domain-csapis-account.inc
 Source1402:	domain-csapis-appfw.inc
@@ -110,7 +116,7 @@ In Tizen building blocks,
 Summary:	Tizen Techinical Domains
 Suggests:	%{name}-root-domain_API
 Suggests:   %{name}-root-domain_Feature
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 Suggests:	%{name}-root-domain_CSAPI
 %endif
 #Suggests:	%{name}-root-domain_WebAPI
@@ -358,7 +364,7 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE1312}}
 %{include_if_mainbuild %{SOURCE1313}}
 
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 %{include_if_mainbuild %{SOURCE1400}}
 %{include_if_mainbuild %{SOURCE1401}}
 %{include_if_mainbuild %{SOURCE1402}}
diff --git a/packaging/domain-csapis.inc b/packaging/domain-csapis.inc
index 3ad64f6..8e109bf 100644
--- a/packaging/domain-csapis.inc
+++ b/packaging/domain-csapis.inc
@@ -1,7 +1,7 @@
 # Maintainer: TBD: This is temporary block for TDC Demo. You may proceed with this later anyway.
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 %package root-domain_CSAPI
 Summary:	Tizen C# Feature Enable
 Suggests:	%{name}-sub1-domain_CSAPI-Account
diff --git a/packaging/domain-features-dotnet.inc b/packaging/domain-features-dotnet.inc
index 2d8ab21..98af988 100644
--- a/packaging/domain-features-dotnet.inc
+++ b/packaging/domain-features-dotnet.inc
@@ -1,7 +1,7 @@
 # Maintainer: TBD: This is temporary block for TDC Demo. You may proceed with this later anyway.
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 ##########
 ## .NET ##
 ##########
diff --git a/packaging/domain-features.inc b/packaging/domain-features.inc
index b4310e5..5a909a1 100644
--- a/packaging/domain-features.inc
+++ b/packaging/domain-features.inc
@@ -4,7 +4,7 @@
 %package root-domain_Feature
 Summary:	Tizen Platform Internal Feature Sets
 Suggests:	%{name}-sub1-domain_Feature-Diagnostics
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 Suggests:	%{name}-sub1-domain_Feature-DotNET
 %endif
 Suggests:	%{name}-sub1-domain_Feature-WebAPI
diff --git a/packaging/platform-preset-boards.inc b/packaging/platform-preset-boards.inc
index 268ddc3..e449558 100644
--- a/packaging/platform-preset-boards.inc
+++ b/packaging/platform-preset-boards.inc
@@ -5,10 +5,10 @@
 Summary:	Board (Hardware Set) Support Packages (BSP) Presets
 %ifarch armv7l
 Suggests:	%{name}-sub1-Preset_boards-ARTIK530
-Suggests:	%{name}-sub1-Preset_boards-RPI3
 Suggests:	%{name}-sub1-Preset_boards-TM1
 Suggests:	%{name}-sub1-Preset_boards-TM2
 %endif
+Suggests:	%{name}-sub1-Preset_boards-RPI3
 %description root-Preset_boards
 __EXPAND__: preset
 Select BSP which you want.
diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index 7bb7fc9..a642c94 100644
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -62,7 +62,7 @@ Requires:	%{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 Requires:	%{name}-sub1-domain_Feature-Smartthings_App
 %endif
 Requires:	%{name}-sub1-domain_Feature-BootAni
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 Requires:	%{name}-sub1-domain_Feature-DotNET
 %endif
 #From TRE-2330
@@ -106,7 +106,7 @@ Requires:    autofill-config-mobile
 Requires:    elm-sharp-theme-common
 #From TRE-2093, 2094
 Requires:    libHarfBuzzSharp
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 Requires:    libSkiaSharp
 %endif
 #From TRE-2273
@@ -154,7 +154,7 @@ Requires:	org.tizen.fido-syspopup
 Requires:	fido-asm
 Requires:	fido_bt_roaming_agent
 Requires:	fido_silent
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 Requires:	coreclr-diagnostics
 %endif
 
@@ -213,7 +213,7 @@ Requires:	%{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 Requires:	%{name}-sub1-domain_Feature-Smartthings_App
 %endif
 Requires:	%{name}-sub1-domain_Feature-BootAni
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 Requires:	%{name}-sub1-domain_Feature-DotNET
 %endif
 #From TRE-2330
@@ -256,7 +256,7 @@ Requires:    autofill-config-mobile
 Requires:    elm-sharp-theme-common
 #From TRE-2093, 2094
 Requires:    libHarfBuzzSharp
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 Requires:    libSkiaSharp
 %endif
 #From TRE-2273
@@ -322,7 +322,7 @@ Requires:	org.tizen.fido-syspopup
 Requires:	fido-asm
 Requires:	fido_bt_roaming_agent
 Requires:	fido_silent
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 Requires:	coreclr-diagnostics
 %endif
 
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 672b573..46df010 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -204,7 +204,7 @@ Requires:	%{name}-sub2-domain_API-Web-WebView
 Requires:	%{name}-sub2-domain_API-MachineLearning-NNStreamer
 Requires:	%{name}-sub1-domain_Feature-Resource_manager
 
-%ifarch armv7l
+%if %{dotnet_feature} == "on"
 ##### TizenFX for Headed #####
 Requires:	%{name}-root-domain_CSAPI
 Requires:	%{name}-sub2-domain_CSAPI-UI-ElmSharp