Including iotjs, orchestration and dotnet in only armv7l 95/235895/1 accepted/tizen/unified/20200611.015346 submit/tizen/20200611.010827
authorwchang kim <wchang.kim@samsung.com>
Thu, 11 Jun 2020 00:57:17 +0000 (09:57 +0900)
committerwchang kim <wchang.kim@samsung.com>
Thu, 11 Jun 2020 00:57:17 +0000 (09:57 +0900)
Change-Id: Ie4793396046c187e48479c30b34be5180b819d98

packaging/building-blocks.spec
packaging/domain-csapis.inc
packaging/domain-features-dotnet.inc
packaging/domain-features.inc
packaging/platform-preset-iot-headed-images.inc
packaging/platform-preset-iot.inc

index be31bad2a6785af9f291ec2574c488a6ed8ed55a..05066e5c04dab5b31975d926898ea8a25c6b1006 100644 (file)
@@ -48,6 +48,7 @@ Source1311: domain-features-diagnostics.inc
 Source1312: domain-features-power_manager.inc
 Source1313: domain-features-mode_supervisor.inc
 
+%ifarch armv7l
 Source1400:    domain-csapis.inc
 Source1401:    domain-csapis-account.inc
 Source1402:    domain-csapis-appfw.inc
@@ -66,7 +67,7 @@ Source1414:   domain-csapis-ui.inc
 Source1415:    domain-csapis-uix.inc
 Source1416:    domain-csapis-web.inc
 Source1417:    domain-csapis-machinelearning.inc
-
+%endif
 
 Source2010:    epicfeature-development.inc
 Source2020:    epicfeature-application.inc
@@ -107,7 +108,9 @@ In Tizen building blocks,
 Summary:       Tizen Techinical Domains
 Suggests:      %{name}-root-domain_API
 Suggests:   %{name}-root-domain_Feature
+%ifarch armv7l
 Suggests:      %{name}-root-domain_CSAPI
+%endif
 #Suggests:     %{name}-root-domain_WebAPI
 %description   category-domains
 This meta package lists all Tizen blocks (meta packages) designating
@@ -351,6 +354,7 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE1312}}
 %{include_if_mainbuild %{SOURCE1313}}
 
+%ifarch armv7l
 %{include_if_mainbuild %{SOURCE1400}}
 %{include_if_mainbuild %{SOURCE1401}}
 %{include_if_mainbuild %{SOURCE1402}}
@@ -369,7 +373,7 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE1415}}
 %{include_if_mainbuild %{SOURCE1416}}
 %{include_if_mainbuild %{SOURCE1417}}
-
+%endif
 
 ############## EPIC FEATURES ######################
 
index 1b7f978bd028f4e7081a9c33b4b905b8bc7b5806..3ad64f6ef479553436337d1d9da901a904706012 100644 (file)
@@ -1,6 +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
 %package root-domain_CSAPI
 Summary:       Tizen C# Feature Enable
 Suggests:      %{name}-sub1-domain_CSAPI-Account
@@ -28,3 +29,4 @@ Requires:     csapi-tizenfx-full
 __EXPAND__: domains
 You should select this block to enable Tizen dotnet feature.
 %files root-domain_CSAPI
+%endif
index e5d714980570a53af2dc7bbbbc330882db9bbebc..2d8ab216890e5e330ce5a266d7475a4e8111b360 100644 (file)
@@ -1,6 +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
 ##########
 ## .NET ##
 ##########
@@ -36,3 +37,4 @@ Requires:     %{name}-sub2-domain_CSAPI-System-PlatformConfig
 %description sub1-domain_Feature-DotNET
 Tizen block (set of packages) for supporting .NET of Tizen
 %files sub1-domain_Feature-DotNET
+%endif
index c40344e8f9ecce6682aca541e3cd5d7504a38dcc..d782ef828c514d101a44588b51d39eeb3138f694 100644 (file)
@@ -4,7 +4,9 @@
 %package root-domain_Feature
 Summary:       Tizen Platform Internal Feature Sets
 Suggests:      %{name}-sub1-domain_Feature-Diagnostics
+%ifarch armv7l
 Suggests:      %{name}-sub1-domain_Feature-DotNET
+%endif
 Suggests:      %{name}-sub1-domain_Feature-WebAPI
 Suggests:      %{name}-sub1-domain_Feature-BootAni
 Suggests:      %{name}-sub1-domain_Feature-Starter
index 7ca087d3888b292f2c15f2c94a4421910086ed00..4ea6a4f822a2ef34fed2ee50ad68f783bdf593b7 100644 (file)
@@ -60,7 +60,9 @@ Requires:     %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 ## Feature
 Requires:      %{name}-sub1-domain_Feature-Smartthings_App
 Requires:      %{name}-sub1-domain_Feature-BootAni
+%ifarch armv7l
 Requires:      %{name}-sub1-domain_Feature-DotNET
+%endif
 #From TRE-2330
 Requires:      %{name}-sub1-domain_Feature-Diagnostics
 
@@ -123,9 +125,11 @@ Requires:    dali2-csharp-binder-profile_common
 Requires:    org.tizen.autofilld
 #From TRE-2016
 Requires:    wrtjs
+%ifarch armv7l
 #From TRE-2256
 Requires:    edge-orchestration
 Requires:    libedge-orchestration
+%endif
 #From TRE-2253
 Requires:    inference-engine-opencv
 Requires:    inference-engine-tflite
@@ -203,7 +207,9 @@ Requires:   %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 ## Feature
 Requires:      %{name}-sub1-domain_Feature-Smartthings_App
 Requires:      %{name}-sub1-domain_Feature-BootAni
+%ifarch armv7l
 Requires:      %{name}-sub1-domain_Feature-DotNET
+%endif
 #From TRE-2330
 Requires:       %{name}-sub1-domain_Feature-Diagnostics
 
@@ -273,9 +279,11 @@ Requires:    reboot-param-helper
 Requires:    stability-monitor-kmod-rpi3
 #From TRE-2237
 Requires:    stability-monitor
+%ifarch armv7l
 #From TRE-2256
 Requires:    edge-orchestration
 Requires:    libedge-orchestration
+%endif
 #From TRE-2253
 Requires:    inference-engine-opencv
 Requires:    inference-engine-tflite
index b8f8ee25d0d9410fc44b106f45c1d06675b8ea56..7afb8843e89ff1639310bb58b47f51145d674123 100644 (file)
@@ -55,7 +55,9 @@ Requires: util-linux
 Requires: vconf-internal-keys
 Requires: wpa_supplicant
 Requires: libnss-security-manager
+%ifarch armv7l
 Requires: iotjs
+%endif
 #From TRE-1957
 Requires: dbus-tools
 #From TRE-2370
@@ -199,6 +201,7 @@ Requires:   %{name}-sub2-domain_API-Web-WebView
 Requires:      %{name}-sub2-domain_API-MachineLearning-NNStreamer
 Requires:      %{name}-sub1-domain_Feature-Resource_manager
 
+%ifarch armv7l
 ##### TizenFX for Headed #####
 Requires:      %{name}-root-domain_CSAPI
 Requires:      %{name}-sub2-domain_CSAPI-UI-ElmSharp
@@ -275,6 +278,7 @@ Requires:   %{name}-sub2-domain_CSAPI-UIX-TtsEngine
 Requires:      %{name}-sub2-domain_CSAPI-UIX-VoiceControl
 Requires:      %{name}-sub2-domain_CSAPI-UIX-Nlp
 Requires:      %{name}-sub1-domain_CSAPI-WebView
+%endif
 
 %description root-Preset_iot_headed
 The packages of Tizen IoT Headed Common.