apply partition changes to preset blocks

Change-Id: I28e8c4c8d6131b6fbcc476b00444aad09d5ccffd

diff --git a/packaging/domain-features-upgrade.inc b/packaging/domain-features-upgrade.inc
index cfee7888ab5b3cda566d86a53d479b0f9823336c..e4a206184c4a9d50705a3d3553c79b32b163b5ed 100644 (file)
--- a/packaging/domain-features-upgrade.inc
+++ b/packaging/domain-features-upgrade.inc
@@ -14,7 +14,11 @@ Requires: factory-reset
 Requires: factory-reset-userdata-backup
 Requires: building-blocks-sub2-domain_API-System-Update_Control
 Suggests: building-blocks-sub1-Preset_partition-2parts_ramdisk_recovery
+Suggests: building-blocks-sub1-Preset_partition-2parts_ramdisk_recovery_artik
+Suggests: building-blocks-sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
 Suggests: building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery
+Suggests: building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery_artik
+Suggests: building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
 Suggests: reboot-param-helper
 Suggests: firmware-update-ui-common
 %description sub1-domain_Feature-Upgrade

diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index 68af049830ad9fbe4cc05617ed0e0fece2ac7223..b82ee397cbecd166900a5b8c7215933dab3fba23 100644 (file)
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -63,7 +63,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_recovery
+Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_artik
 ## Feature
 Requires:      %{name}-sub1-domain_Feature-BootAni
 %if %{dotnet_feature} == "on"
@@ -211,7 +211,11 @@ Requires:  %{name}-sub2-Preset_boards-RPI3-System
 Requires:      %{name}-sub2-Preset_boards-RPI3-System_Device
 Requires:      %{name}-sub2-Preset_boards-RPI3-WifiDirect
 ## Partition
+%ifarch armv7l
 Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery
+%else
+Requires:      %{name}-sub1-Preset_partition-3parts_ramdisk_recovery_btrfs
+%endif
 ## Feature
 Requires:      %{name}-sub1-domain_Feature-BootAni
 %if %{dotnet_feature} == "on"
@@ -443,7 +447,8 @@ Requires:    org.tizen.system-signal-sender
 
 
 ## Partition
-# Requires:    building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery
+# Requires:    building-block-sub1-Preset_partition-3parts_ramdisk_recovery
+
 
 ## Feature
 Requires:      %{name}-sub1-domain_Feature-BootAni

diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc
index bbb6f7dc1e9056a4975d73ce70bb81d003580ec7..6875433114a182615b9af32f09a74f099b7bf2a1 100644 (file)
--- a/packaging/platform-preset-iot-headless-images.inc
+++ b/packaging/platform-preset-iot-headless-images.inc
@@ -32,7 +32,7 @@ Requires:     %{name}-sub2-Preset_boards-ARTIK530-Bluetooth
 Requires:      %{name}-sub2-Preset_boards-ARTIK530-BLE
 Requires:      %{name}-sub2-Preset_boards-ARTIK530-Display_Headless
 Requires:      %{name}-sub2-Preset_boards-ARTIK530-Wifi
-Requires:      %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Requires:      %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_artik
 #From TRE-2679
 Requires:      %{name}-sub2-domain_API-AppFramework-Alarm_API
 #From TRE-2680
@@ -97,7 +97,7 @@ Requires:     %{name}-sub2-Preset_boards-RPI3-Bluetooth
 Requires:      %{name}-sub2-Preset_boards-RPI3-BLE
 Requires:      %{name}-sub2-Preset_boards-RPI3-Display_Headless
 Requires:      %{name}-sub2-Preset_boards-RPI3-Wifi
-Requires:      %{name}-sub1-Preset_partition-2parts_ramdisk_recovery
+Requires:      %{name}-sub1-Preset_partition-2parts_ramdisk_recovery_btrfs
 #From TRE-2679
 Requires:      %{name}-sub2-domain_API-AppFramework-Alarm_API
 #From TRE-2680