From c67e81dfc2ab76a85adcf188b09c4d6e02c3c75a Mon Sep 17 00:00:00 2001 From: jongmyeongko Date: Tue, 12 Jan 2016 17:48:42 +0900 Subject: [PATCH] remove 'preload_list.txt' which is not manageable. New method is needed to know what package is preloaded. Change-Id: I65de5c70fd51b505ef0698898e19efcd807d4add Signed-off-by: jongmyeongko --- packaging/pkgmgr-info.spec | 1 - parser/CMakeLists.txt | 2 - parser/manifest.xsd.in | 2 + parser/manifest.xsd.ref | 2 + parser/pkgmgr_parser.c | 114 --------------------------------------------- parser/pkgmgr_parser.h | 20 -------- parser/preload_list.txt.in | 88 ---------------------------------- 7 files changed, 4 insertions(+), 225 deletions(-) delete mode 100644 parser/preload_list.txt.in diff --git a/packaging/pkgmgr-info.spec b/packaging/pkgmgr-info.spec index 81b3991..ef6f25f 100644 --- a/packaging/pkgmgr-info.spec +++ b/packaging/pkgmgr-info.spec @@ -88,7 +88,6 @@ cp LICENSE %{buildroot}/usr/share/license/%{name}-parser %manifest %{name}.manifest %defattr(-,root,root,-) %{_libdir}/libpkgmgr_parser.so.* -%config %{_sysconfdir}/package-manager/preload/preload_list.txt %config %{_sysconfdir}/package-manager/preload/manifest.xsd %config %{_sysconfdir}/package-manager/preload/xml.xsd %config %{_sysconfdir}/package-manager/preload/res.xsd diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt index 4b1a026..f2b387a 100644 --- a/parser/CMakeLists.txt +++ b/parser/CMakeLists.txt @@ -54,7 +54,6 @@ target_link_libraries(pkgmgr_parser ${parser_pkgs_LDFLAGS}) ### Create pc file configure_file(pkgmgr-parser.pc.in ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-parser.pc @ONLY) -configure_file(preload_list.txt.in preload_list.txt @ONLY) configure_file(manifest.xsd.in manifest.xsd @ONLY) configure_file(xml.xsd.in xml.xsd @ONLY) configure_file(res.xsd.in res.xsd @ONLY) @@ -77,7 +76,6 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgmgr-parser.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/preload_list.txt DESTINATION ${SYSCONFDIR}/package-manager/preload/) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.xsd DESTINATION ${SYSCONFDIR}/package-manager/preload/) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/xml.xsd DESTINATION ${SYSCONFDIR}/package-manager/preload/) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/res.xsd DESTINATION ${SYSCONFDIR}/package-manager/preload/) diff --git a/parser/manifest.xsd.in b/parser/manifest.xsd.in index 220a2ad..3fd8383 100644 --- a/parser/manifest.xsd.in +++ b/parser/manifest.xsd.in @@ -43,6 +43,8 @@ + + diff --git a/parser/manifest.xsd.ref b/parser/manifest.xsd.ref index 7b06989..5ea9e01 100644 --- a/parser/manifest.xsd.ref +++ b/parser/manifest.xsd.ref @@ -42,6 +42,8 @@ + + diff --git a/parser/pkgmgr_parser.c b/parser/pkgmgr_parser.c index e0913c9..4d3ca2b 100644 --- a/parser/pkgmgr_parser.c +++ b/parser/pkgmgr_parser.c @@ -1957,72 +1957,6 @@ END: return ret; } -#define PRELOAD_PACKAGE_LIST SYSCONFDIR "/package-manager/preload/preload_list.txt" -static int __add_preload_info(manifest_x * mfx, const char *manifest, uid_t uid) -{ - FILE *fp = NULL; - char buffer[1024] = { 0 }; - int state = 0; - - if(strstr(manifest, getUserManifestPath(uid))) { - free((void *)mfx->readonly); - mfx->readonly = strdup("True"); - - free((void *)mfx->preload); - mfx->preload = strdup("True"); - - free((void *)mfx->removable); - mfx->removable = strdup("False"); - - free((void *)mfx->system); - mfx->system = strdup("True"); - - return 0; - } - - fp = fopen(PRELOAD_PACKAGE_LIST, "r"); - if (fp == NULL) { - _LOGE("no preload list\n"); - return -1; - } - - while (fgets(buffer, sizeof(buffer), fp) != NULL) { - if (buffer[0] == '#') { - if(strcasestr(buffer, "RW_NORM")) - state = 2; - else if(strcasestr(buffer, "RW_RM")) - state = 3; - else - continue; - } - - __str_trim(buffer); - - if(!strcmp(mfx->package, buffer)) { - free((void *)mfx->preload); - mfx->preload = strdup("True"); - if(state == 2){ - free((void *)mfx->readonly); - mfx->readonly = strdup("False"); - free((void *)mfx->removable); - mfx->removable = strdup("False"); - } else if(state == 3){ - free((void *)mfx->readonly); - mfx->readonly = strdup("False"); - free((void *)mfx->removable); - mfx->removable = strdup("True"); - } - } - - memset(buffer, 0x00, sizeof(buffer)); - } - - if (fp != NULL) - fclose(fp); - - return 0; -} - static int __check_preload_updated(manifest_x * mfx, const char *manifest, uid_t uid) { if (!strstr(manifest, getUserManifestPath(uid))) { @@ -2035,51 +1969,6 @@ static int __check_preload_updated(manifest_x * mfx, const char *manifest, uid_t return 0; } - -API int pkgmgr_parser_preload_package_type(const char *package) -{ - FILE *fp = NULL; - char buffer[1024] = { 0 }; - int state = 0; - int ret = PM_PRELOAD_NONE; - - fp = fopen(PRELOAD_PACKAGE_LIST, "r"); - if (fp == NULL) { - _LOGE("no preload list\n"); - return -1; - } - - while (fgets(buffer, sizeof(buffer), fp) != NULL) { - if (buffer[0] == '#') { - if(strcasestr(buffer, "RW_NORM")) - state = 2; - else if(strcasestr(buffer, "RW_RM")) - state = 3; - else - continue; - } - - __str_trim(buffer); - - if(!strcmp(package, buffer)) { - if(state == 2){ - ret = PM_PRELOAD_RW_NORM; - break; - } else if(state == 3){ - ret = PM_PRELOAD_RW_RM; - break; - } - } - - memset(buffer, 0x00, sizeof(buffer)); - } - - if (fp != NULL) - fclose(fp); - - return ret; -} - API int pkgmgr_parser_create_desktop_file(manifest_x *mfx) { /* desktop file is no longer used */ @@ -2516,9 +2405,6 @@ API int pkgmgr_parser_parse_manifest_for_uninstallation(const char *manifest, ch __ps_process_tag_parser(mfx, manifest, ACTION_UNINSTALL); - __add_preload_info(mfx, manifest, GLOBAL_USER); - _LOGD("Added preload infomation\n"); - ret = __ps_process_metadata_parser(mfx, ACTION_UNINSTALL); if (ret == -1) _LOGD("Removing metadata parser failed\n"); diff --git a/parser/pkgmgr_parser.h b/parser/pkgmgr_parser.h index dff90a9..4f14db1 100644 --- a/parser/pkgmgr_parser.h +++ b/parser/pkgmgr_parser.h @@ -70,26 +70,6 @@ enum { }; /** - * @brief Preload application type - */ -enum { - PM_PRELOAD_NONE, /**< not preload */ - PM_PRELOAD_RW_NORM, /**< not removable */ - PM_PRELOAD_RW_RM /**< removable */ -}; - -/** - * @fn int pkgmgr_parser_preload_package_type(const char *package) - * @brief This API gets type of preload that package is expected to be - * - * @par This API is for package-manager installer backends. - * - * @param[in] package pointer to package ID - * @return PM_PRELOAD defining what type of preload package it should be, -1 on failure - */ -int pkgmgr_parser_preload_package_type(const char *package); - -/** * @fn char *pkgmgr_parser_get_manifest_file(const char *pkgid) * @brief This API gets the manifest file of the package. * diff --git a/parser/preload_list.txt.in b/parser/preload_list.txt.in deleted file mode 100644 index d2e6296..0000000 --- a/parser/preload_list.txt.in +++ /dev/null @@ -1,88 +0,0 @@ -#RW_NORM -org.tizen.ag-hello -org.tizen.app-tray -org.tizen.bluetooth-share-ui -org.tizen.bluetooth -org.tizen.browser -org.tizen.bt-appsvc -org.tizen.bt-syspopup -org.tizen.calculator -org.tizen.calendar-viewer -org.tizen.calendar -org.tizen.call-eq-analyzer -org.tizen.call -org.tizen.camera-app -org.tizen.ciss -org.tizen.clock -org.tizen.cluster-home -org.tizen.contacts-viewer -org.tizen.contacts -org.tizen.dailybriefing-accuweather -org.tizen.dailybriefing-agent -org.tizen.dailybriefing-apnews -org.tizen.dailybriefing-ynews -org.tizen.dailybriefing-yfinance -org.tizen.data-provider-slave -org.tizen.download-provider -org.tizen.draglock -org.tizen.eas-appsvc -org.tizen.email -org.tizen.ereader -org.tizen.facebook-service -org.tizen.facebook -org.tizen.fileshare-service -org.tizen.fm-radio -org.tizen.gallery -org.tizen.idle-lock -org.tizen.image-editor -org.tizen.image-viewer -org.tizen.keystrings -org.tizen.kies-via-wifi -org.tizen.livebox-3d-lock -org.tizen.lowbat-syspopup -org.tizen.lowmem-syspopup -org.tizen.mdm-app -org.tizen.mdm-syspopup -org.tizen.memo -org.tizen.menu-screen -org.tizen.message -org.tizen.mobileprint -org.tizen.msg-ui-class0 -org.tizen.music-player -org.tizen.myfile -org.tizen.nfc-app -org.tizen.phone-lock -org.tizen.phone -org.tizen.picasa -org.tizen.poweroff-syspopup -org.tizen.pwlock -org.tizen.ring -org.tizen.setting -org.tizen.smartsearch -org.tizen.sound-player -org.tizen.system-panel -org.tizen.taskmgr -org.tizen.tethering -org.tizen.tickernoti-syspopup -org.tizen.usb-printer-detector -org.tizen.usbotg-syspopup -org.tizen.voicerecorder -org.tizen.volume -org.tizen.vtmain -org.tizen.wifi-direct-popup -org.tizen.wifi-direct-ugapp -org.tizen.youtube -activesync-ui -org.tizen.rcs-im -org.tizen.ims-syspopup -aospd00043 -cp7ipabg4k -57r43275q7 -q7097a278m -800ij447xl -70lsyzhkse -nas9xepmna - -#RW_RM -org.tizen.video-player -org.tizen.spotify -- 2.7.4