Rearrange UI with IoT and add __EXPAND__ rule

1. If the first line of description is __EXPAND__,
TIC will automatically expand the block at load

2. Rearranged IoT related UI listing

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

diff --git a/RULES b/RULES
index bad631f45164482187c636e3a463ea1141bbcc1d..4bb603ae74d9bb607cdab900127e76129ba54e7f 100644 (file)
--- a/RULES
+++ b/RULES
@@ -136,3 +136,11 @@ the model ks file URL to be interpreted by TIC.
     5.7.3. The section of "%packages" in the linked ks file is ignored.
     5.7.4. If the URL points to a directory index, any ks file in the directory can be
        used. (ending with /)
+
+5.8. If the first line of %description starts with __EXPAND__, the block is
+expanded in TIC as default
+
+    5.8.1. A following word of __EXPAND__ may denote keywords for TIC that
+        show when to expand and collapse.
+        e.g., __EXPAND__: TAB1 (expanded with preset tab only)
+        e.g., __EXPAND__: TAB1_O (expanded with preset tab, collapsed with others)

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index d565160645422b09613a8533afb25e1402592be6..fab6e7ce707ba4b03f529257dac3633839e4fd2c 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -104,9 +104,10 @@ and to most domains.
 
 %package       category-Preset
 Summary:       Tizen Presets
+Suggests:      %{name}-root-Preset_1iot_examples
 Suggests:      %{name}-root-Preset_boards
-Suggests:      %{name}-root-Preset_sd
 Suggests:      %{name}-root-Preset_iot
+Suggests:      %{name}-root-Preset_sd
 %description   category-Preset
 This meta pacakge lists all Tizen blocks (meta packages) designating
 Tizen platform presets, HAL/device-support presets, and

diff --git a/packaging/platform-preset-boards.inc b/packaging/platform-preset-boards.inc
index 9cfeec2da517cd3d6f0feed3a6e0a966866c01fe..ea8a65cfdc1cd98b2d8d922e5a9cf7ade36e5f93 100644 (file)
--- a/packaging/platform-preset-boards.inc
+++ b/packaging/platform-preset-boards.inc
@@ -22,6 +22,7 @@ Suggests:     %{name}-sub1-Preset_boards-TW1_fullBSP
 Suggests:      %{name}-sub1-Preset_boards-TW2_fullBSP
 %endif
 %description root-Preset_boards
+__EXPAND__: TAB1_O
 Note that kernel binaries may be required to be installed in a separated partition
 and you might be not allowed to include kernel binaries in the platform image.
 %files root-Preset_boards
@@ -70,6 +71,7 @@ Conflicts:    %{name}-sub1-Preset_boards-TW1_fullBSP
 Conflicts:     %{name}-sub1-Preset_boards-TW2_fullBSP
 
 %description sub1-Preset_boards-RPI3_fullBSP
+__KS_URL__: http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/common-headless-2parts-armv7l-rpi3/
 %files sub1-Preset_boards-RPI3_fullBSP
 %endif
 
@@ -97,10 +99,9 @@ Conflicts:   %{name}-sub1-Preset_boards-TW1_fullBSP
 Conflicts:     %{name}-sub1-Preset_boards-TW2_fullBSP
 
 %description sub1-Preset_boards-ARTIK_fullBSP
+__KS_URL__: http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/common-wayland-3parts-armv7l-artik710/
 These are manually extracted from
-common-wayland-3parts-armv7l-artik710.ks and
-common-wayland-3parts-armv7l-artik.ks
-(Both had same for these)
+common-wayland-3parts-armv7l-artik710.ks
 %files sub1-Preset_boards-ARTIK_fullBSP
 %endif
 
@@ -128,6 +129,7 @@ Conflicts:  %{name}-sub1-Preset_boards-TW1_fullBSP
 Conflicts:     %{name}-sub1-Preset_boards-TW2_fullBSP
 
 %description sub1-Preset_boards-OdroidXU3_fullBSP
+__KS_URL__: http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/common-wayland-3parts-armv7l-odroidu3/
 Manually created from common/odroidu2/arm32 ks
 %files sub1-Preset_boards-OdroidXU3_fullBSP
 %endif
