[Update] adding partition presets

Change-Id: I45e4af60e236283e38e108f8742fceb737f30e01

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index d556c86b0e1d0aa169e00dc2443604c992f18076..74fee356d3a7089229e93d7ab462ef05cb468349 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -4,7 +4,7 @@
 %define tizen_feature() sed -i 's#\\\(\\\"%{1}\\\".\\\+>\\\).\\\+\\\(</key>\\\)#\\\1%{2}\\\2#' %{_sysconfdir}/config/model-config.xml;
 
 Name:          building-blocks
-Version:       0.0.3
+Version:       0.0.4
 Release:       0
 License:       Apache-2.0
 Summary:       The Root of All Tizen Meta Packages (building blocks)
@@ -39,6 +39,7 @@ Source3500:   platform-preset-iot.inc
 Source3501:    platform-preset-iot-craftroom.inc
 Source3502:    platform-preset-iot-headless-images.inc
 Source3503:    platform-preset-iot-headed-images.inc
+Source3504:    platform-preset-partitions.inc
 
 Source3800:    platform-preset-boards.inc
 Source3801:    platform-preset-boards-tm1.inc
@@ -102,6 +103,7 @@ Suggests:   %{name}-root-Preset_iot_headed
 Suggests:      %{name}-root-Preset_craftroom
 Suggests:      %{name}-root-Preset_img_headless
 Suggests:      %{name}-root-Preset_img_headed
+Suggests:      %{name}-root-Preset_partition
 %description   category-Preset
 This meta pacakge lists all Tizen blocks (meta packages) designating
 Tizen platform presets, HAL/device-support presets, and
@@ -316,6 +318,7 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE3501}}
 %{include_if_mainbuild %{SOURCE3502}}
 %{include_if_mainbuild %{SOURCE3503}}
+%{include_if_mainbuild %{SOURCE3504}}
 
 %{include_if_mainbuild %{SOURCE3800}}
 %{include_if_mainbuild %{SOURCE3801}}

diff --git a/packaging/platform-preset-boards.inc b/packaging/platform-preset-boards.inc
index dac8f01d1cf65813f4f531f904cd5228795a163e..dbe639e27b7ed0cd99e8239aa09e4e186171719e 100644 (file)
--- a/packaging/platform-preset-boards.inc
+++ b/packaging/platform-preset-boards.inc
@@ -10,6 +10,6 @@ Suggests:     %{name}-sub1-Preset_boards-RPI3
 Suggests:      %{name}-sub1-Preset_boards-TM1
 %endif
 %description root-Preset_boards
-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.
+__EXPAND__: preset
+Select BSP which you want.
 %files root-Preset_boards

diff --git a/packaging/platform-preset-iot-craftroom.inc b/packaging/platform-preset-iot-craftroom.inc
index 5f208820c8c3363c3d25119ee2d66369b7ee6912..4c96559d202fccae981e9d753d31a9c12efc4364 100644 (file)
--- a/packaging/platform-preset-iot-craftroom.inc
+++ b/packaging/platform-preset-iot-craftroom.inc
@@ -11,7 +11,6 @@ Suggests:   %{name}-sub1-Preset_craftroom-iot_headless_artik530
 Suggests:   %{name}-sub1-Preset_craftroom-iot_headed_artik530
 
 %description root-Preset_craftroom
-__EXPAND__: preset
 The Presets for Craftroom.
 %files root-Preset_craftroom
 
@@ -22,12 +21,12 @@ The Presets for Craftroom.
 %package sub1-Preset_craftroom-iot_headless_artik530
 Summary:    IOT Headless ARTIK530 Presets for Craftrom
 %list_with_require %{_datadir}/image-configurations/iot-headless-2parts-armv7l-artik530_710.ks
+Requires: %{name}-sub1-Preset_partition-2parts_ramdisk
 
 Conflicts:     %{name}-sub1-Preset_craftroom-iot_headless_rpi3
 Conflicts:     %{name}-sub1-Preset_craftroom-iot_headed_artik530
 
 %description sub1-Preset_craftroom-iot_headless_artik530
