aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp>2016-08-01 15:03:22 +0900
committerKazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp>2016-08-01 15:08:37 +0900
commit852d0565420e206ed57cca86a758ef6270da10ed (patch)
tree8a26cc5ded486d301f49fb7f01c2af3b0d2b1260
parent5b6f0b1edc5e73ce5d455f3f20fbe6ed0ec8bc00 (diff)
Update the parts of AppMgr
Update the parts of AppMgr. *capi-base-common *heynoti *libcom-core *vconf-internal-keys *bullet *bundle *fdupes *iniparser *libiri *libprivilege-control *libsf-common *libslp-db-util *security-server *sensor *smack *tizen-platform-config *tizen-platform-wrapper It is in the way to update because some complile errors are occured on updating vconf, ail and so on. So, please don't use this revision and wait untill other next updates of AppMgr. Change-Id: Id601c06313fb7876e90486ac2d443a4418364d0e Signed-off-by: Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp>
-rw-r--r--meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common.inc2
-rw-r--r--meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_%.bbappend3
-rw-r--r--meta-application-manager/recipes-application-framework/libcom-core/libcom-core.inc2
-rw-r--r--meta-application-manager/recipes-application-framework/libcom-core/libcom-core_%.bbappend3
-rw-r--r--meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc2
-rw-r--r--meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_%.bbappend7
-rw-r--r--meta-application-manager/recipes-others/bundle/bundle.incorg135
-rw-r--r--meta-application-manager/recipes-others/bundle/bundle_%.bbappend20
-rw-r--r--meta-application-manager/recipes-others/bundle/diff_bundle12
-rw-r--r--meta-application-manager/recipes-others/iniparser/iniparser_%.bbappend1
-rw-r--r--meta-application-manager/recipes-others/libiri/libiri_%.bbappend1
-rw-r--r--meta-application-manager/recipes-others/libprivilege-control/libprivilege-control_%.bbappend1
-rw-r--r--meta-application-manager/recipes-others/security-server/security-server_%.bbappend6
-rw-r--r--meta-application-manager/recipes-others/tizen-platform-config/tizen-platform-config_%.bbappend6
-rw-r--r--meta-application-manager/recipes-others/tizen-platform-wrapper/tizen-platform-wrapper_%.bbappend7
15 files changed, 50 insertions, 158 deletions
diff --git a/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common.inc b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common.inc
index 13cb7f7..0547fa7 100644
--- a/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common.inc
+++ b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common.inc
@@ -36,7 +36,7 @@ do_prep() {
cd ${S}
chmod -Rf a+rX,u+w,g-w,o-w ${S}
#setup -q
- cp ${S}/packaging/capi-base-common.manifest .
+ #cp ${S}/packaging/capi-base-common.manifest .
}
diff --git a/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_%.bbappend b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_%.bbappend
new file mode 100644
index 0000000..1af6eed
--- /dev/null
+++ b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_%.bbappend
@@ -0,0 +1,3 @@
+SRC_URI_remove = "git://review.tizen.org/platform/core/api/common;tag=9ab27c073081894717fa7f12905cbe3b60dfd9ec;nobranch=1"
+
+SRC_URI_prepend = "git://review.tizen.org/platform/core/api/common;tag=7672817ef5e74f7ff923eac9ff3b1b75f67f0c13;nobranch=1"
diff --git a/meta-application-manager/recipes-application-framework/libcom-core/libcom-core.inc b/meta-application-manager/recipes-application-framework/libcom-core/libcom-core.inc
index 19d99ee..1c4d190 100644
--- a/meta-application-manager/recipes-application-framework/libcom-core/libcom-core.inc
+++ b/meta-application-manager/recipes-application-framework/libcom-core/libcom-core.inc
@@ -4,7 +4,7 @@ SECTION = "Base/IPC"
LICENSE = "Apache-2.0"
PV = "0.5.9"
-SRC_URI = "file://0001-remove-dbus-check.patch "
+SRC_URI += "file://0001-remove-dbus-check.patch "
S = "${WORKDIR}/git"
diff --git a/meta-application-manager/recipes-application-framework/libcom-core/libcom-core_%.bbappend b/meta-application-manager/recipes-application-framework/libcom-core/libcom-core_%.bbappend
new file mode 100644
index 0000000..3be9732
--- /dev/null
+++ b/meta-application-manager/recipes-application-framework/libcom-core/libcom-core_%.bbappend
@@ -0,0 +1,3 @@
+SRC_URI_remove = "git://review.tizen.org/platform/core/appfw/com-core;tag=dbfd87c27e0f73b95b2ae16d0b76e059484d5375;nobranch=1"
+
+SRC_URI_prepend = "git://review.tizen.org/platform/core/appfw/com-core;tag=7acedcdca28c3a2d491c8d9227fcf7e1cca004c1;nobranch=1"
diff --git a/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc
index e5fbf31..f5dd202 100644
--- a/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc
+++ b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc
@@ -30,7 +30,7 @@ do_prep() {
cd ${S}
chmod -Rf a+rX,u+w,g-w,o-w ${S}
#setup -q
- cp ${S}/packaging/vconf-internal-keys.manifest .
+ #cp ${S}/packaging/vconf-internal-keys.manifest .
}
diff --git a/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_%.bbappend b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_%.bbappend
new file mode 100644
index 0000000..e3ae67f
--- /dev/null
+++ b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_%.bbappend
@@ -0,0 +1,7 @@
+SRC_URI_remove = "git://review.tizen.org/platform/core/appfw/vconf-internal-keys;tag=9d1f756ba5062a60eeea11cf0b2b7fd60461bcf5;nobranch=1"
+
+SRC_URI_prepend = "git://review.tizen.org/platform/core/appfw/vconf-internal-keys;tag=4ac53a9fe5490aa7b85b3432d2e5b8b625a9182a;nobranch=1"
+
+
+vconf-internal-keys-dev_files += "/pkgconfig"
+vconf-internal-keys-dev_files += "/pkgconfig/vconf-internal-keys.pc"
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/bundle_%.bbappend b/meta-application-manager/recipes-others/bundle/bundle_%.bbappend
new file mode 100644
index 0000000..d596b16
--- /dev/null
+++ b/meta-application-manager/recipes-others/bundle/bundle_%.bbappend
@@ -0,0 +1,20 @@
+SRC_URI_remove = "git://review.tizen.org/platform/core/base/bundle;tag=71b36b170c377bfd15cb5601c49340ba95a1a30d;nobranch=1"
+
+SRC_URI_prepend = "git://review.tizen.org/platform/core/base/bundle;tag=0a9a262dca62ac30bee689118879b9f821604f45;nobranch=1"
+
+DEPENDS += "json-glib"
+
+do_prep_append() {
+
+ sed -i -e "4i SET(VERSION 0.1.31)" ${S}/CMakeLists.txt
+
+}
+
+bundle-dev_files += "${prefix}/include/bundle_internal.h"
+
+bundle_files += "/usr/share"
+bundle_files += "/usr/share/license"
+
+#QA issus[WARNING] may be occured. It says "bundle rdepends on capi-base-common". \
+#If you mind the message, please uncomment out RDEPENDS.
+#RDEPENDS_${PN} = "capi-base-common"
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/iniparser/iniparser_%.bbappend b/meta-application-manager/recipes-others/iniparser/iniparser_%.bbappend
new file mode 100644
index 0000000..84eeacb
--- /dev/null
+++ b/meta-application-manager/recipes-others/iniparser/iniparser_%.bbappend
@@ -0,0 +1 @@
+SRC_URI = "git://review.tizen.org/platform/upstream/iniparser;tag=c216877577a389ba12752e8620a1c56371acce80;nobranch=1"
diff --git a/meta-application-manager/recipes-others/libiri/libiri_%.bbappend b/meta-application-manager/recipes-others/libiri/libiri_%.bbappend
new file mode 100644
index 0000000..f64ed78
--- /dev/null
+++ b/meta-application-manager/recipes-others/libiri/libiri_%.bbappend
@@ -0,0 +1 @@
+SRC_URI = "git://review.tizen.org/platform/upstream/libiri;tag=c756950ca6af8d207c90d570a03ca7673e577123;nobranch=1"
diff --git a/meta-application-manager/recipes-others/libprivilege-control/libprivilege-control_%.bbappend b/meta-application-manager/recipes-others/libprivilege-control/libprivilege-control_%.bbappend
new file mode 100644
index 0000000..9ab627e
--- /dev/null
+++ b/meta-application-manager/recipes-others/libprivilege-control/libprivilege-control_%.bbappend
@@ -0,0 +1 @@
+SRC_URI = "git://review.tizen.org/platform/core/security/libprivilege-control;tag=aada3eda9ab02ac6e2d9d09ed8de6f26aef132dc;nobranch=1"
diff --git a/meta-application-manager/recipes-others/security-server/security-server_%.bbappend b/meta-application-manager/recipes-others/security-server/security-server_%.bbappend
new file mode 100644
index 0000000..56834a7
--- /dev/null
+++ b/meta-application-manager/recipes-others/security-server/security-server_%.bbappend
@@ -0,0 +1,6 @@
+SRC_URI_remove = " \
+ git://review.tizen.org/platform/core/security/security-server;tag=ae009054afbe5b8885da76af1a8127daa63742f6;nobranch=1 \
+ "
+SRC_URI_prepend = " \
+ git://review.tizen.org/platform/core/security/security-server;tag=998749b2a5eae8c65345cd975dffc8270523fd74;nobranch=1 \
+ "
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
index 367fc6d..e16c554 100644
--- 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
@@ -1,5 +1,3 @@
-SRC_URI = " \
- git://review.tizen.org/platform/core/system/tizen-platform-config;tag=c2b552bd395f4d28f0e369cc1ead4ff18d89a126;nobranch=1 \
- file://0001-modified-global-tizen-to-agl.patch \
- "
+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=983a697aa098c23a48c34691fa8a7ca9f117817e;nobranch=1"
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
index 8963daa..81794e8 100644
--- 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
@@ -1,4 +1,3 @@
-SRC_URI = " \
- git://review.tizen.org/platform/core/system/tizen-platform-wrapper;tag=8b5967cd28a02dd169920f84722d5946d76b1690;nobranch=1 \
- file://0002_compiler_changes.patch \
- "
+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=4bcd721954ccf5120ddf0aa9930f15ca27aa6d88;nobranch=1"