@@ -186,6 +188,7 @@ Conflicts:  %{name}-sub1-Preset_boards-TW1_fullBSP
 Conflicts:     %{name}-sub1-Preset_boards-TW2_fullBSP
 
 %description sub1-Preset_boards-TM1_fullBSP
+__KS_URL__: http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/mobile-wayland-armv7l-tm1/
 Manually created from mobile/tm1/arm32 ks
 %files sub1-Preset_boards-TM1_fullBSP
 %endif
@@ -236,6 +239,7 @@ Conflicts:  %{name}-sub1-Preset_boards-TW1_fullBSP
 Conflicts:     %{name}-sub1-Preset_boards-TW2_fullBSP
 
 %description sub1-Preset_boards-TM2_fullBSP_32b
+__KS_URL__: http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/mobile-wayland-armv7l-tm2/
 Manually created from mobile/tm2/arm32 ks
 %files sub1-Preset_boards-TM2_fullBSP_32b
 %endif
@@ -286,6 +290,7 @@ Conflicts:  %{name}-sub1-Preset_boards-TW1_fullBSP
 Conflicts:     %{name}-sub1-Preset_boards-TW2_fullBSP
 
 %description sub1-Preset_boards-TM2_fullBSP_64b
+__KS_URL__: http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/mobile-wayland-arm64-tm2/
 Manually created from mobile/tm2/arm64 ks
 %files sub1-Preset_boards-TM2_fullBSP_64b
 %endif
@@ -352,6 +357,7 @@ Conflicts:  %{name}-sub1-Preset_boards-TM3_fullBSP
 Conflicts:     %{name}-sub1-Preset_boards-TW2_fullBSP
 
 %description sub1-Preset_boards-TW1_fullBSP
+__KS_URL__: http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/wearable-wayland-armv7l-tw1/
 Created from wearable/tw1 ks. Importing all "Adaptation" section
 %files sub1-Preset_boards-TW1_fullBSP
 %endif
@@ -399,6 +405,7 @@ Conflicts:  %{name}-sub1-Preset_boards-TM3_fullBSP
 Conflicts:     %{name}-sub1-Preset_boards-TW1_fullBSP
 
 %description sub1-Preset_boards-TW2_fullBSP
+__KS_URL__: http://download.tizen.org/snapshots/tizen/unified/latest/images/standard/wearable-wayland-armv7l-tw2/
 Created from wearable/tw2 ks. Importing all "Adaptation" section
 %files sub1-Preset_boards-TW2_fullBSP
 %endif

diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 144488284a5cecf1b122f2ddc14026bb032b0b27..b3dac2d0f20de58f3bd12f25c8f62d3adfef03df 100644 (file)
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -2,161 +2,161 @@
 # You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
 
 %package root-Preset_iot
-Summary:       Presets for IOT Devices
+Summary:       IOT Software Platform Presets
 Conflicts:     %{name}-root-Preset_sd
 Conflicts:     %{name}-root-Preset_mobile
 Conflicts:     %{name}-root-Preset_tv
 Conflicts:     %{name}-root-Preset_wearable
 Conflicts:     %{name}-root-Preset_ivi
-Suggests:      %{name}-sub1-Preset_iot-platforms
-Suggests:      %{name}-sub1-Preset_iot-examples
+Suggests:      %{name}-sub1-Preset_iot-headless_minimal
+Suggests:      %{name}-sub1-Preset_iot-headless_speaker
+Suggests:      %{name}-sub1-Preset_iot-headed_minimal
 %description root-Preset_iot
-Tizen IoT Device Presets
-%files root-Preset_iot
-
-
-%package sub1-Preset_iot-platforms
-Summary:       IOT Software Platform Presets
-Suggests:      %{name}-sub2-Preset_iot-platforms-headless_minimal
-Suggests:      %{name}-sub2-Preset_iot-platforms-headless_speaker
-Suggests:      %{name}-sub2-Preset_iot-platforms-headed_minimal
-%description sub1-Preset_iot-platforms
+__EXPAND__: TAB1_O
 Tizen IoT Presets of Software Plaforms independent from specific hardware/BSPs.
-%files sub1-Preset_iot-platforms
+%files root-Preset_iot
 
