1. fix crash of mediadb-update

2. Do not installed unnecessay files in TV binary

Change-Id: I8180ba50e4d3a8f6b00ef2627ca27035fcb86a0e

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index df288a4..985ac8a 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.3.11
+Version:    0.3.12
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0
@@ -247,9 +247,11 @@ cp zh_TW.mo %{buildroot}%{_datadir}/locale/zh_TW/LC_MESSAGES/media_svr.mo
 
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 install -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/media-server.service
+%if !0%{?product_tv}
 mkdir -p %{buildroot}%{_unitdir_user}
 install -m 644 %{SOURCE2} %{buildroot}%{_unitdir_user}/media-server-user.service
 install -m 644 %{SOURCE3} %{buildroot}%{_unitdir_user}/media-server-user.path
+%endif
 %if "%{?profile}" == "mobile"
 install -m 644 %{SOURCE4} %{buildroot}%{_unitdir}/media-server.path
 %else
@@ -311,8 +313,10 @@ buxton2ctl -i -d create-int32 "system" "db/mediascanner/poweroff_status" "0" "ht
 %else
 %{_unitdir}/multi-user.target.wants/media-server.service
 %endif
+%if !0%{?product_tv}
 %{_unitdir_user}/media-server-user.service
 %{_unitdir_user}/media-server-user.path
+%endif
 /etc/multimedia/media_content_config.ini
 /etc/multimedia/media-server-plugin
 /etc/gumd/useradd.d/30_media-server-add.post

diff --git a/src/mediadb-update.c b/src/mediadb-update.c
index 93ca1a1..d989bbc 100755 (executable)
--- a/src/mediadb-update.c
+++ b/src/mediadb-update.c
@@ -67,7 +67,7 @@ typedef struct block_info_s{
 int (*svc_connect)                             (void ** handle, uid_t uid, char ** err_msg);
 int (*svc_disconnect)                  (void * handle, char ** err_msg);
 int (*svc_check_db)                    (void * handle, uid_t uid, char ** err_msg);
-int (*svc_get_storage_id)              (void * handle, const char *path, char *storage_id, uid_t uid, char ** err_msg);
+int (*svc_get_storage_id)              (void * handle, const char *path, char *storage_id, char ** err_msg);
 int (*svc_get_mmc_info)                (void * handle, char **storage_name, char **storage_path, int *validity, bool *info_exist, char **err_msg);
 int (*svc_insert_storage)              (void *handle, const char *storage_id, int storage_type, const char *storage_name, const char *storage_path, uid_t uid, char **err_msg);
 int (*svc_delete_storage)              (void * handle, const char *storage_id, const char *storage_name, uid_t uid, char **err_msg);
@@ -411,7 +411,7 @@ static int __get_storage_id(const char *path, char *storage_id, uid_t uid)
                return -1;
        }
 
-       ret = svc_get_storage_id(db_handle, path, storage_id, uid, &err_msg);
+       ret = svc_get_storage_id(db_handle, path, storage_id, &err_msg);
        if (ret < 0) {
                printf("Error svc_get_storage_id\n");
                dlclose(funcHandle);