Bug fix:Fail to remove db-journal file

* Bug fix
In AGL distribution, there are no db-journal file for pkgmgr_* and app_info
in /usr/dbspace because sqlite3 maybe delete them.
If journal files doesn't exist, creating DB fails and desktop files are not created.
So, this commit change not to remove db-journal file if the files doesn't exist.

* Refactoring
Some recipe was refactored to enable patch from other layer.

* Remove unnecessary file

* Modify README
Add how to set up to enable global user to create surfaces.

Change-Id: Id73e9a840cf59e48641a0c53fbaa6d292d576ae2
Signed-off-by: Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp>

16 files changed, 304 insertions, 172 deletions

diff --git a/README b/README
index 13c0d12..1cfc2a3 100644
--- a/README
+++ b/README
@@ -17,9 +17,7 @@ Release note
 ToDo
 ------------------
 * Register first setting(vconf etc.) as systemd service
-* Change global user name to aglglobaluser
 * Documentation
-* Separate the dependencies of capi-*
 * Dynamicaly enable to install applications
 * Support multiple runtime engine
    - remove efl dependencies
@@ -118,6 +116,7 @@ You can build an image for porter using the following steps:
 3. Modify conf/bblayers
 
  3.1 Remove the meta-agl-bsp line in conf/bblayers.conf
+
 	remove ${METADIR}/meta-agl/meta-agl-bsp \
 
  3.2 Add following environment variables in conf/bblayers.conf
@@ -131,6 +130,7 @@ You can build an image for porter using the following steps:
 	Nothing
 
 5. bitbake the image
+
 	$ bitbake agl-demo-platform-plus-application-manager
 
 
@@ -152,21 +152,22 @@ can be searched from database.
 2. Setting	
 	# vconftool set -t string db/menu_widget/language "en-us"
 	# useradd aglglobalapp
-		if required to define password, please set the password you like.
+               if required to define password, please set the password you like
 	# loginctl enable-linger aglglobalapp
+	# chmod g+w /usr/share/applications
+	# chown aglglobalapp:root /usr/dbspace
+	# chown aglglobalapp:root /run/user/0 /run/user/0/wayland-0
 
 3. Launch sample application from user
 	# login aglglobalapp
-	$ launch_app org.tizen.amhelloworld
-		launch sample appli will fail.
-	$ pkg_createdb_user
 	$ pkg_initdb_user
+	$ ail_initdb_user
 	$ launch_app org.tizen.amhelloworld
 		successfull to launch
 
 4. How to start native application
 	$ pkgcmd -l // to list all applications available. $ pkginfo --listpkg is also available
-	$ app_launcher -s <pkgid>
+	$ app_launcher -s <appid>
 
    For more information, please access the following URL
 	https://wiki.tizen.org/wiki/IVI/Tizen-IVI_3.0
diff --git a/meta-application-manager/recipes-application-framework/ail/ail.inc b/meta-application-manager/recipes-application-framework/ail/ail.inc
index f946869..c5b254d 100644
--- a/meta-application-manager/recipes-application-framework/ail/ail.inc
+++ b/meta-application-manager/recipes-application-framework/ail/ail.inc
@@ -4,7 +4,9 @@ SECTION = "Application Framework/Libraries"
 LICENSE = "Apache-2.0"
 PV = "0.2.80"
 
-SRC_URI = ""
+SRC_URI = " \
+	file://ail_journal_perm_check.patch \
+	"
 
 S = "${WORKDIR}/git"
 
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
new file mode 100644
index 0000000..46ad215
--- /dev/null
+++ b/meta-application-manager/recipes-application-framework/ail/files/ail_journal_perm_check.patch
@@ -0,0 +1,138 @@
+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)
+ 		ret = chown(files[i], uid, userinfo->pw_gid);
+ 		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);
+ 			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/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)
+ 	for (i = 0; files[i]; i++) {
+ 		ret = chown(files[i], OWNER_ROOT, 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/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)
+ 	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;
+ 		}
+ 	}
+@@ -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)
+ 	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/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info.inc b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info.inc
index be9193a..eb01947 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
@@ -4,7 +4,10 @@ SECTION = "Application Framework/Package Management"
 LICENSE = "Apache-2.0"
 PV = "0.0.134"
 