-%package sub1-Preset_iot-examples
-Summary:       IOT Device Board and SW Platform Presets
+%package root-Preset_1iot_examples
+Summary:       IoT Device Board and SW Platform Examples
 %ifarch armv7l
-Suggests:      %{name}-sub2-Preset_iot-examples-1_AAA_BLANK1__UI__SM
-Suggests:      %{name}-sub2-Preset_iot-examples-1_ARTIK_headless
-Suggests:      %{name}-sub2-Preset_iot-examples-1_ARTIK_headed_full
-Suggests:      %{name}-sub2-Preset_iot-examples-1_ODROID_headed_full
+Suggests:      %{name}-sub1-Preset_1iot_examples-1_AAA_BLANK1__UI__SM
+Suggests:      %{name}-sub1-Preset_1iot_examples-1_ARTIK_headless
+Suggests:      %{name}-sub1-Preset_1iot_examples-1_ARTIK_headed_full
+Suggests:      %{name}-sub1-Preset_1iot_examples-1_ODROID_headed_full
 %endif
-Suggests:      %{name}-sub2-Preset_iot-examples-1_ZZZBLANK1__UI__HR
-Suggests:      %{name}-sub2-Preset_iot-examples-1_ZZZBLANK2__UI__SM
+Suggests:      %{name}-sub1-Preset_1iot_examples-1_ZZZBLANK1__UI__HR
+Suggests:      %{name}-sub1-Preset_1iot_examples-1_ZZZBLANK2__UI__SM
 %ifarch aarch64 armv7l
-Suggests:      %{name}-sub2-Preset_iot-examples-1_RPI3_headless
-Suggests:      %{name}-sub2-Preset_iot-examples-3_RPI3_headless_devboard
-Suggests:      %{name}-sub2-Preset_iot-examples-3_RPI3_headless_networkhub
-Suggests:      %{name}-sub2-Preset_iot-examples-3_RPI3_headless_minimal
+Suggests:      %{name}-sub1-Preset_1iot_examples-1_RPI3_headless
+Suggests:      %{name}-sub1-Preset_1iot_examples-3_RPI3_headless_devboard
+Suggests:      %{name}-sub1-Preset_1iot_examples-3_RPI3_headless_networkhub
+Suggests:      %{name}-sub1-Preset_1iot_examples-3_RPI3_headless_minimal
 %endif
-%description sub1-Preset_iot-examples
+%description root-Preset_1iot_examples
+__EXPAND__: TAB1_O
 Tizen IoT Presets of specific devices, which have both BSPs and software platforms.
 An item in this section is intended to represent a whole OS image.
-%files sub1-Preset_iot-examples
+%files root-Preset_1iot_examples
 
-%package sub2-Preset_iot-examples-1_AAA_BLANK1__UI__SM
+%package sub1-Preset_1iot_examples-1_AAA_BLANK1__UI__SM
 Summary:       <b>Examples of Official Tizen Snapshot Images</b>
-%description sub2-Preset_iot-examples-1_AAA_BLANK1__UI__SM
-%files sub2-Preset_iot-examples-1_AAA_BLANK1__UI__SM
+%description sub1-Preset_1iot_examples-1_AAA_BLANK1__UI__SM
+%files sub1-Preset_1iot_examples-1_AAA_BLANK1__UI__SM
 
-%package sub2-Preset_iot-examples-1_ZZZBLANK1__UI__HR
+%package sub1-Preset_1iot_examples-1_ZZZBLANK1__UI__HR
 Summary:       UI Blank
-%description sub2-Preset_iot-examples-1_ZZZBLANK1__UI__HR
-%files sub2-Preset_iot-examples-1_ZZZBLANK1__UI__HR
+%description sub1-Preset_1iot_examples-1_ZZZBLANK1__UI__HR
+%files sub1-Preset_1iot_examples-1_ZZZBLANK1__UI__HR
 
-%package sub2-Preset_iot-examples-1_ZZZBLANK2__UI__SM
+%package sub1-Preset_1iot_examples-1_ZZZBLANK2__UI__SM
 Summary:       <b>Examples Not Verified</b>