-__EXPAND__: preset
 The packages of Tizen IoT Headless for ARTIK530.
 %files sub1-Preset_craftroom-iot_headless_artik530
 
@@ -37,12 +36,12 @@ The packages of Tizen IoT Headless for ARTIK530.
 %package sub1-Preset_craftroom-iot_headed_artik530
 Summary:    IOT Headed ARTIK530 Presets for Craftrom
 %list_with_require %{_datadir}/image-configurations/iot-headed-3parts-armv7l-artik530_710.ks   
+Requires: %{name}-sub1-Preset_partition-3parts_ramdisk
 
 Conflicts:     %{name}-sub1-Preset_craftroom-iot_headless_rpi3
 Conflicts:     %{name}-sub1-Preset_craftroom-iot_headless_artik530
 
 %description sub1-Preset_craftroom-iot_headed_artik530
-__EXPAND__: preset
 The packages of Tizen IoT Headed for ARTIK530.
 %files sub1-Preset_craftroom-iot_headed_artik530
 
@@ -52,12 +51,12 @@ The packages of Tizen IoT Headed for ARTIK530.
 %package sub1-Preset_craftroom-iot_headless_rpi3
 Summary:    IOT Headless RPI3 Presets for Craftrom
 %list_with_require %{_datadir}/image-configurations/iot-headless-2parts-armv7l-rpi3.ks
+Requires: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
 
 Conflicts:     %{name}-sub1-Preset_craftroom-iot_headless_artik530
 Conflicts:     %{name}-sub1-Preset_craftroom-iot_headed_artik530
 
 %description sub1-Preset_craftroom-iot_headless_rpi3
-__EXPAND__: preset
 The packages of Tizen IoT Headless for RPI3.
 %files sub1-Preset_craftroom-iot_headless_rpi3
 

diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index 2915ee58acbc75c89c574825e22354ab2067971f..a4e5ef3f906aca5301c5391c34b2509d93bfda9d 100644 (file)
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -9,6 +9,7 @@ Summary:    IOT Headed Images
 Suggests:   %{name}-sub1-Preset_img_headed-artik530
 
 %description root-Preset_img_headed
+__EXPAND__: preset
 The IoT Headed Images.
 %files root-Preset_img_headed
 
@@ -37,6 +38,11 @@ Requires:   %{name}-sub2-Preset_boards-ARTIK530-Wifi
 Requires:   gst-omx
 Requires:   libomxil-e54xx
 
+Requires: %{name}-sub1-Preset_partition-3parts_ramdisk
+
+Conflicts:  %{name}-sub1-Preset_img_headless-artik530
+Conflicts:  %{name}-sub1-Preset_img_headless-rpi3
+
 %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
index af7e4e63dec5732da68ff3d5bb10318e2bf73d22..9d59478dc349d1ccadb40954a81adda633e7a0cb 100644 (file)
--- a/packaging/platform-preset-iot-headless-images.inc
+++ b/packaging/platform-preset-iot-headless-images.inc
@@ -10,6 +10,7 @@ Suggests:     %{name}-sub1-Preset_img_headless-rpi3
 Suggests:   %{name}-sub1-Preset_img_headless-artik530
 
 %description root-Preset_img_headless
+__EXPAND__: preset
 The IoT Headless Images.
 %files root-Preset_img_headless
 
@@ -22,6 +23,9 @@ Summary:    IOT Headless ARTIK530 Image
 Requires:   %{name}-root-Preset_iot_core
 Requires:   %{name}-sub1-Preset_boards-ARTIK530
 
+Requires: %{name}-sub1-Preset_partition-2parts_ramdisk
+
+Conflicts:     %{name}-sub1-Preset_img_headed-artik530
 Conflicts:     %{name}-sub1-Preset_img_headless-rpi3
 
 %description sub1-Preset_img_headless-artik530
