Add a build option for enabling or disabling EXTENDED_STORAGE

Change-Id: I95d5a3ca5e86f410386549bf629652922bf93bf6
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06357a2..5b1321c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,6 @@ SET(PKG_MODULES
        libtzplatform-config
        libudev
        vconf
-       ode
        libsyscommon
 )
 

diff --git a/packaging/storaged.spec b/packaging/storaged.spec
index 78ec20d..58f5b83 100644 (file)
--- a/packaging/storaged.spec
+++ b/packaging/storaged.spec
@@ -1,5 +1,6 @@
 #These options are DEACTIVATED by default.
 %bcond_with emulator
+%define extended_storage 0
 
 Name:       storaged
 Summary:    Storaged
@@ -37,7 +38,9 @@ BuildRequires:        pkgconfig(capi-appfw-app-control)
 BuildRequires: pkgconfig(capi-system-system-settings)
 BuildRequires: pkgconfig(efl-extension)
 BuildRequires: pkgconfig(storage)
+%if %{extended_storage}
 BuildRequires: pkgconfig(ode)
+%endif
 
 #For /usr/bin/msgfmt
 BuildRequires: gettext-tools
@@ -107,6 +110,7 @@ This package can be installed optional for auto dbus test.
        -DBLOCK_MODULE=on \
        -DBLOCK_TMPFS=on \
        -DSTORAGE_MODULE=on \
+       -DEXTENDED_STORAGE=%{extended_storage} \
        #eol
 
 %build

diff --git a/src/block/CMakeLists.txt b/src/block/CMakeLists.txt
index b6dcaca..c6ad5c2 100644 (file)
--- a/src/block/CMakeLists.txt
+++ b/src/block/CMakeLists.txt
@@ -2,7 +2,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(module_block C)
 
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED
+
+SET(REQUIRES_LIST ${REQUIRES_LIST}
                app2sd
                capi-system-info
                blkid
@@ -15,15 +16,23 @@ pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED
                libtzplatform-config
                vconf
                capi-system-device
-               ode
                libsyscommon
-)
+   )
+
+IF(EXTENDED_STORAGE)
+SET(REQUIRES_LIST ${REQUIRES_LIST} ode)
+ENDIF(EXTENDED_STORAGE)
+
+pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED ${REQUIRES_LIST})
 
 FOREACH(flag ${${PROJECT_NAME}_pkgs_CFLAGS})
        SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -Wall -Werror -fvisibility=hidden -rdynamic")
+IF(EXTENDED_STORAGE)
+SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -DEXTENDED_STORAGE")
+ENDIF(EXTENDED_STORAGE)
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 

diff --git a/src/block/block.c b/src/block/block.c
index a11f3f5..3ce6739 100644 (file)
--- a/src/block/block.c
+++ b/src/block/block.c
@@ -40,11 +40,13 @@
 #include <app2ext_interface.h>
 #include <libmount.h>
 #include <blkid/blkid.h>
-#include <ode/luks.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
 #include <libsyscommon/dbus-system.h>
+#ifdef EXTENDED_STORAGE
+#include <ode/luks.h>
+#endif
 
 #include "log.h"
 #include "config-parser.h"
@@ -1860,9 +1862,11 @@ static void trigger_operation(struct block_device *bdev, dd_list *queue, struct
                        /* Do nothing */
                        break;
                case BLOCK_LUKS_CLOSE:
+#ifdef EXTENDED_STORAGE
                        ret = ode_luks_close_sync(EXTENDEDSD_NAME);
                        if (ret < 0)
                                _E("Failed on ode_luks_close(%s).", EXTENDEDSD_NAME);
+#endif
                        break;
                default:
                        _E("Operation type(%d) is invalid.", op->op);