Add step into each request type

Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/rpk/rpk_installer.cc b/src/rpk/rpk_installer.cc
index 478593f..5b2e2ba 100644 (file)
--- a/src/rpk/rpk_installer.cc
+++ b/src/rpk/rpk_installer.cc
@@ -4,6 +4,7 @@
 #include <common/installer/app_installer.h>
 
 #include "rpk/step/configuration/step_parse_rpk_manifest.h"
+#include "rpk/step/pkgmgr/step_rpk_manifest_adjustment.h"
 #include "rpk/step/pkgmgr/step_kill_rscapps.h"
 
 namespace ci = common_installer;
@@ -43,6 +44,7 @@ void RpkInstaller::InstallSteps() {
   ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
       rpk::configuration::StepParseRpkManifest::ManifestLocation::PACKAGE,
       rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
+  AddStepAfter<rpk::pkgmgr::StepRpkManifestAdjustment>("Copy");
 
   // TODO(jungh.yeon) : these steps are temporary removed
   RemoveStep("Signature");
@@ -65,6 +67,7 @@ void RpkInstaller::InstallSteps() {
   AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepRollbackInstallationSecurity>();
   AddStep<ci::filesystem::StepCopy>();
+  AddStep<rpk::pkgmgr::StepRpkManifestAdjustment>();
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRegisterApplication>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -95,6 +98,8 @@ void RpkInstaller::UpdateSteps() {
   ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
     rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
     rpk::configuration::StepParseRpkManifest::StoreLocation::BACKUP);
+
+  AddStepAfter<rpk::pkgmgr::StepRpkManifestAdjustment>("CopyBackup");
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
@@ -115,6 +120,7 @@ void RpkInstaller::UpdateSteps() {
   AddStep<ci::configuration::StepBlockCrossUpdate>();
   AddStep<ci::backup::StepBackupManifest>();
   AddStep<ci::backup::StepCopyBackup>();
+  AddStep<rpk::pkgmgr::StepRpkManifestAdjustment>();
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepUpdateApplication>();
   AddStep<ci::filesystem::StepUpdateStorageDirectories>();
@@ -204,6 +210,8 @@ void RpkInstaller::ManifestDirectInstallSteps() {
     rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
     rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
 
+  AddStepAfter<rpk::pkgmgr::StepRpkManifestAdjustment>("Signature");
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
@@ -214,6 +222,7 @@ void RpkInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::security::StepSignature>(true);
+  AddStep<rpk::pkgmgr::StepRpkManifestAdjustment>();
   AddStep<ci::security::StepRollbackInstallationSecurity>();
   AddStep<ci::pkgmgr::StepRegisterApplication>();
   AddStep<ci::security::StepRegisterSecurity>();
@@ -236,6 +245,7 @@ void RpkInstaller::ManifestDirectUpdateSteps() {
     rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
     rpk::configuration::StepParseRpkManifest::StoreLocation::NORMAL);
 
+  AddStepAfter<rpk::pkgmgr::StepRpkManifestAdjustment>("Signature");
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
@@ -246,6 +256,7 @@ void RpkInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::security::StepSignature>(true);
+  AddStep<rpk::pkgmgr::StepRpkManifestAdjustment>();
   AddStep<ci::security::StepCheckOldCertificate>();
   AddStep<ci::pkgmgr::StepUpdateApplication>();
   AddStep<ci::security::StepRegisterSecurity>();
@@ -359,6 +370,8 @@ void RpkInstaller::ReadonlyUpdateInstallSteps() {
     rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
     rpk::configuration::StepParseRpkManifest::StoreLocation::BACKUP);
 
+  AddStepAfter<rpk::pkgmgr::StepRpkManifestAdjustment>("Signature");
+
 /*
   Current step order :
   AddStep<ci::configuration::StepConfigure>(pkgmgr_);
@@ -376,6 +389,7 @@ void RpkInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
   AddStep<ci::security::StepSignature>(true);
+  AddStep<rpk::pkgmgr::StepRpkManifestAdjustment>();
   AddStep<ci::security::StepCheckOldCertificate>();
   AddStep<ci::configuration::StepBlockCrossUpdate>();
   AddStep<ci::filesystem::StepCopy>();