diff options
| author | Lei YU <mine260309@gmail.com> | 2019-03-05 11:15:46 +0800 |
|---|---|---|
| committer | Lei YU <mine260309@gmail.com> | 2019-03-08 14:25:37 +0800 |
| commit | c67a9457c19cfdbb92b94d1d77767cdb0cfee204 (patch) | |
| tree | 6762a404bb6a67ac5cbeb7e7f52eef1ab59be9dc | |
| parent | 9b21efc5b44cd8956325f7856a6ef417aa1d7703 (diff) | |
| download | openpower-pnor-code-mgmt-c67a9457c19cfdbb92b94d1d77767cdb0cfee204.tar.gz openpower-pnor-code-mgmt-c67a9457c19cfdbb92b94d1d77767cdb0cfee204.zip | |
Refactor: Move serialize to ubi
Functions in serialize are specific to UBI, move it to ubi dir.
Tested: On the last commit of the patch series, run code update and
factory reset on Witherspoon and all work fine.
Change-Id: I9176e638d9f3bfe0d424b57f8da4667a751cb5bd
Signed-off-by: Lei YU <mine260309@gmail.com>
| -rwxr-xr-x | Makefile.am | 1 | ||||
| -rw-r--r-- | activation.cpp | 1 | ||||
| -rwxr-xr-x | test/Makefile.am | 2 | ||||
| -rw-r--r-- | ubi/Makefile.am.include | 1 | ||||
| -rw-r--r-- | ubi/serialize.cpp (renamed from serialize.cpp) | 0 | ||||
| -rw-r--r-- | ubi/serialize.hpp (renamed from serialize.hpp) | 0 |
6 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 716e4537d..63601deb6 100755 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,6 @@ sbin_PROGRAMS = \ openpower_update_manager_SOURCES = \ activation.cpp \ version.cpp \ - serialize.cpp \ item_updater.cpp \ item_updater_main.cpp diff --git a/activation.cpp b/activation.cpp index 166057289..ce8cd077b 100644 --- a/activation.cpp +++ b/activation.cpp @@ -3,7 +3,6 @@ #include "activation.hpp" #include "item_updater.hpp" -#include "serialize.hpp" #include <experimental/filesystem> #include <phosphor-logging/log.hpp> diff --git a/test/Makefile.am b/test/Makefile.am index c4165ecbc..1a94d0df4 100755 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -33,7 +33,7 @@ utest_SOURCES = \ utest_LDADD = \ $(top_builddir)/openpower_update_manager-activation.o \ $(top_builddir)/openpower_update_manager-version.o \ - $(top_builddir)/openpower_update_manager-serialize.o \ + $(top_builddir)/ubi/openpower_update_manager-serialize.o \ $(top_builddir)/ubi/openpower_update_manager-watch.o \ $(top_builddir)/openpower_update_manager-item_updater.o \ $(top_builddir)/org/openbmc/Associations/openpower_update_manager-server.o \ diff --git a/ubi/Makefile.am.include b/ubi/Makefile.am.include index c75293d83..decf1e9c6 100644 --- a/ubi/Makefile.am.include +++ b/ubi/Makefile.am.include @@ -1,4 +1,5 @@ openpower_update_manager_SOURCES += \ %reldir%/activation_ubi.cpp \ %reldir%/item_updater_ubi.cpp \ + %reldir%/serialize.cpp \ %reldir%/watch.cpp diff --git a/serialize.cpp b/ubi/serialize.cpp index 7250a0050..7250a0050 100644 --- a/serialize.cpp +++ b/ubi/serialize.cpp diff --git a/serialize.hpp b/ubi/serialize.hpp index e8860f32c..e8860f32c 100644 --- a/serialize.hpp +++ b/ubi/serialize.hpp |
