Revert "[TRE-1357] Add initrd-recovery to RPI3"

This reverts commit 1f1597b9fb7922a2040a7141bdd47b85235942d1.

Change-Id: I3d9b9723f620ec5c38dfb3a4fe97ca0c84f80212
Signed-off-by: Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>

diff --git a/common.yaml b/common.yaml
index 6cd6883..ab40acb 100644 (file)
--- a/common.yaml
+++ b/common.yaml
@@ -206,7 +206,7 @@ Wayland:
         - buildname
 
 RPi3:
-    Part: common-3parts-ramdisk-recovery
+    Part: common-mbr-3parts
     UserGroups: "audio,video"
     Groups:
         - Generic Adaptation

diff --git a/partitions/common-3parts-ramdisk-recovery b/partitions/common-3parts-ramdisk-recovery
deleted file mode 100644 (file)
index 3c77d00..0000000
--- a/partitions/common-3parts-ramdisk-recovery
+++ /dev/null
@@ -1,5 +0,0 @@
-part / --fstype="ext4" --size=3500 --ondisk=mmcblk0 --label rootfs --fsoptions=defaults,noatime
-part /opt --fstype="ext4" --size=512 --ondisk=mmcblk0 --label system-data --fsoptions=defaults,noatime
-part /opt/usr --fstype="ext4" --size=3500 --ondisk=mmcblk0 --label user --fsoptions=defaults,noatime
-part /mnt/initrd --size=7 --ondisk mmcblk0p --fstype=ext4 --label=ramdisk --extoptions="-b 1024"
-part /mnt/initrd-recovery --size=12 --ondisk mmcblk0p --fstype=ext4 --label=ramdisk-recovery --extoptions="-b 1024"

diff --git a/patterns/common-adaptation-rpi3.yaml b/patterns/common-adaptation-rpi3.yaml
index ccf3ab5..18caf27 100644 (file)
--- a/patterns/common-adaptation-rpi3.yaml
+++ b/patterns/common-adaptation-rpi3.yaml
@@ -60,7 +60,3 @@ Packages:
 - csapi-convergence
 #From TRE-1371
 - csapi-network-nsd
-#From TRE-1357
-- initrd-recovery
-- system-recovery
-- system-recovery-non_gui