Cherry pick upgrade, recovery patches from tizen_4.0

- Add domain-features-recovery
- domain-features-upgrade: Add suggest packages

Change-Id: If2cb1c52f2968e21c9b32329071e969273653208
Signed-off-by: Sunmin Lee <sunm.lee@samsung.com>

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index d1a4a63deef4771b7321ec0dac799e2e0339cef9..529e5da797d82c2560478a6b3bee7fccf7deb3fd 100644 (file)
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -40,6 +40,7 @@ Source1304: domain-features-bootanimation.inc
 Source1305: domain-features-starter.inc
 Source1306: domain-features-upgrade.inc
 Source1307: domain-features-tool_and_locale.inc
+Source1308: domain-features-recovery.inc
 
 Source2010:    epicfeature-development.inc
 Source2020:    epicfeature-application.inc
@@ -315,6 +316,7 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE1305}}
 %{include_if_mainbuild %{SOURCE1306}}
 %{include_if_mainbuild %{SOURCE1307}}
+%{include_if_mainbuild %{SOURCE1308}}
 
 ############## EPIC FEATURES ######################
 

diff --git a/packaging/domain-features-recovery.inc b/packaging/domain-features-recovery.inc
new file mode 100644 (file)
index 0000000..3046e25
--- /dev/null
+++ b/packaging/domain-features-recovery.inc
@@ -0,0 +1,17 @@
+# Maintainer: TBD: This is temporary block for TDC Demo. You may proceed with this later anyway.
+# You need ACK (+1) from the maintainer to be reviewed by building-blocks maintainers.
+
+####################
+## Tizen Recovery ##
+####################
+%package sub1-domain_Feature-Recovery
+Summary:       Tizen Recovery Feature
+Requires: system-recovery
+Requires: initrd-recovery
+Requires: factory-reset
+Requires: system-recovery-non_gui
+%description sub1-domain_Feature-Recovery
+Tizen block (set of packages) for supporting to platform recovery.
+* system-recovery does not support gui yet.
+It includes factory-reset as a default recovery.
+%files sub1-domain_Feature-Recovery

diff --git a/packaging/domain-features-upgrade.inc b/packaging/domain-features-upgrade.inc
index fee26c7a9c95a80b6ccf8b081c9bddd8677abf97..3be6c3e3571673e93dcfe77027a095de7fa7b52b 100644 (file)
--- a/packaging/domain-features-upgrade.inc
+++ b/packaging/domain-features-upgrade.inc
@@ -11,7 +11,11 @@ Requires: initrd-fota
 Requires: initrd-recovery
 Requires: tota-ua
 Requires: factory-reset
+Suggests: building-blocks-sub1-Preset_partition-2parts_ramdisk_recovery
+Suggests: building-blocks-sub1-Preset_partition-3parts_ramdisk_recovery
+Suggests: reboot-param-helper
 %description sub1-domain_Feature-Upgrade
 Tizen block (set of packages) for supporting to upgrade new tizen image.
-If you select this feature, you should select a partition including the recovery part such as building-blocks-sub1-Preset_partition-2parts_ramdisk_recovery.
+If you select this feature, you should select one of partition preset including the recovery part such as building-blocks-sub1-Preset_partition-2parts_ramdisk_recovery.
+In case of RPi3, reboot-param-helper is also required for reboot parameter.
 %files sub1-domain_Feature-Upgrade

diff --git a/packaging/domain-features.inc b/packaging/domain-features.inc
index d8f67e0e92964b73d3f223394717146942d6da32..e69cd36ee30a3fef3e310e47e9b07d84fee799a3 100644 (file)
--- a/packaging/domain-features.inc
+++ b/packaging/domain-features.inc
@@ -9,6 +9,7 @@ Suggests:       %{name}-sub1-domain_Feature-WebAPI
 Suggests:      %{name}-sub1-domain_Feature-BootAni
 Suggests:      %{name}-sub1-domain_Feature-Starter
 Suggests:      %{name}-sub1-domain_Feature-Upgrade
+Suggests:      %{name}-sub1-domain_Feature-Recovery
 Suggests:      %{name}-sub1-domain_Feature-Tool_And_Locale
 %description root-domain_Feature
 __EXPAND__: domains

diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index 5e40e96aa240dd7ac905a9dfe1a429d2ad3b32c8..17c92d4b5c4a6b6561a46070d67b0e3faaa3e8e5 100644 (file)
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -127,6 +127,7 @@ Requires:   dali-csharp-binder
 Requires:      %{name}-sub1-domain_Feature-SoftAP
 Requires:      %{name}-sub1-domain_Feature-Starter
 Requires:      %{name}-sub1-domain_Feature-Upgrade
+Requires:      %{name}-sub1-domain_Feature-Recovery
 Requires:      %{name}-sub1-domain_Feature-WebAPI
 ## building-blocks-sub1-domain_Feature-Tool_And_Locale
 Requires:      crash-worker