remove csr routines in tv profile 18/87318/2
authorJunghyun Yeon <jungh.yeon@samsung.com>
Wed, 7 Sep 2016 10:18:07 +0000 (19:18 +0900)
committerJunghyun Yeon <jungh.yeon@samsung.com>
Wed, 7 Sep 2016 10:27:51 +0000 (19:27 +0900)
Change-Id: I0487e36776f510deb317cd80ee59d6c55fa4d764
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
CMakeLists.txt
packaging/pkgmgr-server.spec
src/pkgmgr-server.c

index ac0deb3..e4f7683 100644 (file)
@@ -32,22 +32,21 @@ SET(SRCS
        src/restriction_mode.c
        )
 
-pkg_check_modules(SERVER_DEPS REQUIRED
-               gio-2.0
-               dlog
-               pkgmgr-parser
-               pkgmgr-info
-               libtzplatform-config
-               drm-service-core-tizen
-               libgum
-               sqlite3
-               pkgmgr
-               csr
-               pkgmgr-installer)
+SET(SERVER_CHECK_MODULES gio-2.0 dlog pkgmgr-parser pkgmgr-info libtzplatform-config drm-service-core-tizen libgum sqlite3 pkgmgr pkgmgr-installer)
+IF(TIZEN_FEATURE_CSR)
+       pkg_check_modules(SERVER_DEPS REQUIRED ${SERVER_CHECK_MODULES} csr)
+ELSE(TIZEN_FEATURE_CSR)
+       pkg_check_modules(SERVER_DEPS REQUIRED ${SERVER_CHECK_MODULES})
+ENDIF(TIZEN_FEATURE_CSR)
+
 FOREACH(SERVER_FLAGS ${SERVER_DEPS_CFLAGS})
        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SERVER_FLAGS}")
 ENDFOREACH(SERVER_FLAGS)
 
+IF(TIZEN_FEATURE_CSR)
+       ADD_DEFINITIONS("-DTIZEN_FEATURE_CSR")
+ENDIF(TIZEN_FEATURE_CSR)
+
 ADD_EXECUTABLE(${PKGMGR_SERVER} ${SRCS})
 TARGET_LINK_LIBRARIES(${PKGMGR_SERVER} pkgmgr_installer)
 TARGET_LINK_LIBRARIES(${PKGMGR_SERVER} ${SERVER_DEPS_LDFLAGS})
index 65ebcb1..49f81b1 100644 (file)
@@ -25,11 +25,14 @@ BuildRequires:  pkgconfig(pkgmgr-installer)
 BuildRequires:  pkgconfig(drm-service-core-tizen)
 BuildRequires:  pkgconfig(libgum)
 BuildRequires:  pkgconfig(sqlite3)
-BuildRequires:  pkgconfig(csr)
 BuildRequires:  pkgmgr-info-parser-devel
 BuildRequires:  pkgmgr-info-parser
 BuildRequires:  fdupes
 
+%if "%{?profile}" != "tv"
+BuildRequires:  pkgconfig(csr)
+%endif
+
 %description
 Packager Manager server package for packaging
 
@@ -44,10 +47,17 @@ cp %{SOURCE1001} .
 %build
 sqlite3 restriction.db < ./restriction.sql
 
+%if "%{?profile}" != "tv"
+_TIZEN_FEATURE_CSR=ON
+%else
+_TIZEN_FEATURE_CSR=OFF
+%endif
+
 %cmake . -DRUN_DIR=%{run_dir} \
          -DDB_DIR=%{db_dir} \
          -DBACKEND_DIR=%{backend_dir} \
-         -DUNITDIR=%{_unitdir}
+         -DUNITDIR=%{_unitdir} \
+         -DTIZEN_FEATURE_CSR:BOOL=${_TIZEN_FEATURE_CSR}
 
 %__make %{?_smp_mflags}
 
index 021b327..15cd72c 100644 (file)
@@ -42,7 +42,9 @@
 #include <pkgmgr/pkgmgr_parser_db.h>
 #include <tzplatform_config.h>
 #include <drm-tizen-apps.h>
+#ifdef TIZEN_FEATURE_CSR
 #include <csr-content-screening.h>
+#endif
 
 #include "pkgmgr_installer.h"
 #include "pkgmgr-server.h"
@@ -411,6 +413,7 @@ static int __pkgcmd_find_pid_by_cmdline(const char *dname,
        return pid;
 }
 
+#ifdef TIZEN_FEATURE_CSR
 static int __check_csr(backend_info *ptr)
 {
        csr_cs_context_h context = NULL;
@@ -436,6 +439,7 @@ static int __check_csr(backend_info *ptr)
 
        return 0;
 }
+#endif
 
 static int __pkgcmd_proc_iter_kill_cmdline(const char *apppath, int option)
 {
@@ -1454,6 +1458,7 @@ gboolean queue_job(void *data)
        ptr->req_type = item->req_type;
        DBG("handle request type [%d]", item->req_type);
 
+#ifdef TIZEN_FEATURE_CSR
        if (item->req_type == PKGMGR_REQUEST_TYPE_INSTALL ||
                        item->req_type == PKGMGR_REQUEST_TYPE_MOUNT_INSTALL ||
                        item->req_type == PKGMGR_REQUEST_TYPE_REINSTALL) {
@@ -1464,6 +1469,7 @@ gboolean queue_job(void *data)
                        goto end;
                }
        }
+#endif
 
        switch (item->req_type) {
        case PKGMGR_REQUEST_TYPE_INSTALL: