[Update] Changing the menu free of Presets

Change-Id: I519a9d8fe93e6b9e3cfb3e4c67f099d8cbdc51b5

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index 848291c0ec45a30471b6fb0e2e0ae7835a29d3ca..d556c86b0e1d0aa169e00dc2443604c992f18076 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -36,9 +36,9 @@ Source2010:   epicfeature-development.inc
 Source2020:    epicfeature-platform.inc
 
 Source3500:    platform-preset-iot.inc
-Source3501:    platform-preset-iot-rpi3.inc
-Source3502:    platform-preset-iot-artik530.inc
-Source3503:    platform-preset-iot-craftroom.inc
+Source3501:    platform-preset-iot-craftroom.inc
+Source3502:    platform-preset-iot-headless-images.inc
+Source3503:    platform-preset-iot-headed-images.inc
 
 Source3800:    platform-preset-boards.inc
 Source3801:    platform-preset-boards-tm1.inc
@@ -98,11 +98,10 @@ and to most domains.
 Summary:       Tizen Presets
 Suggests:      %{name}-root-Preset_boards
 Suggests:      %{name}-root-Preset_iot_core
-Suggests:      %{name}-root-Preset_iot_core_rpi3
-Suggests:      %{name}-root-Preset_iot_core_artik530
 Suggests:      %{name}-root-Preset_iot_headed
-Suggests:      %{name}-root-Preset_iot_headed_artik530
 Suggests:      %{name}-root-Preset_craftroom
+Suggests:      %{name}-root-Preset_img_headless
+Suggests:      %{name}-root-Preset_img_headed
 %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-iot-artik530.inc b/packaging/platform-preset-iot-artik530.inc
deleted file mode 100644 (file)
index a8d4a8a..0000000
--- a/packaging/platform-preset-iot-artik530.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-# Maintainer: Tizen IoT PM
-# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
-
-#############################
-### IOT Core for ARTIK530 ###
-#############################
-%package root-Preset_iot_core_artik530
-Summary:    IOT Core Presets for ARTIK530
-Requires:      %{name}-root-Preset_iot_core
-Requires:   %{name}-sub1-Preset_boards-ARTIK530
-
-Conflicts:     %{name}-root-Preset_iot_headed_artik530
-Conflicts:     %{name}-root-Preset_iot_core_rpi3
-
-%description root-Preset_iot_core_artik530
-__EXPAND__: preset
-The packages of Tizen IoT Core for ARTIK530.
-%files root-Preset_iot_core_artik530
-
-
-######################################
-### IOT Haeded Common for ARTIK530 ###
-######################################
-%package root-Preset_iot_headed_artik530
-Summary:    IOT Headed Common Presets for ARTIK530
-Requires:      %{name}-root-Preset_iot_headed
-Requires:      %{name}-sub1-Preset_boards-ARTIK530
-Requires:      %{name}-sub2-Preset_boards-ARTIK530-Audio
-Requires:      alsa-utils
-Requires:      pulseaudio-module-bluetooth
-Requires:      pulseaudio-utils
-Requires:      %{name}-sub2-Preset_boards-ARTIK530-Bluetooth
-Requires:      net-config-plugin-headed
-Requires:      org.tizen.bt-syspopup
-Requires:      bluetooth-frwk-plugin-headed
-Requires:      %{name}-sub2-Preset_boards-ARTIK530-Camera
-Requires:      %{name}-sub2-Preset_boards-ARTIK530-DALi
-Requires:      %{name}-sub2-Preset_boards-ARTIK530-EFL
-Requires:      %{name}-sub2-Preset_boards-ARTIK530-IM
-Requires:      %{name}-sub2-Preset_boards-ARTIK530-System_Device
-Requires:      %{name}-sub2-Preset_boards-ARTIK530-Wifi
-Requires:      gst-omx
-Requires:      libomxil-e54xx
-
-Conflicts:     %{name}-root-Preset_iot_core_rpi3
-Conflicts:     %{name}-root-Preset_iot_core_artik530
-
-%description root-Preset_iot_headed_artik530
-__EXPAND__: preset
-The packages of Tizen IoT Headed Common for ARTIK530.
-%files root-Preset_iot_headed_artik530

diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
new file mode 100644 (file)
index 0000000..2915ee5
--- /dev/null
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -0,0 +1,42 @@
+# Maintainer: Tizen IoT PM
+# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
+
+################################
+### Preset for IoT Headed  ###
+################################
+%package root-Preset_img_headed
+Summary:    IOT Headed Images
+Suggests:   %{name}-sub1-Preset_img_headed-artik530
+
+%description root-Preset_img_headed
+The IoT Headed Images.
+%files root-Preset_img_headed
+
+
+#############################
+### IOT Headed ARTIK530 ###
+#############################
+%package sub1-Preset_img_headed-artik530
+Summary:    IOT Headed ARTIK530 Image
+Requires:   %{name}-root-Preset_iot_headed
+Requires:   %{name}-sub1-Preset_boards-ARTIK530
+Requires:   %{name}-sub2-Preset_boards-ARTIK530-Audio
+Requires:   alsa-utils
+Requires:   pulseaudio-module-bluetooth
+Requires:   pulseaudio-utils
+Requires:   %{name}-sub2-Preset_boards-ARTIK530-Bluetooth
+Requires:   net-config-plugin-headed
+Requires:   org.tizen.bt-syspopup
+Requires:   bluetooth-frwk-plugin-headed
+Requires:   %{name}-sub2-Preset_boards-ARTIK530-Camera
+Requires:   %{name}-sub2-Preset_boards-ARTIK530-DALi
+Requires:   %{name}-sub2-Preset_boards-ARTIK530-EFL
+Requires:   %{name}-sub2-Preset_boards-ARTIK530-IM
+Requires:   %{name}-sub2-Preset_boards-ARTIK530-System_Device
+Requires:   %{name}-sub2-Preset_boards-ARTIK530-Wifi
+Requires:   gst-omx
+Requires:   libomxil-e54xx
+
+%description sub1-Preset_img_headed-artik530
+The packages of Tizen IoT Headed for ARTIK530.
+%files sub1-Preset_img_headed-artik530

diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc
new file mode 100644 (file)
index 0000000..af7e4e6
--- /dev/null
+++ b/packaging/platform-preset-iot-headless-images.inc
@@ -0,0 +1,45 @@
+# Maintainer: Tizen IoT PM
+# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
+
+################################
+### Preset for IoT Headless  ###
+################################
+%package root-Preset_img_headless
+Summary:    IOT Headless Images
+Suggests:      %{name}-sub1-Preset_img_headless-rpi3
+Suggests:   %{name}-sub1-Preset_img_headless-artik530
+
+%description root-Preset_img_headless
+The IoT Headless Images.
+%files root-Preset_img_headless
+
+
+#############################
+### IOT Headless ARTIK530 ###
+#############################
+%package sub1-Preset_img_headless-artik530
+Summary:    IOT Headless ARTIK530 Image
+Requires:   %{name}-root-Preset_iot_core
+Requires:   %{name}-sub1-Preset_boards-ARTIK530
+
+Conflicts:     %{name}-sub1-Preset_img_headless-rpi3
+
+%description sub1-Preset_img_headless-artik530
+The packages of Tizen IoT Headless for ARTIK530.
+%files sub1-Preset_img_headless-artik530
+
+#########################
+### IOT Headless RPI3 ###
+#########################
+%package sub1-Preset_img_headless-rpi3
+Summary:    IOT Headless RPI3 Image
+Requires:   %{name}-root-Preset_iot_core
+Requires:   %{name}-sub1-Preset_boards-RPI3
+
+Conflicts:     %{name}-sub1-Preset_img_headless-artik530
+
+%description sub1-Preset_img_headless-rpi3
+The packages of Tizen IoT Headless for RPI3.
+%files sub1-Preset_img_headless-rpi3
+
+

diff --git a/packaging/platform-preset-iot-rpi3.inc b/packaging/platform-preset-iot-rpi3.inc
deleted file mode 100644 (file)
index 0082db0..0000000
--- a/packaging/platform-preset-iot-rpi3.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Maintainer: Tizen IoT PM
-# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
-
-#########################
-### IOT Core for RPI3 ###
-#########################
-%package root-Preset_iot_core_rpi3
-Summary:    IOT Core Presets for RPI3
-Requires:      %{name}-root-Preset_iot_core
-Requires:   %{name}-sub1-Preset_boards-RPI3
-
-Conflicts:     %{name}-root-Preset_iot_headed_artik530
-Conflicts:     %{name}-root-Preset_iot_core_artik530
-
-%description root-Preset_iot_core_rpi3
-__EXPAND__: preset
-The packages of Tizen IoT Core for RPI3.
-%files root-Preset_iot_core_rpi3