@@ -36,6 +40,9 @@ Summary:    IOT Headless RPI3 Image
 Requires:   %{name}-root-Preset_iot_core
 Requires:   %{name}-sub1-Preset_boards-RPI3
 
+Requires: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+
+Conflicts:     %{name}-sub1-Preset_img_headed-artik530
 Conflicts:     %{name}-sub1-Preset_img_headless-artik530
 
 %description sub1-Preset_img_headless-rpi3

diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index a5b682415ee58f72aa095a3bfa58d7b2bdf661f8..c6a8b779c5c50199968e8491f0c62e7b0acff483 100644 (file)
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -55,7 +55,6 @@ Requires: vconf-internal-keys
 Requires: wpa_supplicant
 
 %description root-Preset_iot_core
-__EXPAND__: preset
 The packages of Tizen IoT Core.
 %files root-Preset_iot_core
 
@@ -127,6 +126,5 @@ Requires: ug-bluetooth-efl
 Requires: wifi-efl-ug
 
 %description root-Preset_iot_headed
-__EXPAND__: preset
 The packages of Tizen IoT Headed Common.
 %files root-Preset_iot_headed

diff --git a/packaging/platform-preset-partitions.inc b/packaging/platform-preset-partitions.inc
new file mode 100644 (file)
index 0000000..e21c9ca
--- /dev/null
+++ b/packaging/platform-preset-partitions.inc
@@ -0,0 +1,80 @@
+# Maintainer: Tizen IoT PM
+# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
+
+############################
+### Preset for Partition ###
+############################
+%package root-Preset_partition
+Summary:    Partition Presets
+Suggests:      %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Suggests:      %{name}-sub1-Preset_partition-2parts_ramdisk
+Suggests:      %{name}-sub1-Preset_partition-3parts_ramdisk
+Suggests:      %{name}-sub1-Preset_partition-3parts
+
+%description root-Preset_partition
+__EXPAND__: preset
+The Supported Partions.
+%files root-Preset_partition
+
+
+#########################################
+### 2 Parts with ramdisk and recovery ###
+#########################################
+%package sub1-Preset_partition-2parts_ramdisk_recovery
+Summary:    Partition 2 with ramdisk and recovery
+
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
+Conflicts: %{name}-sub1-Preset_partition-3parts
+
+%description sub1-Preset_partition-2parts_ramdisk_recovery
+__PARTITION__: common-mbr-2parts-rpi3-ramdisk-recovery
+part '\' , '\opt', '\mnt\initrd', '\mnt\initrd-recovery'
+%files sub1-Preset_partition-2parts_ramdisk_recovery
+
+
+############################
+### 2 Parts with ramdisk ###
+############################
+%package sub1-Preset_partition-2parts_ramdisk
+Summary:    Partition 2 with ramdisk
+
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
+Conflicts: %{name}-sub1-Preset_partition-3parts
+
+%description sub1-Preset_partition-2parts_ramdisk
+__PARTITION__: common-mbr-2parts-artik530_710-ramdisk
+part "\" , "\opt", "\mnt\initrd"
+%files sub1-Preset_partition-2parts_ramdisk
+
+############################
+### 3 Parts with ramdisk ###
+############################
+%package sub1-Preset_partition-3parts_ramdisk
+Summary:    Partition 3 with ramdisk
+
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
+Conflicts: %{name}-sub1-Preset_partition-3parts
+
+%description sub1-Preset_partition-3parts_ramdisk
+__PARTITION__: common-3parts-ramdisk
+part "\" , "\opt", "\opt\usr", "\mnt\initrd"
+%files sub1-Preset_partition-3parts_ramdisk
+
+###############
+### 3 Parts ###
+###############
+%package sub1-Preset_partition-3parts
+Summary:    Partition 3
+
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
+
+%description sub1-Preset_partition-3parts
+__PARTITION__: common-mbr-3parts 
+part "\" , "\opt", "\opt\usr"
+%files sub1-Preset_partition-3parts
+