From b7594f2a07e7055bd11f48be97867b4410d5548b Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Wed, 19 Jul 2023 13:58:42 +0900
Subject: [PATCH] Run parser plugin for rpk package

Change-Id: Id98d529eadc322b8f31c035b858f66b0e69b17bf
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 src/rpk/rpk_installer.cc                            | 11 -----------
 src/rpk/step/pkgmgr/step_rpk_manifest_adjustment.cc |  2 ++
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/rpk/rpk_installer.cc b/src/rpk/rpk_installer.cc
index d3d2f4c..838000d 100644
--- a/src/rpk/rpk_installer.cc
+++ b/src/rpk/rpk_installer.cc
@@ -38,7 +38,6 @@ void RpkInstaller::InstallSteps() {
   RemoveStep("CreateResControlDirectories");
   RemoveStep("RegisterTrustAnchor");
   RemoveStep("PrivacyPrivilege");
-  RemoveStep("RunParserPlugin");
   RemoveStep("CreateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
@@ -85,7 +84,6 @@ void RpkInstaller::UpdateSteps() {
   RemoveStep("CreateResControlDirectories");
   RemoveStep("RegisterTrustAnchor");
   RemoveStep("PrivacyPrivilege");
-  RemoveStep("RunParserPlugin");
   RemoveStep("UpdateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
@@ -131,7 +129,6 @@ void RpkInstaller::UninstallSteps() {
   AppInstaller::UninstallSteps();
 
   RemoveStep("KillApps");
-  RemoveStep("RunParserPlugin");
   RemoveStep("RemoveGlobalAppSymlinks");
   RemoveStep("OptionalAcquireExternalStorage");
   RemoveStep("RemovePerUserStorageDirectories");
@@ -168,7 +165,6 @@ void RpkInstaller::RecoverySteps() {
   AppInstaller::RecoverySteps();
 
   RemoveStep("RecoverIcons");
-  RemoveStep("RecoverParserPlugin");
   RemoveStep("RecoverExternalStorage");
   RemoveStep("RecoverGlobalAppSymlinks");
   RemoveStep("MountRecover");
@@ -202,7 +198,6 @@ void RpkInstaller::ManifestDirectInstallSteps() {
   RemoveStep("CreateResControlDirectories");
   RemoveStep("RegisterTrustAnchor");
   RemoveStep("PrivacyPrivilege");
-  RemoveStep("RunParserPlugin");
   RemoveStep("CreateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
@@ -240,7 +235,6 @@ void RpkInstaller::ManifestDirectUpdateSteps() {
   RemoveStep("CreateResControlDirectories");
   RemoveStep("RegisterTrustAnchor");
   RemoveStep("PrivacyPrivilege");
-  RemoveStep("RunParserPlugin");
   RemoveStep("UpdateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
@@ -276,7 +270,6 @@ void RpkInstaller::ManifestPartialInstallSteps() {
   RemoveStep("RemoveGlobalAppSymlinks");
   RemoveStep("RegisterTrustAnchor");
   RemoveStep("PrivacyPrivilege");
-  RemoveStep("RunParserPlugin");
   RemoveStep("CreateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
@@ -305,7 +298,6 @@ void RpkInstaller::ManifestPartialUpdateSteps() {
   RemoveStep("KillApps");
   RemoveStep("RegisterTrustAnchor");
   RemoveStep("PrivacyPrivilege");
-  RemoveStep("RunParserPlugin");
   RemoveStep("UpdateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
@@ -336,7 +328,6 @@ void RpkInstaller::PartialUninstallSteps() {
   RemoveStep("RemovePerUserStorageDirectories");
   RemoveStep("UnregisterTrustAnchor");
   RemoveStep("PrivacyPrivilege");
-  RemoveStep("RunParserPlugin");
 
   ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
     rpk::configuration::StepParseRpkManifest::ManifestLocation::INSTALLED,
@@ -366,7 +357,6 @@ void RpkInstaller::ReadonlyUpdateInstallSteps() {
   RemoveStep("CreateResControlDirectories");
   RemoveStep("RegisterTrustAnchor");
   RemoveStep("PrivacyPrivilege");
-  RemoveStep("RunParserPlugin");
   RemoveStep("UpdateStorageDirectories");
   RemoveStep("CreateGlobalAppSymlinks");
 
@@ -420,7 +410,6 @@ void RpkInstaller::ReadonlyUpdateUninstallSteps() {
   RemoveStep("RemoveIcons");
   RemoveStep("RemoveTep");
   RemoveStep("RemoveUserData");
-  RemoveStep("RunParserPlugin");
   RemoveStep("UpdateStorageDirectories");
 
   ReplaceStep<rpk::configuration::StepParseRpkManifest>("ParseManifest",
diff --git a/src/rpk/step/pkgmgr/step_rpk_manifest_adjustment.cc b/src/rpk/step/pkgmgr/step_rpk_manifest_adjustment.cc
index 6792e1f..b783ca9 100644
--- a/src/rpk/step/pkgmgr/step_rpk_manifest_adjustment.cc
+++ b/src/rpk/step/pkgmgr/step_rpk_manifest_adjustment.cc
@@ -103,6 +103,8 @@ common_installer::Step::Status StepRpkManifestAdjustment::process() {
     return Step::Status::ERROR;
   }
 
+  context_->xml_path.set(new_path_.string());
+
   return Step::Status::OK;
 }
 
-- 
2.7.4