Modify building-blocks for riscv64 headed image

Change-Id: I8aa93bc2a95e27cc3fb51c7654fdc6fa63c10f3f

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index 78ab0515c81663e6238ab015d594d376b48c9f0f..2c64f0b6baad25743ebc9f09f96e0b335f0a58d3 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -4,7 +4,11 @@
 %define tizen_feature() sed -i 's#\\\(\\\"%{1}\\\".\\\+>\\\).\\\+\\\(</key>\\\)#\\\1%{2}\\\2#' %{_sysconfdir}/config/model-config.xml;
 %define tizen_hal_feature() sed -i 's#\\\(\\\"%{1}\\\".\\\+>\\\).\\\+\\\(</key>\\\)#\\\1%{2}\\\2#' %{_hal_sysconfdir}/config/model-config.xml;
 
+%ifnarch riscv64
 %define dotnet_feature "on"
+%else
+%define dotnet_feature "off"
+%endif
 
 Name:          building-blocks
 Version:       8.0.0

diff --git a/packaging/domain-apis-account.inc b/packaging/domain-apis-account.inc
index f249e168d65b7c1c3d1208610b721dd0ec408010..27bee2de394708a7e48055a8365c4eeca9f65748 100644 (file)
--- a/packaging/domain-apis-account.inc
+++ b/packaging/domain-apis-account.inc
@@ -47,7 +47,9 @@ So we use dummyasm for verification of fido-client APIs instead of fido-asm and
 %package sub2-domain_API-Account-OAuth2
 Summary:       OAuth2
 
+%ifnarch riscv64
 Requires: oauth2
+%endif
 Requires: %{name}-sub2-domain_API-Web-WebView
 %description sub2-domain_API-Account-OAuth2
 

diff --git a/packaging/domain-apis-maps.inc b/packaging/domain-apis-maps.inc
index 83b89ace798ea0fefc2be70e9ddde86aac685a66..85f29a8a9ac308c66d3e0d74ca41642a63941614 100644 (file)
--- a/packaging/domain-apis-maps.inc
+++ b/packaging/domain-apis-maps.inc
@@ -31,9 +31,11 @@ At least one of HERE or MAPZEN plugin must be selected.
 
 %package sub2-domain_API-Maps-Here_Plugin
 Summary:    Here_Plugin
+%ifnarch riscv64
 Requires:      maps-plugin-here
 Requires:      heremaps-uc-launcher
 Requires:      org.tizen.heremaps-uc
+%endif
 
 %description sub2-domain_API-Maps-Here_Plugin
 This block supports HERE Plugin.

diff --git a/packaging/domain-apis-ui.inc b/packaging/domain-apis-ui.inc
index dd987dcb0be320a539c430a0f312da6e236b68c4..5eda75e6465f948f9e94bed5a6e3e4a09b5f4771 100644 (file)
--- a/packaging/domain-apis-ui.inc
+++ b/packaging/domain-apis-ui.inc
@@ -63,8 +63,10 @@ Requires: dali2
 Requires: dali2-toolkit
 Requires: dali2-scene3d
 Requires: dali2-adaptor
+%if %{dotnet_feature} == "on"
 Requires: dali2-csharp-binder
 Requires: dali2-csharp-binder-scene3d
+%endif
 Requires: %{name}-sub2-domain_API-UI-Display_Server
 Requires: %{name}-sub2-domain_API-UI-FontConfig
 # Profile
@@ -73,11 +75,13 @@ Suggests: dali2-adaptor-profile_mobile
 Suggests: dali2-adaptor-profile_tv
 Suggests: dali2-adaptor-profile_wearable
 Suggests: dali2-adaptor-profile_ivi
+%if %{dotnet_feature} == "on"
 Suggests: dali2-csharp-binder-profile_common
 Suggests: dali2-csharp-binder-profile_mobile
 Suggests: dali2-csharp-binder-profile_tv
 Suggests: dali2-csharp-binder-profile_wearable
 Suggests: dali2-csharp-binder-profile_ivi
+%endif
 # Resource
 Suggests: dali2-toolkit-resources_480x800
 Suggests: dali2-toolkit-resources_720x1280

diff --git a/packaging/domain-apis-uix.inc b/packaging/domain-apis-uix.inc
index dfdc9abbdc91a27bb302b58ac82820a97bd5c8b0..64d605b6e5b96bcce013a6dd44d82ce8e3992813 100644 (file)
--- a/packaging/domain-apis-uix.inc
+++ b/packaging/domain-apis-uix.inc
@@ -34,7 +34,9 @@ Requires: ise-engine-thai
 Requires: capi-ui-inputmethod
 Requires: capi-ui-inputmethod-manager
 Requires: org.tizen.inputmethod-setting
+%if %{dotnet_feature} == "on"
 Requires: org.tizen.cssetting-inputmethod
+%endif
 
 Suggests: org.tizen.ise-default-nui
 Suggests: ise-default-profile_common
@@ -73,9 +75,13 @@ wearable_circle: ise-default-profile_wearable-extension-circle, isf-config-weara
 Summary:    STT
 
 Requires: stt
+%ifnarch riscv64
 Requires: org.tizen.stt-engine-default
 Requires: org.tizen.stt-engine-embedded
+%endif
+%if %{dotnet_feature} == "on"
 Requires: org.tizen.cssetting-stt
+%endif
 Requires: %{name}-sub2-domain_API-Multimedia-Audio_IO
 Requires: %{name}-sub2-domain_API-AppFramework-TPK_Installation
 
@@ -91,9 +97,13 @@ STT(Speech-To-Text) provides functions to recognize the speech.
 Summary:    TTS
 
 Requires: tts
+%ifnarch riscv64
 Requires: org.tizen.tts-engine-default
+%endif
 Requires: tts-engine-rsc
+%if %{dotnet_feature} == "on"
 Requires: org.tizen.cssetting-tts
+%endif
 Requires: %{name}-sub2-domain_API-Multimedia-Audio_IO
 Requires: %{name}-sub2-domain_API-AppFramework-TPK_Installation
 
@@ -109,8 +119,12 @@ TTS(Text-To-Speech) provides functions to synthesize voice from text and play sy
 Summary:    Voice_control
 
 Requires: voice-control
+%ifnarch riscv64
 Requires: org.tizen.vc-engine-default
+%endif
+%if %{dotnet_feature} == "on"
 Requires: org.tizen.cssetting-voicecontrol
+%endif
 Requires: %{name}-sub2-domain_API-Multimedia-Audio_IO
 Requires: %{name}-sub2-domain_API-MachineLearning-NNStreamer
 
@@ -142,7 +156,9 @@ Summary:    Multi_assistant
 
 Requires: multi-assistant
 Requires: org.tizen.multi-assistant-service
+%ifnarch riscv64
 Requires: wakeup-engine-default
+%endif
 Requires: %{name}-sub2-domain_API-Multimedia-Audio_IO
 
 %description sub2-domain_API-UIX-Multi_assistant
@@ -173,7 +189,9 @@ Requires: capi-ui-autofill
 Requires: capi-ui-autofill-service
 Requires: capi-ui-autofill-manager
 Requires: org.tizen.autofill-setting-mobile
+%if %{dotnet_feature} == "on"
 Requires: org.tizen.cssetting-autofill
+%endif
 
 %description sub2-domain_API-UIX-Autofill
 Autofill is a feature that allows you to fill out the data previously entered by the user<br>

diff --git a/packaging/domain-apis-web.inc b/packaging/domain-apis-web.inc
index 1c08e0d7a34dac486117f3032a023a3c337f51c7..0d27cad169f18b632c149904005dbfc237d6519f 100644 (file)
--- a/packaging/domain-apis-web.inc
+++ b/packaging/domain-apis-web.inc
@@ -27,7 +27,9 @@ Library for JavaScript Object Notation format
 %package sub2-domain_API-Web-WebView
 Summary:    WebView
 
+%ifnarch riscv64
 Requires: chromium-efl
+%endif
 Requires: %{name}-sub2-domain_API-UI-Display_Server
 Requires: %{name}-sub2-domain_API-UI-FontConfig
 

diff --git a/packaging/domain-features-bootanimation.inc b/packaging/domain-features-bootanimation.inc
index 697835e937bda862a102f561d22cbefa880166cf..c15364abe1d3e2da9f71a563ab0afb706866d836 100644 (file)
--- a/packaging/domain-features-bootanimation.inc
+++ b/packaging/domain-features-bootanimation.inc
@@ -6,7 +6,11 @@
 ####################
 %package sub1-domain_Feature-BootAni
 Summary:       Boot Animation packages
+%ifnarch riscv64
 Requires: boot-animation-dali
+%else
+Requires: boot-animation
+%endif
 %description sub1-domain_Feature-BootAni
 Tizen block (set of packages) for Boot Animation of Tizen
 %files sub1-domain_Feature-BootAni

