From 84dec81d75f393ac3df353a7ca7f28712789c29b Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Wed, 19 Apr 2017 11:21:19 +0900 Subject: Feature: rearranged root blocks of features Headless/Headed root blocks are not included in "platform-wide" features Change-Id: Ifb8903f951fbbcdee02dd54dfed9f6bdee9289ec Signed-off-by: MyungJoo Ham --- packaging/building-blocks.spec | 6 ----- packaging/epicfeature-headless.inc | 51 ------------------------------------- packaging/epicfeature-platform.inc | 52 +++++++++++++++++++++++++++++++++++++- packaging/platform-preset-iot.inc | 10 ++++---- 4 files changed, 56 insertions(+), 63 deletions(-) delete mode 100644 packaging/epicfeature-headless.inc (limited to 'packaging') diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec index 7a24020..0ca7cb0 100644 --- a/packaging/building-blocks.spec +++ b/packaging/building-blocks.spec @@ -26,7 +26,6 @@ Source0: %{name}-%{version}.tar.gz #Source1100: domain-security.inc Source1200: domain-apis.inc -Source2001: epicfeature-headless.inc Source2010: epicfeature-development.inc Source2020: epicfeature-platform.inc @@ -81,8 +80,6 @@ techinical domains. %package category-epicfeatures Summary: Tizen Major Features -Suggests: %{name}-root-feature_Headless -Suggests: %{name}-root-feature_Headed Suggests: %{name}-root-feature_Development Suggests: %{name}-root-feature_Platform %description category-epicfeatures @@ -228,9 +225,6 @@ python ./rule_checker.py ############## EPIC FEATURES ###################### -# Include "headless" epic feature. The script should not execute "include" if the contexts is in GBS service in OBS or GBS-Export -%{include_if_mainbuild %{SOURCE2001}} - # Dev tools %{include_if_mainbuild %{SOURCE2010}} diff --git a/packaging/epicfeature-headless.inc b/packaging/epicfeature-headless.inc deleted file mode 100644 index a7205d4..0000000 --- a/packaging/epicfeature-headless.inc +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer: Ohoon Kwon -# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers. - - -%package root-feature_Headless -Summary: Enable Tizen Headless Device -Conflicts: efl -Conflicts: libwayland-server -Conflicts: %{name}-root-feature_Headed -# You need to list "Important (commonly-required)" headed-only packages/blocks with Conflicts. -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-feature_Headless - -%package sub1-feature_Headless-Minimal -Summary: Minimal Tizen Image Configuration for Headless -Requires: bash -Requires: systemd -%description sub1-feature_Headless-Minimal -Include minimal set of packages for headless. -%files sub1-feature_Headless-Minimal - -%package sub1-feature_Headless-Network -Summary: Headless Network Packages -Requires: wpa-supplicant -Suggests: bluez -%description sub1-feature_Headless-Network -Include network packages for headless. -%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 -# You may list ALL headless-ONLY packages/blocks with Conflicts. -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 diff --git a/packaging/epicfeature-platform.inc b/packaging/epicfeature-platform.inc index b14e584..318792e 100644 --- a/packaging/epicfeature-platform.inc +++ b/packaging/epicfeature-platform.inc @@ -2,8 +2,10 @@ # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers. %package root-feature_Platform -Summary: Platform-Wide Features +Summary: Tizen Platform-Wide Features Suggests: %{name}-sub1-feature_Platform-KDBUS +Suggests: %{name}-sub1-feature_Platform-Headless +Suggests: %{name}-sub1-feature_Platform-Headed %description root-feature_Platform Platform-wide applied that affect target devices. %files root-feature_Platform @@ -18,3 +20,51 @@ Enable KDBUS feature. - You MUST install KDBUS-enabled kernel. - You MUST enable libgio-extension-kdbus if you have libgio. %files sub1-feature_Platform-KDBUS + +%package sub1-feature_Platform-Headless +Summary: Enable Tizen Headless Device +Conflicts: efl +Conflicts: libwayland-server +Conflicts: %{name}-sub1-feature_Platform-Headed +# You need to list "Important (commonly-required)" headed-only packages/blocks with Conflicts. +Requires: %{name}-sub2-feature_Platform-Headless-Minimal +Suggests: %{name}-sub2-feature_Platform-Headless-Network +%description sub1-feature_Platform-Headless +Enabling this means that you are going to create Tizen headless device. +This disables all display depending packages. +%files sub1-feature_Platform-Headless + +%package sub2-feature_Platform-Headless-Minimal +Summary: Minimal Tizen Image Configuration for Headless +Requires: bash +Requires: systemd +%description sub2-feature_Platform-Headless-Minimal +Include minimal set of packages for headless. +%files sub2-feature_Platform-Headless-Minimal + +%package sub2-feature_Platform-Headless-Network +Summary: Headless Network Packages +Requires: wpa-supplicant +Suggests: bluez +%description sub2-feature_Platform-Headless-Network +Include network packages for headless. +%files sub2-feature_Platform-Headless-Network + +%package sub1-feature_Platform-Headed +Summary: Enable Tizen Headed Device (disable headless) +Conflicts: %{name}-sub1-feature_Platform-Headless +Conflicts: %{name}-sub2-feature_Platform-Headless-Minimal +Conflicts: %{name}-sub2-feature_Platform-Headless-Network +# You may list ALL headless-ONLY packages/blocks with Conflicts. +Requires: bash +Requires: systemd + +#Uncomment after UI domain is created +#Requires: sub1-UI +%description sub1-feature_Platform-Headed +Enables to create Tizen headed device platform image. +This is a suggested starting point for such platform images. +This disabled headless feature. +%files sub1-feature_Platform-Headed + +#END diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc index 30700bb..bc5d7b0 100644 --- a/packaging/platform-preset-iot.inc +++ b/packaging/platform-preset-iot.inc @@ -58,7 +58,7 @@ Summary: Examples Not Verified %package sub1-Preset_iot-headless_minimal Summary: IoT Headless Minimal Preset -Requires: %{name}-root-feature_Headless +Requires: %{name}-sub1-feature_Platform-Headless Requires: bash Requires: systemd Suggests: rpm @@ -70,7 +70,7 @@ Tizen IoT Headless/Minimal Preset %package sub1-Preset_iot-headless_speaker Summary: IoT Headless Speaker (Minimal) Preset -Requires: %{name}-root-feature_Headless +Requires: %{name}-sub1-feature_Platform-Headless Requires: %{name}-sub2-domain_API-Multimedia-AudioIO Requires: %{name}-sub2-domain_API-Multimedia-SoundManager Requires: %{name}-sub2-domain_API-Multimedia-WAVPlayer @@ -89,7 +89,7 @@ Tizen IoT Speaker/Minimal Preset %package sub1-Preset_iot-headed_minimal Summary: IoT Headed (GUI support) Minimal Preset -Requires: %{name}-root-feature_Headed +Requires: %{name}-sub1-feature_Platform-Headed Requires: %{name}-sub2-domain_API-UI-EFL Suggests: %{name}-sub2-domain_API-UI-DALi Suggests: %{name}-sub2-domain_API-UI-Cairo @@ -104,7 +104,7 @@ Tizen IoT Headed/Minimal Preset %package sub1-Preset_iot-headless_net Summary: IoT Headless -Requires: %{name}-root-feature_Headless +Requires: %{name}-sub1-feature_Platform-Headless Requires: %{name}-sub2-domain_API-Network-Bluetooth Requires: %{name}-sub2-domain_API-Network-Connection Requires: %{name}-sub2-domain_API-Network-WiFiDirect @@ -122,7 +122,7 @@ Tizen IoT Headless Preset %package sub1-Preset_iot-headless_controller Summary: IoT Headless -Requires: %{name}-root-feature_Headless +Requires: %{name}-sub1-feature_Platform-Headless Requires: %{name}-sub2-domain_API-Network-Bluetooth Requires: %{name}-sub2-domain_API-Network-Connection Requires: %{name}-sub2-domain_API-Network-IoTCon -- cgit v1.2.3