-SRC_URI = " file://TizenCommonCMakeMacro.patch "
+SRC_URI = " \
+	file://TizenCommonCMakeMacro.patch \
+	file://0002-pkgmgr-info-journal-perser-db.patch \
+	"
 
 S = "${WORKDIR}/git"
 
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
new file mode 100644
index 0000000..87fb4a5
--- /dev/null
+++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/0002-pkgmgr-info-journal-perser-db.patch
@@ -0,0 +1,26 @@
+--- 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)
+ 		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 (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;
+ 		}
+ 	}
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/0002-pkgmgr-initdb.patch b/meta-application-manager/recipes-application-framework/pkgmgr/files/0002-pkgmgr-initdb.patch
new file mode 100644
index 0000000..6dfa9e6
--- /dev/null
+++ b/meta-application-manager/recipes-application-framework/pkgmgr/files/0002-pkgmgr-initdb.patch
@@ -0,0 +1,65 @@
+--- a/tool/pkg_createdb.c
++++ b/tool/pkg_createdb.c
+@@ -261,15 +261,21 @@
+ 	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, GLOBAL_USER, OWNER_ROOT, buf);
++			//_E("FAIL : chown %s %d.%d, because %s", db_file, GLOBAL_USER, OWNER_ROOT, buf);
++			_E("FAIL : chown %s %d.%d, because %s", files[i], GLOBAL_USER, OWNER_ROOT, buf);
+ 			return -1;
+ 		}
+ 
+ 		ret = chmod(files[i], S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | 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", db_file, buf);
++			_E("FAIL : chmod %s 0664, because %s", files[i], buf);
+ 			return -1;
+ 		}
+ 	}
+@@ -357,7 +363,10 @@
+ 		return -1;
+ 	}
+ 
+-	setuid(OWNER_ROOT);
++	ret=setuid(OWNER_ROOT);
++	if(ret!=0){
++		printf("@%d__setuid err = %d\n",__LINE__,errno);
++	}
+ 	ret = createdb_change_perm(PACKAGE_INFO_DB_FILE);
+ 	if (ret == -1) {
+ 		_E("cannot chown.");
+
+--- a/tool/pkg_initdb.c
++++ b/tool/pkg_initdb.c
+@@ -208,15 +208,21 @@
+ 	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, GLOBAL_USER, OWNER_ROOT, buf);
++			//_E("FAIL : chown %s %d.%d, because %s", db_file, GLOBAL_USER, OWNER_ROOT, buf);
++			_E("FAIL : chown %s %d.%d, because %s", files[i], GLOBAL_USER, OWNER_ROOT, buf);
+ 			return -1;
+ 		}
+ 
+ 		ret = chmod(files[i], S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | 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", db_file, buf);
++			_E("FAIL : chmod %s 0664, because %s", files[i], buf);
+ 			return -1;
+ 		}
+ 	}
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/pkgmgr-journaldb.patch b/meta-application-manager/recipes-application-framework/pkgmgr/files/pkgmgr-journaldb.patch
new file mode 100644
index 0000000..4773426
--- /dev/null
+++ b/meta-application-manager/recipes-application-framework/pkgmgr/files/pkgmgr-journaldb.patch
@@ -0,0 +1,52 @@
+diff --git a/tool/pkg_createdb.c b/tool/pkg_createdb.c
+--- a/tool/pkg_createdb.c
++++ b/tool/pkg_createdb.c
+@@ -261,15 +261,21 @@
+ 	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, GLOBAL_USER, OWNER_ROOT, buf);
++			_E("FAIL : chown %s %d.%d, because %s", files[i], GLOBAL_USER, OWNER_ROOT, buf);
+ 			return -1;
+ 		}
+ 
+ 		ret = chmod(files[i], S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | 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 -1;
+ 		}
+ 	}
+
+--- a/tool/pkg_initdb.c
++++ b/tool/pkg_initdb.c
+@@ -208,15 +208,21 @@
+ 	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, GLOBAL_USER, OWNER_ROOT, buf);
++			_E("FAIL : chown %s %d.%d, because %s", files[i], GLOBAL_USER, OWNER_ROOT, buf);
+ 			return -1;
+ 		}
+ 
+ 		ret = chmod(files[i], S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | 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 -1;
+ 		}
+ 	}
+
+
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc
index 144d882..19035ec 100644
--- a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc
+++ b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc
@@ -5,7 +5,11 @@ LICENSE = "Apache-2.0"
 PV = "0.2.89"
 PR = "r1"
 