diff --git a/packaging/domain-features-starter.inc b/packaging/domain-features-starter.inc
index e285aeb5b07ad14c9dcd5c25c261e3991d5f26a9..4ad6ae8833603e5e6bdea1f5a984b47421b2382c 100755 (executable)
--- a/packaging/domain-features-starter.inc
+++ b/packaging/domain-features-starter.inc
@@ -9,11 +9,15 @@ Summary:      Starter daemon and Menu screen App
 Requires: starter
 Requires: starter-profile_common
 %ifarch armv7l aarch64 %{ix86} x86_64 riscv64
-Requires: org.tizen.homescreen-nui
 Requires: org.tizen.quickpanel_common
 Requires: org.tizen.setting-homescreen_common
 Requires: org.tizen.task-mgr_common
 %endif
+%ifnarch riscv64
+Requires: org.tizen.homescreen-nui
+%else
+Requires: org.tizen.homescreen-efl_common
+%endif
 
 %description sub1-domain_Feature-Starter
 Tizen block (set of packages) for supporting to display menu screen.

diff --git a/packaging/domain-features-webapi.inc b/packaging/domain-features-webapi.inc
index f71183cd3dbee27a0efa90f1d2717455ec808a43..e5cc2e2dc852242ad8bcb0d59559a03f410733cd 100644 (file)
--- a/packaging/domain-features-webapi.inc
+++ b/packaging/domain-features-webapi.inc
@@ -6,6 +6,7 @@
 ############
 %package sub1-domain_Feature-WebAPI
 Summary:       Web API feature packages
+%ifnarch riscv64
 Requires: wrtjs
 Requires: cordova-api
 Requires: webapi-plugins
@@ -14,6 +15,7 @@ Suggests: webapi-plugins-profile_mobile
 Suggests: webapi-plugins-teec
 Requires: wgt-backend
 Requires: libwebsockets
+%endif
 %description sub1-domain_Feature-WebAPI
 Tizen block (set of packages) for supporting WebAPI of Tizen
 %files sub1-domain_Feature-WebAPI

diff --git a/packaging/epicfeature-application.inc b/packaging/epicfeature-application.inc
index bd665f0b1f2653ed8deeb05f32e6afc4801f1ffb..831db8f859515b866c01b2845ccfc7a9d6a0be43 100755 (executable)
--- a/packaging/epicfeature-application.inc
+++ b/packaging/epicfeature-application.inc
@@ -27,6 +27,7 @@ Suggests: org.tizen.askuser-popup-profile_iot
 Suggests: my-account-profile_mobile
 Suggests: cert-svc-ui
 Suggests: org.tizen.voice-setting
+%if %{dotnet_feature} == "on"
 Suggests: org.tizen.cssettings
 Suggests: org.tizen.cssetting-account
 Suggests: org.tizen.cssetting-voicecontrol
@@ -34,8 +35,8 @@ Suggests: org.tizen.cssetting-tts
 Suggests: org.tizen.cssetting-stt
 Suggests: org.tizen.cssetting-wallpaper
 Suggests: org.tizen.cssetting-accessibility
+%endif
 Suggests: org.tizen.voice-control-panel
-Suggests: org.tizen.oobe
 Suggests: org.tizen.default-dark-theme
 Suggests: org.tizen.default-light-theme
 Suggests: org.tizen.bluetooth-share-ui
@@ -49,9 +50,18 @@ Suggests: org.tizen.ug-gallery-efl_common
 Suggests: org.tizen.setting-notification_common
 Suggests: org.tizen.image-viewer_common
 Suggests: org.tizen.gallery_common
+Suggests: org.tizen.share-panel_common
+%endif
+%ifnarch riscv64
+Suggests: org.tizen.oobe
 Suggests: org.tizen.firmware-update-ui
 Suggests: org.tizen.local-recovery-ui
-Suggests: org.tizen.share-panel_common
+%else
+Suggests: org.tizen.accessibility-setting-profile_common
+Suggests: Suggests: org.tizen.volume_common
+Suggests: org.tizen.font-viewer
+Suggests: org.tizen.music-player_common
+Suggests: org.tizen.softkey-container
 %endif
 
 %description sub1-feature_App-IoT_Headed_Ref
@@ -80,6 +90,7 @@ Requires: org.tizen.askuser-popup-profile_iot
 Requires: my-account-profile_mobile
 Requires: cert-svc-ui
 Requires: org.tizen.voice-setting
+%if %{dotnet_feature} == "on"
 Requires: org.tizen.cssettings
 Requires: org.tizen.cssetting-account
 Requires: org.tizen.cssetting-voicecontrol
@@ -87,8 +98,8 @@ Requires: org.tizen.cssetting-tts
 Requires: org.tizen.cssetting-stt
 Requires: org.tizen.cssetting-wallpaper
 Requires: org.tizen.cssetting-accessibility
