summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwchang kim <wchang.kim@samsung.com>2017-11-27 15:36:20 +0900
committerwchang kim <wchang.kim@samsung.com>2017-11-27 15:37:21 +0900
commit1d37aa912fbf2192a5adc769442745b3faac8758 (patch)
treede5c935554c08ceff556d38978d350a592d0daf9
parent42a79f87186aecce9ecff72c5bcdf46b908cdd62 (diff)
downloadbuilding-blocks-1d37aa912fbf2192a5adc769442745b3faac8758.tar.gz
building-blocks-1d37aa912fbf2192a5adc769442745b3faac8758.tar.bz2
building-blocks-1d37aa912fbf2192a5adc769442745b3faac8758.zip
Adding a partition - 3parts-ramdisk-recovery.submit/tizen/20171127.092856
Change-Id: I149631bafe7b69eccd871747e9dcd8329ad8aa54
-rw-r--r--packaging/platform-preset-iot-craftroom.inc4
-rw-r--r--packaging/platform-preset-iot-headed-images.inc4
-rw-r--r--packaging/platform-preset-partitions.inc21
3 files changed, 25 insertions, 4 deletions
diff --git a/packaging/platform-preset-iot-craftroom.inc b/packaging/platform-preset-iot-craftroom.inc
index 4c96559..fc36ede 100644
--- a/packaging/platform-preset-iot-craftroom.inc
+++ b/packaging/platform-preset-iot-craftroom.inc
@@ -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
diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index a9fb451..abcf06c 100644
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -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
@@ -121,7 +121,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
diff --git a/packaging/platform-preset-partitions.inc b/packaging/platform-preset-partitions.inc
index dec3708..653d2e5 100644
--- a/packaging/platform-preset-partitions.inc
+++ b/packaging/platform-preset-partitions.inc
@@ -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