Allow building without memory module

- proc-stat uses the function of memory module, so build is failed
 when memory module is disabled

- memory.conf will be included only if memory module is enabled

Change-Id: I58b7e250f9fed3774d606dd7ba8fd12b57ef6b9b
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/packaging/resourced.spec b/packaging/resourced.spec
index fb3edfe..0885bda 100644 (file)
--- a/packaging/resourced.spec
+++ b/packaging/resourced.spec
@@ -217,7 +217,9 @@ mv %{_bindir}/resourced.common %{_bindir}/resourced
 %config %{_sysconfdir}/dbus-1/system.d/resourced.conf
 %{_unitdir}/resourced.service
 %{_unitdir}/multi-user.target.wants/resourced.service
-%config %{rd_config_path}/memory.conf
+%if %{?memory_module} == ON
+       %config %{rd_config_path}/memory.conf
+%endif
 %config %{rd_config_path}/proc.conf
 %if %{?cpu_module} == ON
        %config %{rd_config_path}/cpu.conf
@@ -260,7 +262,9 @@ mv %{_bindir}/resourced %{_bindir}/resourced.light
 %config %{_sysconfdir}/dbus-1/system.d/resourced.conf
 %{_unitdir}/resourced.service
 %{_unitdir}/multi-user.target.wants/resourced.service
-%config %{rd_config_path}/memory.conf
+%if %{?memory_module} == ON
+       %config %{rd_config_path}/memory.conf
+%endif
 %config %{rd_config_path}/proc.conf
 %if %{?cpu_module} == ON
        %config %{rd_config_path}/cpu.conf

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 09b59d1..11b9ad8 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -187,8 +187,10 @@ INSTALL(TARGETS ${RD_BINARY_NAME}
        DESTINATION ${MAKE_INSTALL_PREFIX}/usr/bin RENAME ${RD_BINARY_NAME}
   PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE WORLD_EXECUTE)
 
-INSTALL(FILES ${MEMORY_SOURCE_DIR}/memory.conf
-  DESTINATION /etc/resourced RENAME memory.conf)
+IF("${MEMORY_MODULE}" STREQUAL "ON")
+       INSTALL(FILES ${MEMORY_SOURCE_DIR}/memory.conf
+               DESTINATION /etc/resourced RENAME memory.conf)
+ENDIF()
 
 IF("${SWAP_MODULE}" STREQUAL "ON")
        INSTALL(FILES ${SWAP_SOURCE_DIR}/swap.conf DESTINATION ${RD_CONFIG_PATH})

diff --git a/src/proc-stat/proc-main.c b/src/proc-stat/proc-main.c
index 351ae92..1c1fb55 100644 (file)
--- a/src/proc-stat/proc-main.c
+++ b/src/proc-stat/proc-main.c
@@ -1225,7 +1225,9 @@ static int proc_restore_runtime_app_info(const char *path)
                return ret;
 
        pai->program = proc_add_program_list(pai->type, pai, pkgname, true);
+#ifdef MEMORY_MODULE
        lowmem_restore_memcg(pai);
+#endif
 
        (void) proc_app_list_add_app_info(pai);