feature-headless/headed: add headed feature (contradicting headless)

Change-Id: If86955455be218b45a0d23545d2b682375be3784
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index 52accf4..5a21629 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -27,9 +27,12 @@ Source1100:  domain-security.inc
 Source2001:    epicfeature-headless.inc
 
 Suggests:      %{name}-root-UI
+Suggests:      %{name}-root-HAL
 Suggests:      %{name}-root-Kernel
 Suggests:      %{name}-root-System_FW
-Suggests:      %{name}-root-Headless
+
+Suggests:      %{name}-root-feature_Headless
+Suggests:      %{name}-root-feature_Headed
 
 %description
 The root of all Tizen building block meta packages.

diff --git a/packaging/epicfeature-headless.inc b/packaging/epicfeature-headless.inc
index 868b058..7e85257 100644 (file)
--- a/packaging/epicfeature-headless.inc
+++ b/packaging/epicfeature-headless.inc
@@ -2,31 +2,48 @@
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
 
-%package root-Headless
+%package root-feature_Headless
 Summary:       Enable Tizen Headless Device
 Conflicts:     efl
 Conflicts:     wayland
-Requires:      %{name}-sub1-Headless-Minimal
-Suggests:      %{name}-sub1-Headless-Network
-%description root-Headless
-Enableing this means that you are going to create Tizen headless device.
+Conflicts:     %{name}-root-feature_Headed
+Requires:      %{name}-sub1-feature_Headless-Minimal
+Suggests:      %{name}-sub1-feature_Headless-Network
+%description root-feature_Headless
+Enabling this means that you are going to create Tizen headless device.
 This disables all display depending packages.
-%files root-Headless
+%files root-feature_Headless
 
-%package sub1-Headless-Minimal
+%package sub1-feature_Headless-Minimal
 Summary:       Minimal Tizen Image Configuration for Headless
 Requires:      bash
 Requires:      systemd
-%description sub1-Headless-Minimal
+%description sub1-feature_Headless-Minimal
 Include minimal set of packages for headless.
-%files sub1-Headless-Minimal
+%files sub1-feature_Headless-Minimal
 
-%package sub1-Headless-Network
+%package sub1-feature_Headless-Network
 Summary:       Headless Network Packages
 Requires:      wpa-supplicant
 Suggests:      bluez
-%description sub1-Headless-Network
+%description sub1-feature_Headless-Network
 Include network packages for headless.
-%files sub1-Headless-Network
+%files sub1-feature_Headless-Network
+
+%package root-feature_Headed
+Summary:       Enable Tizen Headed Device (disable headless)
+Conflicts:     %{name}-root-feature_Headless
+Conflicts:     %{name}-sub1-feature_Headless-Minimal
+Conflicts:     %{name}-sub1-feature_Headless-Network
+Requires:      bash
+Requires:      systemd
+
+#Uncomment after UI domain is created
+#Requires:     root-UI
+%description root-feature_Headed
+Enables to create Tizen headed device platform image.
+This is a suggested starting point for such platform images.
+This disabled headless feature.
+%files root-feature_Headed
 
 #END