From 11a753e312f4461c5e57b92e550cb7fe13abd6e9 Mon Sep 17 00:00:00 2001 From: Yuta Doi Date: Thu, 22 Dec 2016 13:11:16 +0900 Subject: Update pkgmgr-info from: b5c4655153dd8ba3619f1c15f85d2549812daf06 to : 93eeb1859dde996a09fa1907fe0503e33df4f4e6 [NOTE] This commit have been checked compiling but the command of pkgmgr is not existed, so it is necessary that alternative command is added. Change-Id: Ifaba3b49039d576ff50743b830c6e2e24ba349c8 Signed-off-by: Yuta Doi --- .../pkgmgr-info/pkgmgr-info.inc | 25 +++++++++++++----- .../0002-pkgmgr-info-journal-perser-db.patch | 30 +++++++++------------- .../pkgmgr-info/TizenCommonCMakeMacro.patch | 6 ++--- .../pkgmgr-info/pkgmgr-info_git.bb | 2 +- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info.inc b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info.inc index eb01947..47ff01e 100644 --- a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info.inc +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Packager Manager infomation api for package" HOMEPAGE = "http://nohomepage.org" SECTION = "Application Framework/Package Management" LICENSE = "Apache-2.0" -PV = "0.0.134" +PV = "0.1.0" SRC_URI = " \ file://TizenCommonCMakeMacro.patch \ @@ -56,6 +56,9 @@ DEPENDS += "dbus-glib" DEPENDS += "sqlite3" DEPENDS += "vconf" DEPENDS += "libslp-db-util" +DEPENDS += "bundle" +DEPENDS += "capi-system-info" + do_prep() { cd ${S} @@ -79,6 +82,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; + MAJORVER=`echo ${PV} | awk 'BEGIN {FS="."}{print $1}'` cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -91,8 +95,13 @@ do_compile() { -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ + -DFULLVER=${PV} -DMAJORVER=${MAJORVER} \ + -DTIZEN_MAJOR_VER=${tizen_version_major} \ + -DTIZEN_MINOR_VER=${tizen_version_minor} \ + -DTIZEN_PATCH_VER=${tizen_version_patch} ${EXTRA_OECMAKE} . - make ${PARALLEL_MAKE} + + oe_runmake ${PARALLEL_MAKE} @@ -117,8 +126,9 @@ do_install() { find ${D} -regex ".*\.la$" | xargs rm -f -- find ${D} -regex ".*\.a$" | xargs rm -f -- - # create the directory for hosting Read-Write application manifest files - mkdir -p ${D}${prefix}/share/packages + mkdir -p ${D}/usr/share/license + cp LICENSE ${D}/usr/share/license/${PN} + cp LICENSE ${D}/usr/share/license/${PN}-parser } @@ -133,7 +143,6 @@ pkg_postinst_${PN}() { #!/bin/sh -e [ "x$D" == "x" ] && ldconfig - chsmack -a '*' $D${prefix}/share/packages } @@ -164,8 +173,8 @@ pkgmgr-info-parser_files += "/package-manager/parser_path.conf" pkgmgr-info-parser_files += "/package-manager/parserlib/metadata/mdparser_list.txt" pkgmgr-info-parser_files += "/package-manager/parserlib/category/category_parser_list.txt" pkgmgr-info-parser_files += "/package-manager/parserlib/tag_parser_list.txt" +pkgmgr-info-parser_files += "/usr/share/license/${PN}-parser" CONFFILES_${PN}-parser = "" -CONFFILES_${PN}-parser += "/package-manager/preload/preload_list.txt" CONFFILES_${PN}-parser += "/package-manager/preload/manifest.xsd" CONFFILES_${PN}-parser += "/package-manager/preload/xml.xsd" CONFFILES_${PN}-parser += "/package-manager/parser_path.conf" @@ -176,7 +185,7 @@ MANIFESTFILES_${PN}-parser = "pkgmgr-info.manifest" pkgmgr-info_files = "" pkgmgr-info_files += "${prefix}/lib/libpkgmgr-info.so.*" -pkgmgr-info_files += "%dir ${prefix}/share/packages" +pkgmgr-info_files += "/usr/share/license/${PN}" MANIFESTFILES_${PN} = "pkgmgr-info.manifest" pkgmgr-info-parser-dev_files = "" @@ -188,6 +197,8 @@ MANIFESTFILES_${PN}-parser-dev = "pkgmgr-info.manifest" pkgmgr-info-dev_files = "" pkgmgr-info-dev_files += "${prefix}/include/pkgmgr-info.h" +pkgmgr-info-dev_files += "${prefix}/include/pkgmgrinfo_type.h" +pkgmgr-info-dev_files += "${prefix}/include/pkgmgrinfo_basic.h" pkgmgr-info-dev_files += "${prefix}/lib/pkgconfig/pkgmgr-info.pc" pkgmgr-info-dev_files += "${prefix}/lib/libpkgmgr-info.so" MANIFESTFILES_${PN}-dev = "pkgmgr-info.manifest" diff --git a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/0002-pkgmgr-info-journal-perser-db.patch b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/0002-pkgmgr-info-journal-perser-db.patch index 87fb4a5..441dd00 100644 --- a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/0002-pkgmgr-info-journal-perser-db.patch +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/0002-pkgmgr-info-journal-perser-db.patch @@ -1,26 +1,20 @@ --- a/parser/pkgmgr_parser_db.c +++ b/parser/pkgmgr_parser_db.c -@@ -2198,15 +2198,21 @@ - ret = chown(files[i], uid, userinfo->pw_gid); - SET_SMACK_LABEL(files[i],uid) +@@ -2614,6 +2614,8 @@ + } + ret = fchown(fd, uid, userinfo.pw_gid); if (ret == -1) { + if (files[i] == journal_file && errno == ENOENT) + continue; - strerror_r(errno, buf, sizeof(buf)); -- _LOGD("FAIL : chown %s %d.%d, because %s", db_file, uid, userinfo->pw_gid, buf); -+ //_LOGD("FAIL : chown %s %d.%d, because %s", db_file, uid, userinfo->pw_gid, buf); -+ _LOGD("FAIL : chown %s %d.%d, because %s", files[i], uid, userinfo->pw_gid, buf); - return -1; - } - - ret = chmod(files[i], S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); + if (strerror_r(errno, buf, sizeof(buf))) + strncpy(buf, "", BUFSIZE - 1); + _LOGD("FAIL : fchown %s %d.%d : %s", files[i], uid, +@@ -2627,6 +2629,8 @@ + mode |= S_IWOTH; + ret = fchmod(fd, mode); if (ret == -1) { + if (files[i] == journal_file && errno == ENOENT) + continue; - strerror_r(errno, buf, sizeof(buf)); -- _LOGD("FAIL : chmod %s 0664, because %s", db_file, buf); -+ //_LOGD("FAIL : chmod %s 0664, because %s", db_file, buf); -+ _LOGD("FAIL : chmod %s 0664, because %s", files[i], buf); - return -1; - } - } + if (strerror_r(errno, buf, sizeof(buf))) + strncpy(buf, "", BUFSIZE - 1); + _LOGD("FAIL : fchmod %s 0664 : %s", files[i], buf); diff --git a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/TizenCommonCMakeMacro.patch b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/TizenCommonCMakeMacro.patch index 1983693..7a9eeb6 100644 --- a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/TizenCommonCMakeMacro.patch +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/TizenCommonCMakeMacro.patch @@ -13,10 +13,10 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt index bd24c9c..513d28a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -5,7 +5,6 @@ PROJECT(pkgmgr-info C) +@@ -2,7 +2,6 @@ PROJECT(pkgmgr-info C) + + PROJECT(pkgmgr-info C) - SET(VERSION 0.0.17) - SET(VERSION_MAJOR 0) -INCLUDE(TizenCommon) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) diff --git a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info_git.bb b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info_git.bb index 8c50da2..6072bc1 100644 --- a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info_git.bb +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/appfw/pkgmgr-info;tag=b5c4655153dd8ba3619f1c15f85d2549812daf06;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/pkgmgr-info;tag=93eeb1859dde996a09fa1907fe0503e33df4f4e6;nobranch=1" BBCLASSEXTEND += " native " -- cgit 1.2.3-korg