From: wchang kim <wchang.kim@samsung.com>
Date: Tue, 25 Jul 2023 07:54:18 +0000 (+0900)
Subject: Changes after adding some riscv packages.
X-Git-Tag: accepted/tizen/unified/riscv/20230725.120123^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3d2e5d4a6a043c4d72e39c44db681516212eaf88;p=tools%2Fbuilding-blocks.git

Changes after adding some riscv packages.

Change-Id: I13feaf0708e8855f6ca666df7cf4a5c0d50a1025
---

diff --git a/packaging/domain-features-starter.inc b/packaging/domain-features-starter.inc
index 4ad6ae8..62fec73 100755
--- 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 faeb5f2..a4efa41 100755
--- 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 283b703..86b4e93 100644
--- 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 21b783f..cc0ea1e 100644
--- 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 c2e2592..3fac172 100644
--- 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