+%endif
 Requires: org.tizen.voice-control-panel
-Requires: org.tizen.oobe
 Requires: org.tizen.default-dark-theme
 Requires: org.tizen.default-light-theme
 Requires: org.tizen.bluetooth-share-ui
@@ -102,11 +113,21 @@ Requires: org.tizen.ug-gallery-efl_common
 Requires: org.tizen.setting-notification_common
 Requires: org.tizen.image-viewer_common
 Requires: org.tizen.gallery_common
+Requires: org.tizen.share-panel_common
+%endif
+%ifnarch riscv64
+Requires: org.tizen.oobe
 Requires: org.tizen.firmware-update-ui
 Requires: org.tizen.local-recovery-ui
-Requires: org.tizen.share-panel_common
+%else
+Requires: org.tizen.accessibility-setting-profile_common
+Requires: org.tizen.volume_common
+Requires: org.tizen.font-viewer
+Requires: org.tizen.music-player_common
+Requires: org.tizen.softkey-container
 %endif
 
+
 %description sub1-feature_App-IoT_Headed_Ref_image
 Tizen Applications which are included in IoT Headed Image
 %files sub1-feature_App-IoT_Headed_Ref_image

diff --git a/packaging/platform-preset-boards-common.inc b/packaging/platform-preset-boards-common.inc
index db7f932986abaffbf8d0b3ab2688bd4b020f3d56..283b703ea037a868adea110bd259076d902a93dd 100644 (file)
--- a/packaging/platform-preset-boards-common.inc
+++ b/packaging/platform-preset-boards-common.inc
@@ -315,6 +315,7 @@ Packages of Sensor HAL and Feature for COMMON.
 Summary:       COMMON_DALi2
 Requires:      %{name}-sub2-domain_API-UI-DALi2
 Requires:      %{name}-sub2-Preset_boards-COMMON-Display
+%ifnarch riscv64
 Requires:      dali2-extension-video-player-plugin
 Requires:      dali2-extension-key-extension
 Requires:      dali2-extension-rive-animation-view
@@ -322,6 +323,7 @@ Requires:   dali2-extension-vector-animation-renderer-plugin
 Requires:      dali2-extension-web-engine-chromium-plugin
 Requires:      dali2-extension-camera-player-plugin
 Requires:      dali2-extension
+%endif
 Requires:      dali2-toolkit-resources_720x1280
 
 %description sub2-Preset_boards-COMMON-DALi2
@@ -351,8 +353,12 @@ Requires:  %{name}-sub2-domain_API-UIX-Input_Method
 Requires:      isf-config-common
 Requires:      ise-default-profile_common
 Requires:      org.tizen.inputmethod-setting-profile_common
+%ifnarch riscv64
 Requires:      org.tizen.ise-default-nui
+%endif
+%if %{dotnet_feature} == "on"
 Requires:      org.tizen.cssetting-inputmethod
+%endif
 Requires:      %{name}-sub2-Preset_boards-COMMON-EFL
 
 %description sub2-Preset_boards-COMMON-IM

diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index 95558515a86dce5a1a127df261274b7c383c5208..89492578c8348536df36fba97509394418399819 100644 (file)
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -67,18 +67,27 @@ Requires:   deviced-plugin-profile-iot-headed
 Requires:      %{name}-sub1-domain_Feature-BootAni
 %if %{dotnet_feature} == "on"
 Requires:      %{name}-sub1-domain_Feature-DotNET
-%endif
-Requires:      %{name}-sub1-domain_Feature-Diagnostics
 Requires:      dali2-csharp-binder
 Requires:      dali2-csharp-binder-scene3d
+Requires:      dali2-csharp-binder-profile_common
+Requires:      org.tizen.cssetting-autofill
+%endif
+Requires:      %{name}-sub1-domain_Feature-Diagnostics
 Requires:      %{name}-sub1-domain_Feature-Starter
 Requires:      %{name}-sub1-feature_App-IoT_Headed_Ref_image
 Requires:      %{name}-sub1-domain_Feature-ISU
 Requires:      %{name}-sub1-domain_Feature-Upgrade
 Requires:      %{name}-sub1-domain_Feature-Recovery
 Requires:      %{name}-sub1-domain_Feature-WebAPI
+%ifnarch riscv64
 Requires:      webapi-plugins-profile_mobile
 Requires:      webapi-plugins-teec
+Requires:      wrtjs
+Requires:      vc-webview-js
+Requires:      vc-webview
+Requires:      lightweight-web-engine-profile_mobile
+Requires:      opentk
+%endif
 Requires:      %{name}-sub1-domain_Feature-Setup
 Requires:      %{name}-sub1-domain_Feature-Mode_Supervisor
 Requires:      crash-worker