-SRC_URI = " file://0001-remove-TizenConfig.patch "
+SRC_URI = " \
+	file://0001_change-tzglobalapp-to-aglglobalapp.patch \
+	file://0001-remove-TizenConfig.patch \
+	file://0002-pkgmgr-initdb.patch \
+	"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_%.bbappend b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_%.bbappend
deleted file mode 100644
index 1d47580..0000000
--- a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-SRC_URI += "file://0001_change-tzglobalapp-to-aglglobalapp.patch"
diff --git a/meta-application-manager/recipes-others/bundle/bundle.incorg b/meta-application-manager/recipes-others/bundle/bundle.incorg
deleted file mode 100644
index b9a3844..0000000
--- a/meta-application-manager/recipes-others/bundle/bundle.incorg
+++ /dev/null
@@ -1,135 +0,0 @@
-DESCRIPTION = "String key-val dictionary ADT"
-HOMEPAGE = "http://nohomepage.org"
-SECTION = "System/Libraries"
-LICENSE = "Apache-2.0"
-PV = "0.1.31"
-
-SRC_URI = ""
-
-S = "${WORKDIR}/git"
-
-inherit autotools-brokensep
-
-BBCLASSEXTEND = ""
-PROVIDES = ""
-
-#PROVIDES by bundle-dev
-PROVIDES += "bundle-dev"
-
-
-#PROVIDES by bundle
-
-
-RDEPENDS = ""
-#RDEPENDS of bundle-dev (${PN}-dev)
-RDEPENDS_${PN}-dev += "bundle"
-
-
-DEPENDS = ""
-#DEPENDS of bundle
-inherit tizen_cmake
-inherit pkgconfig
-DEPENDS += "dlog"
-DEPENDS += "glib-2.0"
-
-do_prep() {
- cd ${S}
- chmod -Rf a+rX,u+w,g-w,o-w ${S}
- #setup -q -n bundle-0.1.31
- cp ${S}/packaging/bundle.manifest .
- 
- 
- 
-}
-do_patch_append() {
-    bb.build.exec_func('do_prep', d)
-}
-
-do_configure() {
-}
-
-do_compile() {
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- LD_AS_NEEDED=1; export LD_AS_NEEDED ;
- 
- 
-   cmake \
-         -DCMAKE_VERBOSE_MAKEFILE=ON \
-         -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
-         -DCMAKE_INSTALL_LIBDIR:PATH=${prefix}/lib \
-         -DINCLUDE_INSTALL_DIR:PATH=${prefix}/include \
-         -DLIB_INSTALL_DIR:PATH=${prefix}/lib \
-         -DSYSCONF_INSTALL_DIR:PATH=${sysconfdir} \
-         -DSHARE_INSTALL_PREFIX:PATH=${prefix}/share \
-         -DCMAKE_SKIP_RPATH:BOOL=ON \
-         -DBUILD_SHARED_LIBS:BOOL=ON \
-         -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
-         ${EXTRA_OECMAKE} .
- make ${PARALLEL_MAKE}
- 
- 
- 
-}
-
-do_install() {
- export RPM_BUILD_ROOT=${D}
- cd ${S}
- LANG=C
- export LANG
- unset DISPLAY
- rm -rf ${D}
- mkdir -p ${D}
- 
- 
-   oe_runmake \
-         DESTDIR=${D} \
-         INSTALL_ROOT=${D} \
-         BINDIR=${prefix}/bin \
-   install  
-   rm -f ${D}${infodir}/dir 
-   find ${D} -regex ".*\.la$" | xargs rm -f -- 
-   find ${D} -regex ".*\.a$" | xargs rm -f --
- 
- mkdir -p ${D}/usr/share/license
- 
- 
-}
-
-pkg_postinst_${PN}() {
-    #!/bin/sh -e
-
-    [ "x$D" == "x" ] && ldconfig
-}
-
-pkg_postrm_${PN}() {
-    #!/bin/sh -e
-
-    [ "x$D" == "x" ] && ldconfig
-}
-
-PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale"
-PACKAGES += " bundle-dev "
-PACKAGES += " bundle "
-
-bundle-dev_files = ""
-bundle-dev_files += "${prefix}/include/bundle.h"
-bundle-dev_files += "${prefix}/include/SLP_bundle_PG.h"
-bundle-dev_files += "${prefix}/lib/pkgconfig/bundle.pc"
-bundle-dev_files += "${prefix}/lib/libbundle.so"
-MANIFESTFILES_${PN}-dev = "bundle.manifest"
-
-bundle_files = ""
-bundle_files += "${prefix}/lib/libbundle.so.*"
-MANIFESTFILES_${PN} = "bundle.manifest"
-
-FILES_${PN}-dev = "${bundle-dev_files}"
-FILES_${PN} = "${bundle_files}"
-
-PKG_bundle-dev= "bundle-dev"
-PKG_bundle= "bundle"
-
-require bundle-extraconf.inc
-
diff --git a/meta-application-manager/recipes-others/bundle/diff_bundle b/meta-application-manager/recipes-others/bundle/diff_bundle
deleted file mode 100644
index 9171935..0000000
--- a/meta-application-manager/recipes-others/bundle/diff_bundle
+++ /dev/null
@@ -1,12 +0,0 @@
---- bundle.inc	2016-06-02 20:56:35.000000000 +0900
-+++ bundle.incorg	2016-07-21 14:40:54.348023451 +0900
-@@ -93,9 +93,6 @@
-    find ${D} -regex ".*\.la$" | xargs rm -f -- 
-    find ${D} -regex ".*\.a$" | xargs rm -f --
-  
-- mkdir -p ${D}/usr/share/license
-- 
-- 
- }
- 
- pkg_postinst_${PN}() {
diff --git a/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config.inc b/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config.inc
index ed09c1a..596860b 100644
--- a/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config.inc
+++ b/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config.inc
@@ -4,7 +4,7 @@ SECTION = "System/Configuration"
 LICENSE = "MIT"
 PV = "2.0"
 
-
+SRC_URI += "file://0001-modified-global-tizen-to-agl.patch"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend b/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend
deleted file mode 100644
index ed812e1..0000000
--- a/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-SRC_URI_remove = "git://review.tizen.org/platform/core/appfw/tizen-platform-config;tag=c2b552bd395f4d28f0e369cc1ead4ff18d89a126;nobranch=1"
-SRC_URI_prepend = " \
-	git://review.tizen.org/platform/core/system/tizen-platform-config;tag=c2b552bd395f4d28f0e369cc1ead4ff18d89a126;nobranch=1 \
-	file://0001-modified-global-tizen-to-agl.patch \
-	"
-
diff --git a/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_git.bb b/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_git.bb
index 6d0a3b8..047fd60 100644
--- a/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_git.bb
+++ b/meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_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/tizen-platform-config;tag=c2b552bd395f4d28f0e369cc1ead4ff18d89a126;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/system/tizen-platform-config;tag=c2b552bd395f4d28f0e369cc1ead4ff18d89a126;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
diff --git a/meta-application-manager/recipes-others/tizen-platform-wrapper/tizen-platform-wrapper_%.bbappend b/meta-application-manager/recipes-others/tizen-platform-wrapper/tizen-platform-wrapper_%.bbappend
deleted file mode 100644
index 99bffb7..0000000
--- a/meta-application-manager/recipes-others/tizen-platform-wrapper/tizen-platform-wrapper_%.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-SRC_URI_remove = "git://review.tizen.org/platform/core/appfw/tizen-platform-wrapper;tag=8b5967cd28a02dd169920f84722d5946d76b1690;nobranch=1"
-
-SRC_URI_prepend = " \
-	git://review.tizen.org/platform/core/system/tizen-platform-wrapper;tag=8b5967cd28a02dd169920f84722d5946d76b1690;nobranch=1 \
-	"
diff --git a/meta-application-manager/recipes-others/tizen-platform-wrapper/tizen-platform-wrapper_git.bb b/meta-application-manager/recipes-others/tizen-platform-wrapper/tizen-platform-wrapper_git.bb
index 19e16c2..a45226a 100644
--- a/meta-application-manager/recipes-others/tizen-platform-wrapper/tizen-platform-wrapper_git.bb
+++ b/meta-application-manager/recipes-others/tizen-platform-wrapper/tizen-platform-wrapper_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/tizen-platform-wrapper;tag=8b5967cd28a02dd169920f84722d5946d76b1690;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/system/tizen-platform-wrapper;tag=8b5967cd28a02dd169920f84722d5946d76b1690;nobranch=1"
 
 BBCLASSEXTEND += " native "