From: wchang kim Date: Thu, 11 Jun 2020 00:57:17 +0000 (+0900) Subject: Including iotjs, orchestration and dotnet in only armv7l X-Git-Tag: submit/tizen/20200611.010827^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7542a3947d56792a249dd08bb1691881471297f;p=tools%2Fbuilding-blocks.git Including iotjs, orchestration and dotnet in only armv7l Change-Id: Ie4793396046c187e48479c30b34be5180b819d98 --- diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec index be31bad..05066e5 100644 --- a/packaging/building-blocks.spec +++ b/packaging/building-blocks.spec @@ -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 ###################### diff --git a/packaging/domain-csapis.inc b/packaging/domain-csapis.inc index 1b7f978..3ad64f6 100644 --- a/packaging/domain-csapis.inc +++ b/packaging/domain-csapis.inc @@ -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 diff --git a/packaging/domain-features-dotnet.inc b/packaging/domain-features-dotnet.inc index e5d7149..2d8ab21 100644 --- a/packaging/domain-features-dotnet.inc +++ b/packaging/domain-features-dotnet.inc @@ -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 diff --git a/packaging/domain-features.inc b/packaging/domain-features.inc index c40344e..d782ef8 100644 --- a/packaging/domain-features.inc +++ b/packaging/domain-features.inc @@ -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 diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc index 7ca087d..4ea6a4f 100644 --- a/packaging/platform-preset-iot-headed-images.inc +++ b/packaging/platform-preset-iot-headed-images.inc @@ -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 diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc index b8f8ee2..7afb884 100644 --- a/packaging/platform-preset-iot.inc +++ b/packaging/platform-preset-iot.inc @@ -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.