Changes after adding some riscv packages.

Change-Id: I13feaf0708e8855f6ca666df7cf4a5c0d50a1025

diff --git a/packaging/domain-features-starter.inc b/packaging/domain-features-starter.inc
index 4ad6ae8833603e5e6bdea1f5a984b47421b2382c..62fec736b2bd49a8dd7abe8c1dcd2ac48e5a8286 100755 (executable)
--- a/packaging/domain-features-starter.inc
+++ b/packaging/domain-features-starter.inc
@@ -8,7 +8,7 @@
 Summary:       Starter daemon and Menu screen App
 Requires: starter
 Requires: starter-profile_common
-%ifarch armv7l aarch64 %{ix86} x86_64 riscv64
+%ifnarch armv7hl
 Requires: org.tizen.quickpanel_common
 Requires: org.tizen.setting-homescreen_common
 Requires: org.tizen.task-mgr_common

diff --git a/packaging/epicfeature-application.inc b/packaging/epicfeature-application.inc
index faeb5f2083212c052755600dbc0e8d9b84c3d5da..a4efa41fbbc0e21e226c3786ab7fa92e4d957ea1 100755 (executable)
--- a/packaging/epicfeature-application.inc
+++ b/packaging/epicfeature-application.inc
@@ -43,7 +43,7 @@ Suggests: org.tizen.default-light-theme
 Suggests: org.tizen.bluetooth-share-ui
 Suggests: org.tizen.ScreenMirroringSink
 Suggests: org.tizen.Tray
-%ifarch armv7l aarch64 %{ix86} x86_64 riscv64
+%ifnarch armv7hl
 Suggests: org.tizen.wallpaper-ui-service_common
 Suggests: org.tizen.videos_common
 Suggests: org.tizen.ug-gallery-efl_common
@@ -106,7 +106,7 @@ Requires: org.tizen.default-light-theme
 Requires: org.tizen.bluetooth-share-ui
 Requires: org.tizen.ScreenMirroringSink
 Requires: org.tizen.Tray
-%ifarch armv7l aarch64 %{ix86} x86_64 riscv64
+%ifnarch armv7hl
 Requires: org.tizen.wallpaper-ui-service_common
 Requires: org.tizen.videos_common
 Requires: org.tizen.ug-gallery-efl_common

diff --git a/packaging/platform-preset-boards-common.inc b/packaging/platform-preset-boards-common.inc
index 283b703ea037a868adea110bd259076d902a93dd..86b4e932c1f920122350b86230e2064e60b86b2d 100644 (file)
--- a/packaging/platform-preset-boards-common.inc
+++ b/packaging/platform-preset-boards-common.inc
@@ -315,7 +315,6 @@ 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
@@ -323,7 +322,6 @@ 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
@@ -353,10 +351,8 @@ 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.ise-default-nui
 Requires:      org.tizen.cssetting-inputmethod
 %endif
 Requires:      %{name}-sub2-Preset_boards-COMMON-EFL

diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index 21b783f165bdbc104212779d5ffe57d4135fddde..cc0ea1ebb267978ea6473e7d48df6aa614c217e4 100644 (file)
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -71,6 +71,7 @@ Requires:     dali2-csharp-binder
 Requires:      dali2-csharp-binder-scene3d
 Requires:      dali2-csharp-binder-profile_common
 Requires:      org.tizen.cssetting-autofill
+Requires:      opentk
 %endif
 Requires:      %{name}-sub1-domain_Feature-Diagnostics
 Requires:      %{name}-sub1-domain_Feature-Starter
@@ -84,10 +85,7 @@ Requires:    webapi-plugins-teec
 Requires:      wrtjs
 Requires:      vc-webview-js
 Requires:      vc-webview
-%ifnarch riscv64
 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
@@ -306,6 +304,7 @@ Requires:   dali2-csharp-binder-scene3d
 Requires:    dali2-csharp-binder-profile_common
 #From TRE-2957
 Requires:       org.tizen.cssetting-autofill
+Requires:      opentk
 %endif
 
 Requires:      %{name}-sub1-domain_Feature-Starter
@@ -320,10 +319,7 @@ Requires:  webapi-plugins-mobile-extension-emulator
 Requires:    wrtjs
 Requires:      vc-webview-js
 Requires:      vc-webview
-%ifnarch riscv64
 Requires:      lightweight-web-engine-profile_mobile
-Requires:      opentk
-%endif
 
 #From TRE-2330
 Requires:       %{name}-sub1-domain_Feature-Diagnostics

diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index c2e2592f846ca247c6ac03366c8ef0a76a05d6eb..3fac172d83bfffac71cfdbfa3870feb746f37206 100644 (file)
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -70,7 +70,7 @@ Requires: nsjail
 #From TRE-3035
 Requires: libv4l
 Requires: patchelf
-%ifnarch riscv64
+%if %{dotnet_feature} == "on"
 Requires:    crossgen2-mic
 %endif