update preset partitions

Change-Id: I695cdfd01f0e5a620ebf11eb71045e9cc7a8a0bf

diff --git a/packaging/platform-preset-partitions.inc b/packaging/platform-preset-partitions.inc
index 09d258bab45d935be5c1c38d3ceb72af15f8ce2b..605e95dceed85382dcc5af02967e4d55e8030172 100644 (file)
--- a/packaging/platform-preset-partitions.inc
+++ b/packaging/platform-preset-partitions.inc
@@ -7,10 +7,12 @@
 %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-2parts_ramdisk_recovery_artik
+Suggests:      %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
 Suggests:      %{name}-sub1-Preset_partition-3parts_ramdisk
-Suggests:      %{name}-sub1-Preset_partition-3parts
+Suggests:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
+Suggests:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_artik
+Suggests:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
 
 %description root-Preset_partition
 __EXPAND__: preset
@@ -25,16 +27,52 @@ The Supported Partions.
 Summary:    Partition 2 with ramdisk and recovery
 Requires:      system-plugin-config-2parts
 
-Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
-Conflicts: %{name}-sub1-Preset_partition-3parts
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
 
 %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
 
+
+%package sub1-Preset_partition-2parts_ramdisk_recovery_artik
+Summary:    Partition 2 with ramdisk and recovery for the artik device
+Requires:      system-plugin-config-2parts
+
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
+
+%description sub1-Preset_partition-2parts_ramdisk_recovery_artik
+__PARTITION__: common-mbr-2parts-artik530_710-ramdisk-recovery
+part '\' , '\opt', '\mnt\initrd', '\mnt\initrd-recovery'
+%files sub1-Preset_partition-2parts_ramdisk_recovery_artik
+
+
+%package sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
+Summary:    Partition 2 with ramdisk and recovery which uses the btrfs file system
+Requires:      system-plugin-config-2parts
+
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
+
+%description sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
+__PARTITION__: btrfs-rootfs-2parts-ramdisk-recovery
+part '\' , '\opt', '\mnt\initrd', '\mnt\initrd-recovery'
+%files sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
+
 #########################################
 ### 3 Parts with ramdisk and recovery ###
 #########################################
@@ -43,31 +81,47 @@ Summary:    Partition 3 with ramdisk and recovery
 Requires:      system-plugin-config-3parts
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
-Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
-Conflicts: %{name}-sub1-Preset_partition-3parts
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
 
 %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 ###
-############################
-%package sub1-Preset_partition-2parts_ramdisk
-Summary:    Partition 2 with ramdisk
-Requires:      system-plugin-config-2parts
+
+%package sub1-Preset_partition-3parts_ramdisk_recovery_artik
+Summary:    Partition 3 with ramdisk and recovery for the artik device
+Requires:      system-plugin-config-3parts
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
+
+%description sub1-Preset_partition-3parts_ramdisk_recovery_artik
+part '\' , '\opt', '\opt\usr', '\mnt\initrd', '\mnt\initrd-recovery'
+%files sub1-Preset_partition-3parts_ramdisk_recovery_artik
+
+%package sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
+Summary:    Partition 3 with ramdisk and recovery which uses the btrfs file system
+Requires:      system-plugin-config-3parts
+
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk
-Conflicts: %{name}-sub1-Preset_partition-3parts
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_artik
 
-%description sub1-Preset_partition-2parts_ramdisk
-__PARTITION__: common-mbr-2parts-artik530_710-ramdisk
-part "\" , "\opt", "\mnt\initrd"
-%files sub1-Preset_partition-2parts_ramdisk
+%description sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
+part '\' , '\opt', '\opt\usr', '\mnt\initrd', '\mnt\initrd-recovery'
+%files sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
 
 ############################
 ### 3 Parts with ramdisk ###
@@ -77,29 +131,13 @@ Summary:    Partition 3 with ramdisk
 Requires:      system-plugin-config-3parts
 
 Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
 Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
-Conflicts: %{name}-sub1-Preset_partition-2parts_ramdisk
-Conflicts: %{name}-sub1-Preset_partition-3parts
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_artik
+Conflicts: %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
 
 %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
-Requires:      system-plugin-config-3parts
-Requires:      system-plugin-feature-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
-
-%description sub1-Preset_partition-3parts
-__PARTITION__: common-mbr-3parts
-part "\" , "\opt", "\opt\usr"
-%files sub1-Preset_partition-3parts