-%description sub2-Preset_iot-examples-1_ZZZBLANK2__UI__SM
-%files sub2-Preset_iot-examples-1_ZZZBLANK2__UI__SM
+%description sub1-Preset_1iot_examples-1_ZZZBLANK2__UI__SM
+%files sub1-Preset_1iot_examples-1_ZZZBLANK2__UI__SM
 
 
-%package sub2-Preset_iot-platforms-headless_minimal
+%package sub1-Preset_iot-headless_minimal
 Summary:       IoT Headless Minimal Preset
 Requires:      %{name}-root-feature_Headless
-%description sub2-Preset_iot-platforms-headless_minimal
+%description sub1-Preset_iot-headless_minimal
 Tizen IoT Headless/Minimal Preset
-%files sub2-Preset_iot-platforms-headless_minimal
+%files sub1-Preset_iot-headless_minimal
 
 
-%package sub2-Preset_iot-platforms-headless_speaker
+%package sub1-Preset_iot-headless_speaker
 Summary:       IoT Headless Speaker (Minimal) Preset
 Requires:      %{name}-root-feature_Headless
-%description sub2-Preset_iot-platforms-headless_speaker
+%description sub1-Preset_iot-headless_speaker
 Tizen IoT Speaker/Minimal Preset
-%files sub2-Preset_iot-platforms-headless_speaker
+%files sub1-Preset_iot-headless_speaker
 
 
-%package sub2-Preset_iot-platforms-headed_minimal
+%package sub1-Preset_iot-headed_minimal
 Summary:       IoT Headed (GUI support) Minimal Preset
 Requires:      %{name}-root-feature_Headed
-%description sub2-Preset_iot-platforms-headed_minimal
+%description sub1-Preset_iot-headed_minimal
 Tizen IoT Headed/Minimal Preset
-%files sub2-Preset_iot-platforms-headed_minimal
+%files sub1-Preset_iot-headed_minimal
 
 
 %ifarch aarch64 armv7l
-%package sub2-Preset_iot-examples-3_RPI3_headless_devboard
+%package sub1-Preset_1iot_examples-3_RPI3_headless_devboard
 Summary:       RPI3 Headless for Developers
-Requires:      %{name}-sub2-Preset_iot-platforms-headless_minimal
+Requires:      %{name}-sub1-Preset_iot-headless_minimal
 Requires:      %{name}-sub1-Preset_boards-RPI3_headlessBSP
 Requires:      rpm
 Suggests:      gcc
 Suggests:      make
 Suggests:      cmake
-%description sub2-Preset_iot-examples-3_RPI3_headless_devboard
-%files sub2-Preset_iot-examples-3_RPI3_headless_devboard
+%description sub1-Preset_1iot_examples-3_RPI3_headless_devboard
+%files sub1-Preset_1iot_examples-3_RPI3_headless_devboard
 %endif
 
 %ifarch aarch64 armv7l
-%package sub2-Preset_iot-examples-3_RPI3_headless_networkhub
+%package sub1-Preset_1iot_examples-3_RPI3_headless_networkhub
 Summary:       RPI3 Headless Network Hub
-Requires:      %{name}-sub2-Preset_iot-platforms-headless_minimal
+Requires:      %{name}-sub1-Preset_iot-headless_minimal
 Requires:      %{name}-sub1-Preset_boards-RPI3_headlessBSP
 Requires:      %{name}-root-domain_network
-%description sub2-Preset_iot-examples-3_RPI3_headless_networkhub
-%files sub2-Preset_iot-examples-3_RPI3_headless_networkhub
+%description sub1-Preset_1iot_examples-3_RPI3_headless_networkhub
+%files sub1-Preset_1iot_examples-3_RPI3_headless_networkhub
 %endif
 
 %ifarch aarch64 armv7l
-%package sub2-Preset_iot-examples-3_RPI3_headless_minimal
+%package sub1-Preset_1iot_examples-3_RPI3_headless_minimal
 Summary:       RPI3 Minimal Headless
-Requires:      %{name}-sub2-Preset_iot-platforms-headless_minimal
+Requires:      %{name}-sub1-Preset_iot-headless_minimal
 Requires:      %{name}-sub1-Preset_boards-RPI3_headlessBSP
-%description sub2-Preset_iot-examples-3_RPI3_headless_minimal
-%files sub2-Preset_iot-examples-3_RPI3_headless_minimal
+%description sub1-Preset_1iot_examples-3_RPI3_headless_minimal
+%files sub1-Preset_1iot_examples-3_RPI3_headless_minimal
 %endif
 
 %ifarch aarch64 armv7l
-%package sub2-Preset_iot-examples-1_RPI3_headless
+%package sub1-Preset_1iot_examples-1_RPI3_headless
 Summary:       RPI3 Headless Tizen Official Example
+Requires:      %{name}-sub1-Preset_boards-RPI3_headlessBSP
 %list_with_require %{_datadir}/image-configurations/common-headless-2parts-armv7l-rpi3.ks
-%description sub2-Preset_iot-examples-1_RPI3_headless
+%description sub1-Preset_1iot_examples-1_RPI3_headless
 Replication of Tizen IoT RPI3 Snapshot Release (download.tizen.org/snapshots/tizen/unified)
 This is from common-headless-2parts-armv7l-rpi3. (armv7l)
 Userspace rootfs only.
-%files sub2-Preset_iot-examples-1_RPI3_headless
+%files sub1-Preset_1iot_examples-1_RPI3_headless
 %endif
 
 %ifarch armv7l
-%package sub2-Preset_iot-examples-1_ARTIK_headless
+%package sub1-Preset_1iot_examples-1_ARTIK_headless
 Summary:       ARTIK Headless Tizen Official Example
+# TODO: Change it to headlessBSP
+Requires:      %{name}-sub1-Preset_boards-ARTIK_fullBSP
 %list_with_require %{_datadir}/image-configurations/common-headless-3parts-armv7l-artik.ks
-%description sub2-Preset_iot-examples-1_ARTIK_headless
+%description sub1-Preset_1iot_examples-1_ARTIK_headless
 Replication of Tizen IoT ARTIK Snapshot Release (download.tizen.org/snapshots/tizen/unified)
 This is from common-headless-3parts-armv7l-artik. (armv7l)
 Userspace rootfs only
-%files sub2-Preset_iot-examples-1_ARTIK_headless
+TODO: Change BSP reference to headlessBSP
+%files sub1-Preset_1iot_examples-1_ARTIK_headless
 %endif
 
 %ifarch armv7l
-%package sub2-Preset_iot-examples-1_ARTIK_headed_full
+%package sub1-Preset_1iot_examples-1_ARTIK_headed_full
 Summary:       ARTIK Headed Tizen Official Example (common/full)
+Requires:      %{name}-sub1-Preset_boards-ARTIK_fullBSP
+%list_with_require %{_datadir}/image-configurations/common-headless-3parts-armv7l-artik.ks
 %list_with_require %{_datadir}/image-configurations/common-wayland-3parts-armv7l-artik.ks
-%description sub2-Preset_iot-examples-1_ARTIK_headed_full
+%description sub1-Preset_1iot_examples-1_ARTIK_headed_full
 Replication of Tizen IoT ARTIK Headed/Wayland Snapshot Release (download.tizen.org/snapshots/tizen/unified)
 This is from common-wayland-3parts-armv7l-artik. (armv7l)
 Userspace rootfs only
-%files sub2-Preset_iot-examples-1_ARTIK_headed_full
+%files sub1-Preset_1iot_examples-1_ARTIK_headed_full
 %endif
 
 %ifarch armv7l
-%package sub2-Preset_iot-examples-1_ODROID_headed_full
+%package sub1-Preset_1iot_examples-1_ODROID_headed_full
 Summary:       ODROID U3/XU3 Headed Tizen Official Example (common/full)
+Requires:      %{name}-sub1-Preset_boards-OdroidXU3_fullBSP
 %list_with_require %{_datadir}/image-configurations/common-wayland-3parts-armv7l-odroidu3.ks
-%description sub2-Preset_iot-examples-1_ODROID_headed_full
+%description sub1-Preset_1iot_examples-1_ODROID_headed_full
 Replication of Tizen IoT Odroid U3/XU3 Headed/Wayland Snapshot Release (download.tizen.org/snapshots/tizen/unified)
 This is from common-wayland-3parts-armv7l-odroidu3. (armv7l)
 Userspace rootfs only
-%files sub2-Preset_iot-examples-1_ODROID_headed_full
+%files sub1-Preset_1iot_examples-1_ODROID_headed_full
 %endif