From e814fb3be30e3efe5552fc2e5532259a3edfd59d Mon Sep 17 00:00:00 2001 From: Yuta Doi Date: Tue, 20 Dec 2016 18:38:47 +0900 Subject: Update ail from: 6de70f2ffa8664b4b04693e9505566b118dc139a to : 53a8f8cd04813083fb37936b7ffb2caad66c34d2 [NOTE] This commit have been checked compiling, but the command of pkgmgr have been failed because the pkgmgr have not been updeted yet. Change-Id: I7d2c200c6a37b1c5f857b2f47b3ac78a18174bf6 Signed-off-by: Yuta Doi --- .../recipes-application-framework/ail/ail.inc | 46 ++++--------- .../recipes-application-framework/ail/ail_git.bb | 2 +- .../ail/files/ail_journal_perm_check.patch | 76 ++++++---------------- 3 files changed, 32 insertions(+), 92 deletions(-) diff --git a/meta-application-manager/recipes-application-framework/ail/ail.inc b/meta-application-manager/recipes-application-framework/ail/ail.inc index c5b254d..38e17e9 100644 --- a/meta-application-manager/recipes-application-framework/ail/ail.inc +++ b/meta-application-manager/recipes-application-framework/ail/ail.inc @@ -24,6 +24,9 @@ RPROVIDES_ail += "libail" #PROVIDES by ail-dev PROVIDES += "ail-dev" +#PROVIDES by ail-vconf-dev +PROVIDES += " ${PN}-vconf-dev " + RDEPENDS = "" #RDEPENDS of ail-dev (${PN}-dev) @@ -31,6 +34,9 @@ RDEPENDS_${PN}-dev += "tizen-platform-config" RDEPENDS_${PN}-dev += "libail" RDEPENDS_${PN}-dev += "smack" +#RDEPENDS of ail-vconf-dev (${PN}-vconf-dev) +RDEPENDS_${PN}-vconf-dev += "libail" + DEPENDS = "" #DEPENDS of ail @@ -116,40 +122,7 @@ pkg_postinst_${PN}() { #!/bin/sh -e ldconfig - # Create aglglobalapp user needed for global installation - useradd -d $D${prefix}/apps -m aglglobalapp -r -c "system user for common applications" -g root - #mkdir -p %TZ_SYS_RW_APP/.config/xwalk-service/applications - #cd %TZ_SYS_RW_APP/ - #ln -s .config/xwalk-service/applications/ - vconftool set -t string db/ail/ail_info "0" -f -s system::vconf_inhouse - vconftool set -t string db/menuscreen/desktop "0" -f -s system::vconf_inhouse - vconftool set -t string db/menu_widget/language "en_US.utf8" -f -s system::vconf_inhouse - chsmack -a User $D${prefix}/kdb/db/ail - chsmack -a User $D${prefix}/kdb/db/ail/ail_info - chsmack -a User $D${prefix}/kdb/db/menuscreen - chsmack -a User $D${prefix}/kdb/db/menuscreen/desktop - chsmack -a User $D${prefix}/kdb/db/menu_widget - chsmack -a User $D${prefix}/kdb/db/menu_widget/language - mkdir -p $D${prefix}/share/applications - mkdir -p $D${prefix}/share/applications - mkdir -p $D${prefix}/apps - mkdir -p $D${prefix}/dbspace - mkdir -p $D${prefix}/share/icons/default/small - chsmack -a '*' $D${prefix}/dbspace - chsmack -a '*' $D${prefix}/apps - chsmack -a '*' $D${prefix}/share/applications - chsmack -a '*' $D${prefix}/share/applications - chsmack -a '*' $D${prefix}/share/icons - chsmack -a '*' $D${prefix}/share/icons/default - chsmack -a '*' $D${prefix}/share/icons/default/small/ - chmod g+w $D${prefix}/share/applications - chmod g+w $D${prefix}/share/applications - chown aglglobalapp:root $D${prefix}/share/applications - chown aglglobalapp:root $D${prefix}/share/applications - chown aglglobalapp:root $D${prefix}/apps - chown aglglobalapp:root $D${prefix}/dbspace - chown aglglobalapp:root $D${prefix}/dbspace - chown aglglobalapp:root -R $D${prefix}/share/icons + ail_createdb 2>/dev/null ail_syncdb 2>/dev/null chsmack -a '*' $D${prefix}/dbspace/.app_info.db* @@ -170,6 +143,7 @@ pkg_postrm_${PN}() { PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" PACKAGES += " ail " PACKAGES += " ail-dev " +PACKAGES += " ${PN}-vconf-dev " ail_files = "" ail_files += "${prefix}/bin/ail_createdb" @@ -194,8 +168,12 @@ ail-dev_files += "${prefix}/lib/libail.so" ail-dev_files += "${prefix}/lib/pkgconfig/ail.pc" MANIFESTFILES_${PN}-dev = "ail.manifest" +ail-vconf-dev_files = "" +ail-vconf-dev_files = "${prefix}/include/ail_vconf.h" + FILES_${PN} = "${ail_files}" FILES_${PN}-dev = "${ail-dev_files}" +FILES_${PN}-vconf-dev = "${ail-vconf-dev_files}" PKG_ail= "ail" PKG_ail-dev= "ail-dev" diff --git a/meta-application-manager/recipes-application-framework/ail/ail_git.bb b/meta-application-manager/recipes-application-framework/ail/ail_git.bb index 2868128..857dd46 100644 --- a/meta-application-manager/recipes-application-framework/ail/ail_git.bb +++ b/meta-application-manager/recipes-application-framework/ail/ail_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/ail;tag=6de70f2ffa8664b4b04693e9505566b118dc139a;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/ail;tag=53a8f8cd04813083fb37936b7ffb2caad66c34d2;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-application-manager/recipes-application-framework/ail/files/ail_journal_perm_check.patch b/meta-application-manager/recipes-application-framework/ail/files/ail_journal_perm_check.patch index 46ad215..1f901df 100644 --- a/meta-application-manager/recipes-application-framework/ail/files/ail_journal_perm_check.patch +++ b/meta-application-manager/recipes-application-framework/ail/files/ail_journal_perm_check.patch @@ -2,15 +2,15 @@ diff --git a/src/ail_db.c b/src/ail_db.c index 462c545..5c6bb5e 100755 --- a/src/ail_db.c +++ b/src/ail_db.c -@@ -100,15 +100,19 @@ static int ail_db_change_perm(const char *db_file, uid_t uid) +@@ -134,15 +134,19 @@ static int ail_db_change_perm(const char *db_file, uid_t uid) ret = chown(files[i], uid, userinfo->pw_gid); - SET_SMACK_LABEL(files[i],uid) + SET_SMACK_LABEL(files[i], uid); if (ret == -1) { + if (files[i] == journal_file && errno == ENOENT) + continue; - strerror_r(errno, buf, sizeof(buf)); -- _E("FAIL : chown %s %d.%d, because %s", db_file, uid, userinfo->pw_gid, buf); -+ _E("FAIL : chown %s %d.%d, because %s", files[i], uid, userinfo->pw_gid, buf); +- _E("FAIL : chown %s %d.%d, because %d", db_file, uid, userinfo->pw_gid, errno); ++ _E("FAIL : chown %s %d.%d, because %s", files[i], uid, userinfo->pw_gid, errno); + free(pwd_buf); return AIL_ERROR_FAIL; } @@ -18,9 +18,9 @@ index 462c545..5c6bb5e 100755 if (ret == -1) { + if (files[i] == journal_file && errno == ENOENT) + continue; - strerror_r(errno, buf, sizeof(buf)); -- _E("FAIL : chmod %s 0664, because %s", db_file, buf); -+ _E("FAIL : chmod %s 0664, because %s", files[i], buf); +- _E("FAIL : chmod %s 0664, because %d", db_file, errno); ++ _E("FAIL : chmod %s 0664, because %s", files[i], errno); + free(pwd_buf); return AIL_ERROR_FAIL; } } @@ -28,7 +28,7 @@ diff --git a/tool/src/ail_fota.c b/tool/src/ail_fota.c index 20d17c5..c523588 100644 --- a/tool/src/ail_fota.c +++ b/tool/src/ail_fota.c -@@ -176,15 +176,19 @@ static int initdb_change_perm(const char *db_file) +@@ -179,15 +179,19 @@ static int initdb_change_perm(const char *db_file) for (i = 0; files[i]; i++) { ret = chown(files[i], OWNER_ROOT, OWNER_ROOT); if (ret == -1) { @@ -54,15 +54,14 @@ diff --git a/tool/src/createdb.c b/tool/src/createdb.c index f203c74..05d101d 100644 --- a/tool/src/createdb.c +++ b/tool/src/createdb.c -@@ -97,15 +97,19 @@ static int createdb_change_perm(const char *db_file) +@@ -73,13 +73,17 @@ static int createdb_change_perm(const char *db_file) for (i = 0; files[i]; i++) { ret = chown(files[i], GLOBAL_USER, OWNER_ROOT); if (ret == -1) { + if (files[i] == journal_file && errno == ENOENT) + continue; - strerror_r(errno, buf, sizeof(buf)); -- _E("FAIL : chown %s %d.%d, because %s", db_file, OWNER_ROOT, OWNER_ROOT, buf); -+ _E("FAIL : chown %s %d.%d, because %s", files[i], OWNER_ROOT, OWNER_ROOT, buf); +- _E("FAIL : chown %s %d.%d, because %d", db_file, OWNER_ROOT, OWNER_ROOT, errno); ++ _E("FAIL : chown %s %d.%d, because %s", files[i], OWNER_ROOT, OWNER_ROOT, errno); return AIL_ERROR_FAIL; } @@ -70,59 +69,23 @@ index f203c74..05d101d 100644 if (ret == -1) { + if (files[i] == journal_file && errno == ENOENT) + continue; - strerror_r(errno, buf, sizeof(buf)); -- _E("FAIL : chmod %s 0664, because %s", db_file, buf); -+ _E("FAIL : chmod %s 0664, because %s", files[i], buf); +- _E("FAIL : chmod %s 0664, because %d", db_file, errno); ++ _E("FAIL : chmod %s 0664, because %s", files[i], errno); return AIL_ERROR_FAIL; } } -@@ -173,7 +177,6 @@ int main(int argc, char *argv[]) - _E(" %s is not removed",APP_INFO_DB_FILE); - if(remove(APP_INFO_DB_FILE_JOURNAL)) - _E(" %s is not removed",APP_INFO_DB_FILE_JOURNAL); -- return -1; - } - ret = setenv("AIL_INITDB", "1", 1); - _D("AIL_INITDB : %d", ret); diff --git a/tool/src/initdb.c b/tool/src/initdb.c index 75d5788..79df936 100755 --- a/tool/src/initdb.c +++ b/tool/src/initdb.c -@@ -174,15 +174,19 @@ static int initdb_change_perm(const char *db_file) - for (i = 0; files[i]; i++) { - ret = chown(files[i], GLOBAL_USER, OWNER_ROOT); - if (ret == -1) { -+ if (files[i] == journal_file && errno == ENOENT) -+ continue; - strerror_r(errno, buf, sizeof(buf)); -- _E("FAIL : chown %s %d.%d, because %s", db_file, OWNER_ROOT, OWNER_ROOT, buf); -+ _E("FAIL : chown %s %d.%d, because %s", files[i], OWNER_ROOT, OWNER_ROOT, buf); - return AIL_ERROR_FAIL; - } - - ret = chmod(files[i], S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - if (ret == -1) { -+ if (files[i] == journal_file && errno == ENOENT) -+ continue; - strerror_r(errno, buf, sizeof(buf)); -- _E("FAIL : chmod %s 0664, because %s", db_file, buf); -+ _E("FAIL : chmod %s 0664, because %s", files[i], buf); - return AIL_ERROR_FAIL; - } - } -diff --git a/tool/src/syncdb.c b/tool/src/syncdb.c -index 247602b..1ba2490 100644 ---- a/tool/src/syncdb.c -+++ b/tool/src/syncdb.c -@@ -176,15 +176,19 @@ static int syncdb_change_perm(const char *db_file) +@@ -143,13 +143,17 @@ static int initdb_change_perm(const char *db_file) for (i = 0; files[i]; i++) { ret = chown(files[i], GLOBAL_USER, OWNER_ROOT); if (ret == -1) { + if (files[i] == journal_file && errno == ENOENT) + continue; - strerror_r(errno, buf, sizeof(buf)); -- _E("FAIL : chown %s %d.%d, because %s", db_file, OWNER_ROOT, OWNER_ROOT, buf); -+ _E("FAIL : chown %s %d.%d, because %s", files[i], OWNER_ROOT, OWNER_ROOT, buf); +- _E("FAIL : chown %s %d.%d, because %d", db_file, OWNER_ROOT, OWNER_ROOT, errno); ++ _E("FAIL : chown %s %d.%d, because %s", files[i], OWNER_ROOT, OWNER_ROOT, errno); return AIL_ERROR_FAIL; } @@ -130,9 +93,8 @@ index 247602b..1ba2490 100644 if (ret == -1) { + if (files[i] == journal_file && errno == ENOENT) + continue; - strerror_r(errno, buf, sizeof(buf)); -- _E("FAIL : chmod %s 0664, because %s", db_file, buf); -+ _E("FAIL : chmod %s 0664, because %s", files[i], buf); +- _E("FAIL : chmod %s 0664, because %d", db_file, errno); ++ _E("FAIL : chmod %s 0664, because %s", files[i], errno); return AIL_ERROR_FAIL; } } -- cgit 1.2.3-korg