@@ -105,7 +114,6 @@ Requires:   ug-bluetooth-efl
 Requires:      wifi-efl-ug
 Requires:      %{name}-sub2-domain_API-UI-FontConfig
 Requires:      org.tizen.autofill-setting-mobile
-Requires:      org.tizen.cssetting-autofill
 Requires:      capi-ui-autofill-manager
 Requires:      capi-ui-autofill
 Requires:      capi-ui-autofill-common
@@ -119,9 +127,7 @@ Requires:   org.tizen.system-syspopup.common
 Requires:      org.tizen.system-signal-sender
 Requires:      mtp-responder
 Requires:      dummyasm
-Requires:      dali2-csharp-binder-profile_common
 Requires:      org.tizen.autofilld
-Requires:      wrtjs
 Requires:      inference-engine-opencv
 Requires:      inference-engine-tflite
 Requires:      inference-engine-mlapi
@@ -151,12 +157,8 @@ Requires:   gst-plugins-good-v4l2
 
 ### Sync with Mobile ###
 Requires:      freealut
-Requires:      vc-webview-js
-Requires:      vc-webview
 Requires:      e-mod-tizen-effect
 Requires:      org.tizen.app-selector-profile_mobile
-Requires:      lightweight-web-engine-profile_mobile
-Requires:      opentk
 Requires:      org.tizen.net-popup
 Requires:      org.tizen.fido-syspopup
 Requires:      fido-asm
@@ -247,8 +249,6 @@ Requires:   org.tizen.accessibility-setting-profile_common
 Requires:      %{name}-sub2-domain_API-UI-FontConfig
 #From TRE-2077
 Requires:    elm-sharp-theme-common
-#From TRE-2449
-Requires:    dali2-csharp-binder-profile_common
 Requires:      thorvg
 Requires:      ui-viewmgr
 Requires:      vulkan-wsi-tizen
@@ -258,8 +258,6 @@ Requires:   SDL2_ttf
 Requires:      %{name}-sub2-Preset_boards-EMUL-IM
 #From TRE-2064
 Requires:       org.tizen.autofill-setting-mobile
-#From TRE-2957
-Requires:       org.tizen.cssetting-autofill
 #From TRE-2067
 Requires:       capi-ui-autofill-manager
 #From TRE-2069
@@ -302,21 +300,30 @@ Requires: %{name}-sub1-domain_Feature-ISU
 ### C# Support
 %if %{dotnet_feature} == "on"
 Requires:      %{name}-sub1-domain_Feature-DotNET
-%endif
 Requires:      dali2-csharp-binder
 Requires:      dali2-csharp-binder-scene3d
-Requires:      opentk
+#From TRE-2449
+Requires:    dali2-csharp-binder-profile_common
+#From TRE-2957
+Requires:       org.tizen.cssetting-autofill
+%endif
 
 Requires:      %{name}-sub1-domain_Feature-Starter
 Requires:      %{name}-sub1-feature_App-IoT_Headed_Ref_image
 
 ### Web API
 Requires:      %{name}-sub1-domain_Feature-WebAPI
+%ifnarch riscv64
 Requires:      webapi-plugins-profile_mobile
 Requires:      webapi-plugins-teec
 Requires:      webapi-plugins-mobile-extension-emulator
 #From TRE-2016
 Requires:    wrtjs
+Requires:      vc-webview-js
+Requires:      vc-webview
+Requires:      lightweight-web-engine-profile_mobile
+Requires:      opentk
+%endif
 
 #From TRE-2330
 Requires:       %{name}-sub1-domain_Feature-Diagnostics
@@ -350,11 +357,8 @@ Requires:    ug-setting-wifidirect-efl
 
 #Sync with Mobile
 Requires:      freealut
-Requires:      vc-webview-js
-Requires:      vc-webview
 Requires:      e-mod-tizen-effect
 Requires:      org.tizen.app-selector-profile_mobile
-Requires:      lightweight-web-engine-profile_mobile
 Requires:      org.tizen.net-popup
 Requires:      org.tizen.fido-syspopup
 Requires:      fido-asm

diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 083958d6e8bc7a6c81a336c238aee8c354932bd1..9d1602fdacbf4fab51455ab23280383273628d11 100644 (file)
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -69,6 +69,10 @@ Requires: unified-backend
 Requires: nsjail
 #From TRE-3035
 Requires: libv4l
+Requires: patchelf
+%ifnarch riscv64
+Requires:    crossgen2-mic
+%endif
 
 %description root-Preset_iot_core
 The packages of Tizen IoT Core.