summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwchang kim <wchang.kim@samsung.com>2019-11-22 07:27:39 +0900
committerwchang kim <wchang.kim@samsung.com>2019-11-22 07:34:08 +0900
commit530e813a06046977628e2680aa22a7936386d1e9 (patch)
treed3598064dff02512eb3b276723e1239523803240
parente0b28068a0dfe66fa4cab10a4b907b0807174fcb (diff)
downloadbuilding-blocks-530e813a06046977628e2680aa22a7936386d1e9.tar.gz
building-blocks-530e813a06046977628e2680aa22a7936386d1e9.tar.bz2
building-blocks-530e813a06046977628e2680aa22a7936386d1e9.zip
Move meta information to building-blocks for headless images
Change-Id: I0b88836f125a3bfb9c4bc63a930517a00085d369
-rw-r--r--packaging/domain-features-dotnet.inc5
-rw-r--r--packaging/platform-preset-boards-artik530.inc4
-rw-r--r--packaging/platform-preset-boards-rpi3.inc4
-rw-r--r--packaging/platform-preset-iot-headed-images.inc1
-rw-r--r--packaging/platform-preset-iot-headless-images.inc47
-rw-r--r--packaging/platform-preset-iot.inc2
6 files changed, 59 insertions, 4 deletions
diff --git a/packaging/domain-features-dotnet.inc b/packaging/domain-features-dotnet.inc
index 739dc9d..0eae7ff 100644
--- a/packaging/domain-features-dotnet.inc
+++ b/packaging/domain-features-dotnet.inc
@@ -13,6 +13,11 @@ Requires: dotnet-launcher
Requires: mscorlib
Requires: tar
Requires: gzip
+
+#From TRE-2093, 2094
+Requires: libHarfBuzzSharp
+Requires: libSkiaSharp
+
Requires: csapi-tizenfx-common
Suggests: elm-sharp-theme-common
Suggests: dali-csharp-binder
diff --git a/packaging/platform-preset-boards-artik530.inc b/packaging/platform-preset-boards-artik530.inc
index 46c4a40..e0761a3 100644
--- a/packaging/platform-preset-boards-artik530.inc
+++ b/packaging/platform-preset-boards-artik530.inc
@@ -83,6 +83,10 @@ Firstly select HALs and Feature to add to your image.
Summary: ARTIK530_System
Requires: model-config-default
Suggests: system-plugin-feature-init_wrapper
+#From TRE-1993
+Requires: system-plugin-feature-session-bind
+#From TRE-1989
+Requires: system-plugin-feature-namespace
%description sub2-Preset_boards-ARTIK530-System
Packages for System HAL and Feature. They are mandatory.
diff --git a/packaging/platform-preset-boards-rpi3.inc b/packaging/platform-preset-boards-rpi3.inc
index d0ce301..b08284b 100644
--- a/packaging/platform-preset-boards-rpi3.inc
+++ b/packaging/platform-preset-boards-rpi3.inc
@@ -81,6 +81,10 @@ Firstly select HALs and Feature to add to your image.
Summary: RPI3_System
Requires: system-plugin-device-rpi3
Requires: model-config-default
+#From TRE-1993
+Requires: system-plugin-feature-session-bind
+#From TRE-1989
+Requires: system-plugin-feature-namespace
%description sub2-Preset_boards-RPI3-System
Packages for System HAL and Feature. They are mandatory.
diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index 1f45ef5..63e9dd3 100644
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -61,6 +61,7 @@ Requires: %{name}-sub1-domain_Feature-DotNET
Requires: dali-csharp-binder
Requires: %{name}-sub1-domain_Feature-Starter
Requires: %{name}-sub1-domain_Feature-Upgrade
+Requires: %{name}-sub1-domain_Feature-Recovery
Requires: %{name}-sub1-domain_Feature-WebAPI
Requires: %{name}-sub1-domain_Feature-Setup
## building-blocks-sub1-domain_Feature-Tool_And_Locale
diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc
index e937b03..984839a 100644
--- a/packaging/platform-preset-iot-headless-images.inc
+++ b/packaging/platform-preset-iot-headless-images.inc
@@ -33,11 +33,26 @@ Requires: %{name}-sub2-domain_API-Base-Utils
Requires: %{name}-sub2-domain_API-Multimedia-Player
Requires: %{name}-sub2-domain_API-Network-Bluetooth_Media_Audio
Requires: %{name}-sub2-domain_API-Network-Curl
+Requires: %{name}-sub1-domain_Feature-Upgrade
Requires: %{name}-sub1-domain_Feature-Smartthings_App
Requires: %{name}-sub1-domain_Feature-Setup
Requires: tar
-Requires: system-plugin-config-env-headless
-Requires: bluez-plugin-headless
+Requires: system-plugin-config-env-headless
+Requires: bluez-plugin-headless
+Requires: %{name}-sub1-domain_Feature-Recovery
+#From TRE-2142
+Requires: %{name}-sub1-domain_Feature-Setup
+#From TRE-1998
+Requires: %{name}-sub1-domain_Feature-Smartthings_App
+#From TRE-1991
+Requires: system-plugin-config-env-headless
+#From TRE-1994
+Requires: capi-network-wifi-manager-tool
+#From TRE-2024
+Requires: %{name}-sub1-domain_Feature-Resource_manager_Headless
+#From TRE-2103
+Requires: %{name}-sub2-domain_API-System-Runtime_Information
+
Conflicts: %{name}-sub1-Preset_img_headed-rpi3
Conflicts: %{name}-sub1-Preset_img_headed-artik530
@@ -65,11 +80,35 @@ Requires: %{name}-sub2-domain_API-Base-Utils
Requires: %{name}-sub2-domain_API-Multimedia-Player
Requires: %{name}-sub2-domain_API-Network-Bluetooth_Media_Audio
Requires: %{name}-sub2-domain_API-Network-Curl
+Requires: %{name}-sub1-domain_Feature-Upgrade
Requires: %{name}-sub1-domain_Feature-Smartthings_App
Requires: %{name}-sub1-domain_Feature-Setup
Requires: tar
-Requires: system-plugin-config-env-headless
-Requires: bluez-plugin-headless
+Requires: system-plugin-config-env-headless
+Requires: bluez-plugin-headless
+Requires: %{name}-sub1-domain_Feature-Recovery
+#From TRE-2142
+Requires: %{name}-sub1-domain_Feature-Setup
+#From TRE-1998
+Requires: %{name}-sub1-domain_Feature-Smartthings_App
+Requires: reboot-param-helper
+#From TRE-1991
+Requires: system-plugin-config-env-headless
+#From TRE-1994
+Requires: capi-network-wifi-manager-tool
+#From TRE-2024
+Requires: %{name}-sub1-domain_Feature-Resource_manager_Headless
+#From TRE-2074
+Requires: initrd-flash
+Requires: fm-data-rpi3
+#From TRE-2103
+Requires: %{name}-sub2-domain_API-System-Runtime_Information
+#From TRE-2238
+Requires: stability-monitor-kmod-rpi3
+#From TRE-2237
+Requires: stability-monitor
+
+
Conflicts: %{name}-sub1-Preset_img_headed-rpi3
Conflicts: %{name}-sub1-Preset_img_headed-artik530
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 50d72d1..76df71c 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -56,6 +56,8 @@ Requires: vconf-internal-keys
Requires: wpa_supplicant
Requires: libnss-security-manager
Requires: iotjs
+#From TRE-1957
+Requires: dbus-tools
%description root-Preset_iot_core
The packages of Tizen IoT Core.