aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuta Doi <yuta-d@witz-inc.co.jp>2016-12-07 16:17:29 +0900
committerYuta Doi <yuta-d@witz-inc.co.jp>2016-12-07 16:17:29 +0900
commit61fca16720001a007807c682dd7eb8ee68219c14 (patch)
tree004998c1880ada745a50d8f936d3a3784f455518
parent362068c26b2afcca57612574f2f0ba2939f55253 (diff)
Update capi-base-common
from: 9ab27c073081894717fa7f12905cbe3b60dfd9ec to : 7672817ef5e74f7ff923eac9ff3b1b75f67f0c13 Change-Id: I3444e2fbfef719b6a5ff857d6879aaea6a4b985d Signed-off-by: Yuta Doi <yuta-d@witz-inc.co.jp>
-rw-r--r--meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common.inc18
-rw-r--r--meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_git.bb2
2 files changed, 10 insertions, 10 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..b3a5694 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
@@ -1,8 +1,8 @@
DESCRIPTION = "Common header files of Tizen Native API"
HOMEPAGE = "http://nohomepage.org"
-SECTION = "System/API"
+SECTION = "Base"
LICENSE = "Apache-2.0"
-PV = "0.1.6"
+PV = "0.4.9"
SRC_URI = ""
@@ -36,7 +36,6 @@ do_prep() {
cd ${S}
chmod -Rf a+rX,u+w,g-w,o-w ${S}
#setup -q
- cp ${S}/packaging/capi-base-common.manifest .
}
@@ -67,8 +66,9 @@ do_compile() {
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \
- ${EXTRA_OECMAKE} . -DFULLVER=0.1.6 -DMAJORVER=${MAJORVER}
- oe_runmake ${PARALLEL_MAKE}
+ ${EXTRA_OECMAKE} . \
+ -DFULLVER=${PV} -DMAJORVER=${MAJORVER}
+ make ${PARALLEL_MAKE}
@@ -83,6 +83,7 @@ do_install() {
rm -rf ${D}
mkdir -p ${D}
+ rm -rf ${D}
oe_runmake \
DESTDIR=${D} \
@@ -92,8 +93,8 @@ do_install() {
rm -f ${D}${infodir}/dir
find ${D} -regex ".*\.la$" | xargs rm -f --
find ${D} -regex ".*\.a$" | xargs rm -f --
- mkdir -p ${D}${prefix}/share/license
- cp LICENSE ${D}${prefix}/share/license/capi-base-common
+ mkdir -p ${D}/usr/share/license
+ cp LICENSE ${D}/usr/share/license/${PN}
}
@@ -117,12 +118,11 @@ PACKAGES += " capi-base-common "
capi-base-common-dev_files = ""
capi-base-common-dev_files += "${prefix}/include/*.h"
capi-base-common-dev_files += "${prefix}/lib/pkgconfig/capi-base-common.pc"
-capi-base-common-dev_files += "${prefix}/share/license/capi-base-common"
MANIFESTFILES_${PN}-dev = "capi-base-common.manifest"
capi-base-common_files = ""
capi-base-common_files += "${prefix}/lib/libcapi-base-common.so*"
-capi-base-common_files += "${prefix}/share/license/capi-base-common"
+capi-base-common_files += "/usr/share/license/${PN}"
MANIFESTFILES_${PN} = "capi-base-common.manifest"
FILES_${PN}-dev = "${capi-base-common-dev_files}"
diff --git a/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_git.bb b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_git.bb
index 3f9bcbe..cf3e4b3 100644
--- a/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_git.bb
+++ b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_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/api/common;tag=9ab27c073081894717fa7f12905cbe3b60dfd9ec;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/core/api/common;tag=7672817ef5e74f7ff923eac9ff3b1b75f67f0c13;nobranch=1"
BBCLASSEXTEND += " native "