Adding a partition - 3parts-ramdisk-recovery. 20/161720/1 submit/tizen_4.0/20171127.092849
authorwchang kim <wchang.kim@samsung.com>
Mon, 27 Nov 2017 06:36:20 +0000 (15:36 +0900)
committerwchang kim <wchang.kim@samsung.com>
Mon, 27 Nov 2017 06:36:20 +0000 (15:36 +0900)
Change-Id: I149631bafe7b69eccd871747e9dcd8329ad8aa54

packaging/platform-preset-iot-craftroom.inc
packaging/platform-preset-iot-headed-images.inc
packaging/platform-preset-partitions.inc

index 4c96559d202fccae981e9d753d31a9c12efc4364..fc36edef5a97af1bda239efeace19bebfec7bb8c 100644 (file)
@@ -35,8 +35,8 @@ 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
+%list_with_require %{_datadir}/image-configurations/iot-headed-3parts-armv7l-artik530_710.ks
+Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 
 Conflicts:     %{name}-sub1-Preset_craftroom-iot_headless_rpi3
 Conflicts:     %{name}-sub1-Preset_craftroom-iot_headless_artik530
index 925084cc082e50c361fb1f5b30ce9b04ad4d8b9f..f0d0141400cf2a89b394ccd62ccf76e1c410eead 100644 (file)
@@ -53,7 +53,7 @@ Requires:     %{name}-sub2-Preset_boards-ARTIK530-System
 Requires:      %{name}-sub2-Preset_boards-ARTIK530-System_Device
 Requires:      %{name}-sub2-Preset_boards-ARTIK530-WifiDirect
 ## Partition
-Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk
+Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 ## Feature
 Requires:      %{name}-sub1-domain_Feature-BootAni
 Requires:      %{name}-sub1-domain_Feature-DotNET
@@ -120,7 +120,7 @@ Requires:   %{name}-sub2-Preset_boards-RPI3-System
 Requires:      %{name}-sub2-Preset_boards-RPI3-System_Device
 Requires:      %{name}-sub2-Preset_boards-RPI3-WifiDirect
 ## Partition
-Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk
+Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 ## Feature
 Requires:      %{name}-sub1-domain_Feature-BootAni
 Requires:      %{name}-sub1-domain_Feature-DotNET
index dec37089492ce6bf1b616c404b2251543b7921cf..653d2e59d4273854d6ce560d3675fc3813222070 100644 (file)
@@ -7,6 +7,7 @@
 %package root-Preset_partition
 Summary:    Partition Presets
 Suggests:      %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Suggests:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 Suggests:      %{name}-sub1-Preset_partition-2parts_ramdisk
 Suggests:      %{name}-sub1-Preset_partition-3parts_ramdisk
 Suggests:      %{name}-sub1-Preset_partition-3parts
@@ -26,12 +27,29 @@ 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
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 
 %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
 
+#########################################
+### 3 Parts with ramdisk and recovery ###
+#########################################
+%package sub1-Preset_partition-3parts_ramdisk_recovery
+Summary:    Partition 3 with ramdisk and recovery
+Requires:      system-plugin-u3
+
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_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-3parts_ramdisk_recovery
+__PARTITION__: common-3parts-ramdisk-recovery
+part '\' , '\opt', '\opt\usr', '\mnt\initrd', '\mnt\initrd-recovery'
+%files sub1-Preset_partition-3parts_ramdisk_recovery
 
 ############################
 ### 2 Parts with ramdisk ###
@@ -40,6 +58,7 @@ part '\' , '\opt', '\mnt\initrd', '\mnt\initrd-recovery'
 Summary:    Partition 2 with ramdisk
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
 Conflicts: %{name}-sub1-Preset_partition-3parts
 
@@ -56,6 +75,7 @@ Summary:    Partition 3 with ramdisk
 Requires:      system-plugin-u3
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
 Conflicts: %{name}-sub1-Preset_partition-3parts
 
@@ -73,6 +93,7 @@ Requires:     system-plugin-u3
 Requires:      system-plugin-init_wrapper
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk