diff options
| author |   Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp> | 2016-07-22 10:32:11 +0900 |
|---|---|---|
| committer | Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp> | 2016-07-22 11:01:55 +0900 |
| commit | 6fc9f9f085ab68f89ba6b22465fbdfc5411d41ba (patch) | |
| tree | 40ee5391beebd06518c674c9ef1858c65026ceb4 /meta-application-manager/recipes-application-framework | |
| parent | 9cf56692db97b90e0fcb795f761430438bd0ad29 (diff) | |
First version of ported tizen application manager
Change-Id: I46735869fe8113be58348d575e01734e498d2de2
Signed-off-by: Kazumasa Mitsunari <kazumasa_mitsunari_za@mail.toyota.co.jp>
Diffstat (limited to 'meta-application-manager/recipes-application-framework')
62 files changed, 4800 insertions, 0 deletions
diff --git a/meta-application-manager/recipes-application-framework/ail/ail-extraconf.inc b/meta-application-manager/recipes-application-framework/ail/ail-extraconf.inc new file mode 100644 index 0000000..44fb613 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/ail/ail-extraconf.inc @@ -0,0 +1,15 @@ + +SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch" + +RDEPENDS_${PN}_remove_class-native = "systemd-native" +DEPENDS_remove_class-native = "dlog-native" + +DEPENDS_class-target += "ail-native" +DEPENDS_class-target += "libslp-db-util" +DEPENDS_class-target += "xdgmime" +DEPENDS_class-target += "vconf" + + +FILES_${PN} += "${prefix}/dbspace" +FILES_${PN} += "${prefix}/share/applications" +FILES_${PN} += "${prefix}/bin/ail_initdb_user"
\ No newline at end of file diff --git a/meta-application-manager/recipes-application-framework/ail/ail.inc b/meta-application-manager/recipes-application-framework/ail/ail.inc new file mode 100644 index 0000000..e1857cf --- /dev/null +++ b/meta-application-manager/recipes-application-framework/ail/ail.inc @@ -0,0 +1,202 @@ +DESCRIPTION = "Application Information Library" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Application Framework/Libraries" +LICENSE = "Apache-2.0" +PV = "0.2.80" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by ail +# the PROVIDES rules is ignore "libail = 0.2.80-0" +PROVIDES += "libail" +RPROVIDES_ail += "libail" + + +#PROVIDES by ail-dev +PROVIDES += "ail-dev" + + +RDEPENDS = "" +#RDEPENDS of ail-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "tizen-platform-config" +RDEPENDS_${PN}-dev += "libail" +RDEPENDS_${PN}-dev += "smack" + + +DEPENDS = "" +#DEPENDS of ail +inherit tizen_cmake +DEPENDS += "tizen-platform-config" +inherit pkgconfig +DEPENDS += "dlog" +DEPENDS += "smack" +DEPENDS += "sqlite3" +DEPENDS += "xdgmime" +DEPENDS += "vconf" +DEPENDS += "libslp-db-util" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/ail.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 ; + + CFLAGS="$CFLAGS -fpic" + + + + 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} . -DTZ_SYS_RW_DESKTOP_APP=${prefix}/share/applications \ + -DBUILD_PKGTYPE=rpm + + oe_runmake ${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 -- + + +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + ldconfig + # Create tizenglobalapp user needed for global installation + useradd -d $D${prefix}/apps -m tizenglobalapp -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 tizenglobalapp:root $D${prefix}/share/applications + chown tizenglobalapp:root $D${prefix}/share/applications + chown tizenglobalapp:root $D${prefix}/apps + chown tizenglobalapp:root $D${prefix}/dbspace + chown tizenglobalapp:root $D${prefix}/dbspace + chown tizenglobalapp:root -R $D${prefix}/share/icons + ail_createdb 2>/dev/null + ail_syncdb 2>/dev/null + chsmack -a '*' $D${prefix}/dbspace/.app_info.db* + + +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig + if [ $1 == 0 ]; then + rm -f $D${prefix}/dbspace/.app_info.db* + fi + +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " ail " +PACKAGES += " ail-dev " + +ail_files = "" +ail_files += "${prefix}/bin/ail_createdb" +ail_files += "${prefix}/bin/ail_createdb_user" +ail_files += "${prefix}/bin/ail_syncdb" +ail_files += "${prefix}/bin/ail_syncdb_user" +ail_files += "${prefix}/bin/ail_initdb" +ail_files += "${prefix}/bin/ail_initdb_user" +ail_files += "${prefix}/bin/ail_fota" +ail_files += "${prefix}/bin/ail_desktop" +ail_files += "${prefix}/bin/ail_filter" +ail_files += "${prefix}/bin/ail_list" +ail_files += "${prefix}/bin/ail_package" +ail_files += "${prefix}/share/install-info/*" +ail_files += "${prefix}/lib/libail.so.0" +ail_files += "${prefix}/lib/libail.so.0.1.0" +MANIFESTFILES_${PN} = "ail.manifest" + +ail-dev_files = "" +ail-dev_files += "${prefix}/include/ail.h" +ail-dev_files += "${prefix}/lib/libail.so" +ail-dev_files += "${prefix}/lib/pkgconfig/ail.pc" +MANIFESTFILES_${PN}-dev = "ail.manifest" + +FILES_${PN} = "${ail_files}" +FILES_${PN}-dev = "${ail-dev_files}" + +PKG_ail= "ail" +PKG_ail-dev= "ail-dev" + +require ail-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/ail/ail_git.bb b/meta-application-manager/recipes-application-framework/ail/ail_git.bb new file mode 100644 index 0000000..2868128 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/ail/ail_git.bb @@ -0,0 +1,10 @@ +require ail.inc + +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" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/ail/files/remove-dlog-for-native-build.patch b/meta-application-manager/recipes-application-framework/ail/files/remove-dlog-for-native-build.patch new file mode 100644 index 0000000..e82ec08 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/ail/files/remove-dlog-for-native-build.patch @@ -0,0 +1,65 @@ +From a89241fbcf9ce188e59b7e55f833cd377356b19d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org> +Date: Tue, 26 Aug 2014 11:21:52 +0200 +Subject: [PATCH] Remove dlog for native build + +--- + CMakeLists.txt | 2 +- + initdb/CMakeLists.txt | 2 +- + src/ail_private.h | 2 +- + tool/CMakeLists.txt | 4 ++-- + 4 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2c3fafe..9adea33 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + + INCLUDE(FindPkgConfig) + +-pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 dlog db-util xdgmime vconf libtzplatform-config libsmack) ++pkg_check_modules(LPKGS REQUIRED glib-2.0 sqlite3 db-util xdgmime vconf libtzplatform-config libsmack) + STRING(REPLACE ";" " " EXTRA_CFLAGS "${LPKGS_CFLAGS}") + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden") + +diff --git a/src/ail_private.h b/src/ail_private.h +index efa2f66..28ed80c 100755 +--- a/src/ail_private.h ++++ b/src/ail_private.h +@@ -36,7 +36,7 @@ + #undef LOG_TAG + #define LOG_TAG "AIL" + +-#if 1 ++#if 0 + #include <dlog.h> + #define _E(fmt, arg...) LOGE("[%s,%d] "fmt,__FUNCTION__,__LINE__,##arg) + #define _D(fmt, arg...) LOGD("[%s,%d] "fmt,__FUNCTION__,__LINE__,##arg) +diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt +index e898c7e..e0dd903 100755 +--- a/tool/CMakeLists.txt ++++ b/tool/CMakeLists.txt +@@ -15,7 +15,7 @@ SET(FILTERSRCS src/ail_filter.c) + SET(PKG ail_package) + SET(PKGSRCS src/ail_package.c) + +-pkg_check_modules(INITDB_PKGS REQUIRED libsmack vconf dlog db-util sqlite3) ++pkg_check_modules(INITDB_PKGS REQUIRED libsmack vconf db-util sqlite3) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src) + + + +diff --git a/ail.pc.in b/ail.pc.in +index a267813..33cbc37 100644 +--- a/ail.pc.in ++++ b/ail.pc.in +@@ -6,6 +6,6 @@ includedir=@INCLUDEDIR@ + Name: ail + Description: Application Information Library + Version: @VERSION@ +-Requires: sqlite3 vconf dlog db-util ++Requires: sqlite3 vconf db-util + Libs: -L@LIBDIR@ -lail @PC_LIB@ + Cflags: -I@INCLUDEDIR@ diff --git a/meta-application-manager/recipes-application-framework/app-checker/app-checker-extraconf.inc b/meta-application-manager/recipes-application-framework/app-checker/app-checker-extraconf.inc new file mode 100644 index 0000000..d5fd0cd --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-checker/app-checker-extraconf.inc @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/app-checker:" + +SRC_URI += "file://0001-yocto-Correct-libdl-linking-issue.patch" +SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch" + +DEPENDS_remove_class-native = "dlog-native" + +export LDFLAGS_append_class-native = " -ldl" + +DEPENDS += "binutils-native"
\ No newline at end of file diff --git a/meta-application-manager/recipes-application-framework/app-checker/app-checker.inc b/meta-application-manager/recipes-application-framework/app-checker/app-checker.inc new file mode 100644 index 0000000..441db99 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-checker/app-checker.inc @@ -0,0 +1,179 @@ +DESCRIPTION = "App Checker" +HOMEPAGE = "http://nohomepage.org" +SECTION = "System/Libraries" +LICENSE = "Apache-2.0" +PV = "0.0.16" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by app-checker-server-dev +PROVIDES += "app-checker-server-dev" + + +#PROVIDES by app-checker-dev +PROVIDES += "app-checker-dev" + + +#PROVIDES by app-checker + + +#PROVIDES by app-checker-server +PROVIDES += "app-checker-server" + + +RDEPENDS = "" +#RDEPENDS of app-checker-server-dev (${PN}-server-dev) +RDEPENDS_${PN}-server-dev += "app-checker-server" + +#RDEPENDS of app-checker-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "app-checker" + +#RDEPENDS of app-checker-server (${PN}-server) +RDEPENDS_${PN}-server += "app-checker" + + +DEPENDS = "" +#DEPENDS of app-checker +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 + cp ${S}/packaging/app-checker.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} + + rm -rf ${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}${prefix}/lib/ac-plugins + + mkdir -p ${D}/usr/share/license + cp LICENSE ${D}/usr/share/license/app-checker + cp LICENSE ${D}/usr/share/license/app-checker-devel + cp LICENSE ${D}/usr/share/license/app-checker-server + cp LICENSE ${D}/usr/share/license/app-checker-server-devel + + +} + +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 += " app-checker-server-dev " +PACKAGES += " app-checker-server " +PACKAGES += " app-checker " +PACKAGES += " app-checker-dev " + +app-checker-server-dev_files = "" +app-checker-server-dev_files += "${prefix}/lib/libapp-checker-server.so" +app-checker-server-dev_files += "${prefix}/lib/pkgconfig/app-checker-server.pc" +app-checker-server-dev_files += "${prefix}/include/app-checker/app-checker-server.h" +app-checker-server-dev_files += "/usr/share/license/app-checker-server-devel" +MANIFESTFILES_${PN}-server-dev = "app-checker.manifest" + +app-checker-server_files = "" +app-checker-server_files += "${prefix}/lib/libapp-checker-server.so.0" +app-checker-server_files += "${prefix}/lib/libapp-checker-server.so.0.1.0" +app-checker-server_files += "/usr/share/license/app-checker-server" +MANIFESTFILES_${PN}-server = "app-checker.manifest" + +app-checker_files = "" +app-checker_files += "${prefix}/lib/libapp-checker.so.0" +app-checker_files += "${prefix}/lib/libapp-checker.so.0.1.0" +app-checker_files += "${prefix}/lib/ac-plugins" +app-checker_files += "/usr/share/license/app-checker" +MANIFESTFILES_${PN} = "app-checker.manifest" + +app-checker-dev_files = "" +app-checker-dev_files += "${prefix}/lib/libapp-checker.so" +app-checker-dev_files += "${prefix}/lib/pkgconfig/app-checker.pc" +app-checker-dev_files += "${prefix}/include/app-checker/app-checker.h" +app-checker-dev_files += "/usr/share/license/app-checker-devel" +MANIFESTFILES_${PN}-dev = "app-checker.manifest" + +FILES_${PN}-server-dev = "${app-checker-server-dev_files}" +FILES_${PN}-server = "${app-checker-server_files}" +FILES_${PN} = "${app-checker_files}" +FILES_${PN}-dev = "${app-checker-dev_files}" + +PKG_app-checker-server-dev= "app-checker-server-dev" +PKG_app-checker-server= "app-checker-server" +PKG_app-checker= "app-checker" +PKG_app-checker-dev= "app-checker-dev" + +require app-checker-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/app-checker/app-checker/0001-yocto-Correct-libdl-linking-issue.patch b/meta-application-manager/recipes-application-framework/app-checker/app-checker/0001-yocto-Correct-libdl-linking-issue.patch new file mode 100644 index 0000000..09f7f63 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-checker/app-checker/0001-yocto-Correct-libdl-linking-issue.patch @@ -0,0 +1,30 @@ +From 08d9a48423ff699e20eda48e07d78387f5aecb73 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org> +Date: Mon, 7 Jul 2014 14:01:46 +0200 +Subject: [PATCH] [yocto] Correct libdl linking issue +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Change-Id: Icedff39ddd6e458d0e567a519ba53ba51c5683b9 +Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org> +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 61416f8..a476415 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ INCLUDE(FindPkgConfig) + pkg_check_modules(pkgs REQUIRED dlog glib-2.0) + pkg_check_modules(libpkgs REQUIRED dlog glib-2.0) + +-FIND_LIBRARY(LIB_DL dl) ++FIND_LIBRARY(LIB_DL NAMES dl libdl.so.2) + + FOREACH(flag ${libpkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +-- +1.8.1.4 + diff --git a/meta-application-manager/recipes-application-framework/app-checker/app-checker/remove-dlog-for-native-build.patch b/meta-application-manager/recipes-application-framework/app-checker/app-checker/remove-dlog-for-native-build.patch new file mode 100644 index 0000000..d258faf --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-checker/app-checker/remove-dlog-for-native-build.patch @@ -0,0 +1,49 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 149d0a6..d77d931 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -21,10 +21,9 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") + # Set required packages + INCLUDE(FindPkgConfig) + +-pkg_check_modules(pkgs REQUIRED dlog glib-2.0) +-pkg_check_modules(libpkgs REQUIRED dlog glib-2.0) ++pkg_check_modules(pkgs REQUIRED glib-2.0) ++pkg_check_modules(libpkgs REQUIRED glib-2.0) + +-FIND_LIBRARY(LIB_DL NAMES dl libdl.so.2) + + FOREACH(flag ${libpkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +@@ -79,7 +78,7 @@ add_library(${DAEMON_NAME} SHARED + src/ac_sock.c + ) + +-target_link_libraries(${DAEMON_NAME} ${pkgs_LDFLAGS} ${LIB_DL}) ++target_link_libraries(${DAEMON_NAME} ${pkgs_LDFLAGS} ) + SET_TARGET_PROPERTIES(${DAEMON_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR}) + SET_TARGET_PROPERTIES(${DAEMON_NAME} PROPERTIES VERSION ${VERSION}) + +diff --git a/include/internal.h b/include/internal.h +index 731263d..9bdc438 100755 +--- a/include/internal.h ++++ b/include/internal.h +@@ -25,7 +25,6 @@ +
+ #include <unistd.h>
+ #include <ctype.h>
+-#include <dlog.h>
+
+ #undef LOG_TAG
+ #define LOG_TAG "APP_CHECKER" +@@ -39,8 +38,8 @@ struct ac_data { + int pid;
+ };
+
+-#define _E(fmt, arg...) LOGE(fmt,##arg) +-#define _D(fmt, arg...) LOGD(fmt,##arg) ++#define _E(fmt, arg...) //LOGE(fmt,##arg) ++#define _D(fmt, arg...) //LOGD(fmt,##arg) +
+ #define retvm_if(expr, val, fmt, arg...) do { \
+ if(expr) { \
diff --git a/meta-application-manager/recipes-application-framework/app-checker/app-checker_git.bb b/meta-application-manager/recipes-application-framework/app-checker/app-checker_git.bb new file mode 100644 index 0000000..22b4790 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-checker/app-checker_git.bb @@ -0,0 +1,10 @@ +require app-checker.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/app-checker;tag=70200243a1e419ff81a30fa8a436571422a33a3d;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/app-core/app-core-extraconf.inc b/meta-application-manager/recipes-application-framework/app-core/app-core-extraconf.inc new file mode 100644 index 0000000..38efefe --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-core/app-core-extraconf.inc @@ -0,0 +1,8 @@ +app-core-common_files += "app-core.manifest" +app-core-common_files += "/lib/libappcore-common.so.*" +app-core-common_files += "/lib/systemd/user/core-efl.target" +app-core-common_files += "/lib/systemd/user/core-efl.target.wants/" +app-core-common_files += "/usr/share/license/app-core" + +SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch" +DEPENDS_remove_class-native = "dlog-native"
\ No newline at end of file diff --git a/meta-application-manager/recipes-application-framework/app-core/app-core.inc b/meta-application-manager/recipes-application-framework/app-core/app-core.inc new file mode 100644 index 0000000..8762a2a --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-core/app-core.inc @@ -0,0 +1,209 @@ +DESCRIPTION = "Application basic" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Application Framework/Libraries" +LICENSE = "Apache-2.0" +PV = "1.2" + +SRC_URI = " file://0001-hack-window-hide.patch " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by app-core-efl +PROVIDES += "app-core-efl" + + +#PROVIDES by app-core-template +PROVIDES += "app-core-template" + + +#PROVIDES by app-core + + +#PROVIDES by app-core-common-dev +PROVIDES += "app-core-common-dev" + + +#PROVIDES by app-core-common +PROVIDES += "app-core-common" + + +#PROVIDES by app-core-efl-dev +PROVIDES += "app-core-efl-dev" + + +RDEPENDS = "" +#RDEPENDS of app-core-efl (${PN}-efl) +RDEPENDS_${PN}-efl += "glibc" + +#RDEPENDS of app-core-common-dev (${PN}-common-dev) +RDEPENDS_${PN}-common-dev += "elementary" +RDEPENDS_${PN}-common-dev += "sensor" +RDEPENDS_${PN}-common-dev += "app-core-common" +RDEPENDS_${PN}-common-dev += "vconf" +RDEPENDS_${PN}-common-dev += "aul" + +#RDEPENDS of app-core-common (${PN}-common) +RDEPENDS_${PN}-common += "glibc" + +#RDEPENDS of app-core-efl-dev (${PN}-efl-dev) +RDEPENDS_${PN}-efl-dev += "app-core-efl" +RDEPENDS_${PN}-efl-dev += "app-core-common-dev" + + +DEPENDS = "" +#DEPENDS of app-core +DEPENDS += "librua" +inherit tizen_cmake +DEPENDS += "tizen-platform-config" +DEPENDS += "aul" +DEPENDS += "dlog" +inherit pkgconfig +DEPENDS += "elementary" +DEPENDS += "ecore" +DEPENDS += "glib-2.0" +DEPENDS += "sensor" +DEPENDS += "vconf" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/app-core.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} . \ + -Dwith_wayland=TRUE\ + -DENABLE_GTK=OFF + + make ${PARALLEL_MAKE} + + + + +} + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${D} + + rm -rf ${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 -- + install -d ${D}${prefix}/lib/systemd/user/core-efl.target.wants + install -m0644 ${S}/packaging/core-efl-wayland.target ${D}${prefix}/lib/systemd/user/core-efl.target + + + +} + +pkg_postinst_app-core-common() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postinst_app-core-efl() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_app-core-efl() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_app-core-common() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " app-core-efl-dev " +PACKAGES += " app-core-efl " +PACKAGES += " app-core-common " +PACKAGES += " app-core-common-dev " + +app-core-efl-dev_files = "" +app-core-efl-dev_files += "${prefix}/include/appcore/appcore-efl.h" +app-core-efl-dev_files += "${prefix}/lib/libappcore-efl.so" +app-core-efl-dev_files += "${prefix}/lib/pkgconfig/appcore-efl.pc" +MANIFESTFILES_${PN}-efl-dev = "app-core.manifest" + +app-core-efl_files = "" +app-core-efl_files += "${prefix}/lib/libappcore-efl.so.*" +MANIFESTFILES_${PN}-efl = "app-core.manifest" + +app-core-common_files = "" +app-core-common_files += "${prefix}/lib/libappcore-common.so.*" +app-core-common_files += "${prefix}/lib/systemd/user/core-efl.target" +app-core-common_files += "${prefix}/lib/systemd/user/core-efl.target.wants/" +MANIFESTFILES_${PN}-common = "app-core.manifest" + +app-core-common-dev_files = "" +app-core-common-dev_files += "${prefix}/lib/libappcore-common.so" +app-core-common-dev_files += "${prefix}/lib/pkgconfig/appcore-common.pc" +app-core-common-dev_files += "${prefix}/include/appcore/appcore-common.h" +app-core-common-dev_files += "${prefix}/include/SLP_Appcore_PG.h" +MANIFESTFILES_${PN}-common-dev = "app-core.manifest" + +FILES_${PN}-efl-dev = "${app-core-efl-dev_files}" +FILES_${PN}-efl = "${app-core-efl_files}" +FILES_${PN}-common = "${app-core-common_files}" +FILES_${PN}-common-dev = "${app-core-common-dev_files}" + +PKG_app-core-efl-dev= "app-core-efl-dev" +PKG_app-core-efl= "app-core-efl" +PKG_app-core-common= "app-core-common" +PKG_app-core-common-dev= "app-core-common-dev" + +require app-core-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/app-core/app-core_git.bb b/meta-application-manager/recipes-application-framework/app-core/app-core_git.bb new file mode 100644 index 0000000..ba7ec7f --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-core/app-core_git.bb @@ -0,0 +1,10 @@ +require app-core.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/app-core;tag=d86d0066b93cf402badc408de591e54d6db6c164;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch b/meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch new file mode 100644 index 0000000..69e904d --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-core/files/0001-hack-window-hide.patch @@ -0,0 +1,88 @@ +--- a/src/appcore-efl.c ++++ b/src/appcore-efl.c +@@ -610,7 +610,7 @@ + static Eina_Bool __show_cb(void *data, int type, void *event) + { + #ifdef WAYLAND +- Ecore_Wl_Event_Window_Activate *ev; ++ /*Ecore_Wl_Event_Window_Activate *ev; + + ev = event; + +@@ -618,14 +618,14 @@ + { + // This is child window. Skip!!! + return ECORE_CALLBACK_PASS_ON; +- } ++ }*/ + +- _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!. WIN:%x\n", ev->win); ++ _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!.\n"); + +- if (!__exist_win((unsigned int)ev->win)) ++ /*if (!__exist_win((unsigned int)ev->win)) + __add_win((unsigned int)ev->win); + else +- __update_win((unsigned int)ev->win, FALSE); ++ __update_win((unsigned int)ev->win, FALSE);*/ + + __visibility_cb(data, type, event); + #else +@@ -661,14 +661,14 @@ + static Eina_Bool __hide_cb(void *data, int type, void *event) + { + #ifdef WAYLAND +- Ecore_Wl_Event_Window_Deactivate *ev; ++ //Ecore_Wl_Event_Window_Deactivate *ev; + int bvisibility = 0; + +- ev = event; ++ //ev = event; + +- _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!. WIN:%x\n", ev->win); ++ _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!.\n"); + +- if (__exist_win((unsigned int)ev->win)) { ++ /*if (__exist_win((unsigned int)ev->win)) { + __delete_win((unsigned int)ev->win); + + bvisibility = __check_visible(); +@@ -677,7 +677,7 @@ + b_active = 0; + __do_app(AE_PAUSE, data, NULL); + } +- } ++ }*/ + #else + Ecore_X_Event_Window_Hide *ev; + int bvisibility = 0; +@@ -704,12 +704,12 @@ + static Eina_Bool __visibility_cb(void *data, int type, void *event) + { + #ifdef WAYLAND +- Ecore_Wl_Event_Window_Activate *ev; ++ //Ecore_Wl_Event_Window_Activate *ev; + int bvisibility = 0; + +- ev = event; ++ //ev = event; + +- __update_win((unsigned int)ev->win, ev->fobscured); ++ //__update_win((unsigned int)ev->win, ev->fobscured); + #else + Ecore_X_Event_Window_Visibility_Change *ev; + int bvisibility = 0; +@@ -777,10 +777,10 @@ + { + _ret_if(ui == NULL); + #ifdef WAYLAND +- ui->hshow = ++ /*ui->hshow = + ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_ACTIVATE, __show_cb, ui); + ui->hhide = +- ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_DEACTIVATE, __hide_cb, ui); ++ ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_DEACTIVATE, __hide_cb, ui);*/ + #else + atom_parent = ecore_x_atom_get("_E_PARENT_BORDER_WINDOW"); + if (!atom_parent) + diff --git a/meta-application-manager/recipes-application-framework/app-core/files/remove-dlog-for-native-build.patch b/meta-application-manager/recipes-application-framework/app-core/files/remove-dlog-for-native-build.patch new file mode 100644 index 0000000..0199c60 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-core/files/remove-dlog-for-native-build.patch @@ -0,0 +1,326 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index fd053b7..2403d3d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -26,17 +26,14 @@ SET(APPCORE_COMMON "appcore-common") + SET(SRCS_common src/appcore.c src/appcore-i18n.c src/appcore-measure.c src/appcore-rotation.c) + + IF (with_wayland) +- ADD_DEFINITIONS("-DWAYLAND") + ENDIF (with_wayland) + IF (with_x11) +- ADD_DEFINITIONS("-DX11") +- SET(SRCS_common ${SRCS_common} src/appcore-X.c) + ENDIF (with_wayland) + + SET(HEADERS_common appcore-common.h) + + INCLUDE(FindPkgConfig) +-SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul dlog libtzplatform-config ecore") ++SET(APPCORE_PKG_CHECK_MODULES "vconf sensor aul libtzplatform-config ecore") + IF (with_x11) + SET(APPCORE_PKG_CHECK_MODULES "${APPCORE_PKG_CHECK_MODULES} x11 ecore-x") + ENDIF (with_x11) +@@ -75,7 +72,7 @@ SET(SRCS_efl src/appcore-efl.c) + SET(HEADERS_efl appcore-efl.h) + + INCLUDE(FindPkgConfig) +-SET(APPCORE_PKG_CHECK_MODULES2 "elementary dlog ecore gobject-2.0 glib-2.0 aul") ++SET(APPCORE_PKG_CHECK_MODULES2 "elementary ecore gobject-2.0 glib-2.0 aul") + IF (with_x11) + SET(APPCORE_PKG_CHECK_MODULES2 "${APPCORE_PKG_CHECK_MODULES2} ecore-x") + ENDIF (with_x11) +diff --git a/include/appcore-internal.h b/include/appcore-internal.h +index 038e2dc..8d8bcab 100755 +--- a/include/appcore-internal.h ++++ b/include/appcore-internal.h +@@ -27,7 +27,7 @@ + #define LOG_TAG "APP_CORE" + + #include <stdio.h> +-#include <dlog.h> ++ + #include "appcore-common.h" + + +diff --git a/src/appcore-efl.c b/src/appcore-efl.c +index 9ef5f96..9b61ee0 100644 +--- a/src/appcore-efl.c ++++ b/src/appcore-efl.c +@@ -369,13 +369,13 @@ static void __do_app(enum app_event event, void *data, bundle * b) + switch (event) { + case AE_RESET: + _DBG("[APP %d] RESET", _pid); +- LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:start]", +- ui->name); ++ //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:start]", ++ // ui->name); + if (ui->ops->reset) + r = ui->ops->reset(b, ui->ops->data); + ui->state = AS_RUNNING; +- LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:done]", +- ui->name); ++ //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:reset:done]", ++ // ui->name); + break; + case AE_PAUSE: + if (ui->state == AS_RUNNING) { +@@ -392,8 +392,8 @@ static void __do_app(enum app_event event, void *data, bundle * b) + _inform_backgrd(); + break; + case AE_RESUME: +- LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:resume:start]", +- ui->name); ++ //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:resume:start]", ++ // ui->name); + if (ui->state == AS_PAUSED || tmp_val == 1) { + _DBG("[APP %d] RESUME", _pid); + if (ui->ops->resume) +@@ -403,10 +403,10 @@ static void __do_app(enum app_event event, void *data, bundle * b) + } + /*TODO : rotation start*/ + //r = appcore_resume_rotation_cb(); +- LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:resume:done]", +- ui->name); +- LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:Launching:done]", +- ui->name); ++ //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:resume:done]", ++ // ui->name); ++ //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:Launching:done]", ++ // ui->name); + _inform_foregrd(); + + break; +@@ -609,131 +609,17 @@ Ecore_X_Atom atom_parent; + + static Eina_Bool __show_cb(void *data, int type, void *event) + { +-#ifdef WAYLAND +- Ecore_Wl_Event_Window_Activate *ev; +- +- ev = event; +- +- if (ev->parent_win != 0) +- { +- // This is child window. Skip!!! +- return ECORE_CALLBACK_PASS_ON; +- } +- +- _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!. WIN:%x\n", ev->win); +- +- if (!__exist_win((unsigned int)ev->win)) +- __add_win((unsigned int)ev->win); +- else +- __update_win((unsigned int)ev->win, FALSE); +- +- __visibility_cb(data, type, event); +-#else +- Ecore_X_Event_Window_Show *ev; +- int ret; +- Ecore_X_Window parent; +- +- ev = event; +- +- ret = ecore_x_window_prop_window_get(ev->win, atom_parent, &parent, 1); +- if (ret != 1) +- { +- // This is child window. Skip!!! +- return ECORE_CALLBACK_PASS_ON; +- } +- +- _DBG("[EVENT_TEST][EVENT] GET SHOW EVENT!!!. WIN:%x\n", ev->win); +- +- if (!__exist_win((unsigned int)ev->win)) { +- /* WM_ROTATE */ +- if ((priv.wm_rot_supported) && (1 == priv.rot_started)) { +- __set_wm_rotation_support(ev->win, 1); +- } +- __add_win((unsigned int)ev->win); +- } +- else +- __update_win((unsigned int)ev->win, FALSE); +-#endif +- + return ECORE_CALLBACK_RENEW; + } + + static Eina_Bool __hide_cb(void *data, int type, void *event) + { +-#ifdef WAYLAND +- Ecore_Wl_Event_Window_Deactivate *ev; +- int bvisibility = 0; +- +- ev = event; +- +- _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!. WIN:%x\n", ev->win); +- +- if (__exist_win((unsigned int)ev->win)) { +- __delete_win((unsigned int)ev->win); +- +- bvisibility = __check_visible(); +- if (!bvisibility && b_active == 1) { +- _DBG(" Go to Pasue state \n"); +- b_active = 0; +- __do_app(AE_PAUSE, data, NULL); +- } +- } +-#else +- Ecore_X_Event_Window_Hide *ev; +- int bvisibility = 0; +- +- ev = event; +- +- _DBG("[EVENT_TEST][EVENT] GET HIDE EVENT!!!. WIN:%x\n", ev->win); +- +- if (__exist_win((unsigned int)ev->win)) { +- __delete_win((unsigned int)ev->win); +- +- bvisibility = __check_visible(); +- if (!bvisibility && b_active == 1) { +- _DBG(" Go to Pasue state \n"); +- b_active = 0; +- __do_app(AE_PAUSE, data, NULL); +- } +- } +-#endif +- + return ECORE_CALLBACK_RENEW; + } + + static Eina_Bool __visibility_cb(void *data, int type, void *event) + { +-#ifdef WAYLAND +- Ecore_Wl_Event_Window_Activate *ev; +- int bvisibility = 0; +- +- ev = event; +- +- __update_win((unsigned int)ev->win, ev->fobscured); +-#else +- Ecore_X_Event_Window_Visibility_Change *ev; +- int bvisibility = 0; +- +- ev = event; +- +- __update_win((unsigned int)ev->win, ev->fully_obscured); +-#endif +- bvisibility = __check_visible(); +- +- if (bvisibility && b_active == 0) { +- _DBG(" Go to Resume state\n"); +- b_active = 1; +- __do_app(AE_RESUME, data, NULL); +- +- } else if (!bvisibility && b_active == 1) { +- _DBG(" Go to Pasue state \n"); +- b_active = 0; +- __do_app(AE_PAUSE, data, NULL); +- } else +- _DBG(" No change state \n"); +- + return ECORE_CALLBACK_RENEW; +- + } + + #ifdef X11 +@@ -776,35 +662,7 @@ static Eina_Bool __cmsg_cb(void *data, int type, void *event) + static void __add_climsg_cb(struct ui_priv *ui) + { + _ret_if(ui == NULL); +-#ifdef WAYLAND +- ui->hshow = +- ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_ACTIVATE, __show_cb, ui); +- ui->hhide = +- ecore_event_handler_add(ECORE_WL_EVENT_WINDOW_DEACTIVATE, __hide_cb, ui); +-#else +- atom_parent = ecore_x_atom_get("_E_PARENT_BORDER_WINDOW"); +- if (!atom_parent) +- { +- // Do Error Handling +- } +- +- ui->hshow = +- ecore_event_handler_add(ECORE_X_EVENT_WINDOW_SHOW, __show_cb, ui); +- ui->hhide = +- ecore_event_handler_add(ECORE_X_EVENT_WINDOW_HIDE, __hide_cb, ui); +- ui->hvchange = +- ecore_event_handler_add(ECORE_X_EVENT_WINDOW_VISIBILITY_CHANGE, +- __visibility_cb, ui); + +- /* Add client message callback for WM_ROTATE */ +- if(!__check_wm_rotation_support()) +- { +- ui->hcmsg = +- ecore_event_handler_add(ECORE_X_EVENT_CLIENT_MESSAGE, __cmsg_cb, ui); +- ui->wm_rot_supported = 1; +- appcore_set_wm_rotation(&wm_rotate); +- } +-#endif + } + + static int __before_loop(struct ui_priv *ui, int *argc, char ***argv) +@@ -848,7 +706,7 @@ static int __before_loop(struct ui_priv *ui, int *argc, char ***argv) + r = appcore_init(ui->name, &efl_ops, *argc, *argv); + _retv_if(r == -1, -1); + +- LOG(LOG_DEBUG, "LAUNCH", "[%s:Platform:appcore_init:done]", ui->name); ++ //LOG(LOG_DEBUG, "LAUNCH", "[%s:Platform:appcore_init:done]", ui->name); + if (ui->ops && ui->ops->create) { + r = ui->ops->create(ui->ops->data); + if (r == -1) { +@@ -857,8 +715,8 @@ static int __before_loop(struct ui_priv *ui, int *argc, char ***argv) + errno = ECANCELED; + return -1; + } +- LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:create:done]", +- ui->name); ++ //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:create:done]", ++ // ui->name); + } + ui->state = AS_CREATED; + +@@ -1014,7 +872,7 @@ EXPORT_API int appcore_efl_main(const char *name, int *argc, char ***argv, + { + int r; + +- LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:main:done]", name); ++ //LOG(LOG_DEBUG, "LAUNCH", "[%s:Application:main:done]", name); + + r = __set_data(&priv, name, ops); + _retv_if(r == -1, -1); +diff --git a/appcore-common-wayland.pc.in b/appcore-common-wayland.pc.in +index 1b9e47d..82df9b0 100644 +--- a/appcore-common-wayland.pc.in ++++ b/appcore-common-wayland.pc.in +@@ -8,6 +8,6 @@ includedir=@INCLUDEDIR@ + Name: app-core-common + Description: SAMSUNG Linux platform application library + Version: @VERSION@ +-Requires: sensor vconf aul dlog ++Requires: sensor vconf aul + Libs: -L${libdir} -lappcore-common + Cflags: -I${includedir} -I${includedir}/appcore +diff --git a/appcore-common-x.pc.in b/appcore-common-x.pc.in +index f9b1519..b51804b 100644 +--- a/appcore-common-x.pc.in ++++ b/appcore-common-x.pc.in +@@ -8,6 +8,6 @@ includedir=@INCLUDEDIR@ + Name: app-core-common + Description: SAMSUNG Linux platform application library + Version: @VERSION@ +-Requires: sensor vconf aul dlog x11 ++Requires: sensor vconf aul x11 + Libs: -L${libdir} -lappcore-common + Cflags: -I${includedir} -I${includedir}/appcore +diff --git a/appcore-efl.pc.in b/appcore-efl.pc.in +index 741428e..d6c2526 100644 +--- a/appcore-efl.pc.in ++++ b/appcore-efl.pc.in +@@ -8,6 +8,6 @@ includedir=@INCLUDEDIR@ + Name: app-core-efl + Description: SAMSUNG Linux platform efl application library + Version: @VERSION@ +-Requires: elementary appcore-common dlog ++Requires: elementary appcore-common + Libs: -L${libdir} -lappcore-efl + Cflags: -I${includedir} -I${includedir}/appcore diff --git a/meta-application-manager/recipes-application-framework/app-svc/app-svc-extraconf.inc b/meta-application-manager/recipes-application-framework/app-svc/app-svc-extraconf.inc new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-svc/app-svc-extraconf.inc diff --git a/meta-application-manager/recipes-application-framework/app-svc/app-svc.inc b/meta-application-manager/recipes-application-framework/app-svc/app-svc.inc new file mode 100644 index 0000000..4171e23 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-svc/app-svc.inc @@ -0,0 +1,157 @@ +DESCRIPTION = "Application Service" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Application Framework/Service" +LICENSE = "Apache-2.0" +PV = "0.1.53" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by app-svc + + +#PROVIDES by app-svc-dev +PROVIDES += "app-svc-dev" + + +RDEPENDS = "" +#RDEPENDS of app-svc (${PN}) +RDEPENDS_${PN} += "glibc" + +#RDEPENDS of app-svc-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "app-svc" + + +DEPENDS = "" +#DEPENDS of app-svc +DEPENDS += "pkgmgr-info" +DEPENDS += "libsoup-2.4" +inherit tizen_cmake +DEPENDS += "iniparser" +DEPENDS += "tizen-platform-config" +inherit pkgconfig +DEPENDS += "dlog" +DEPENDS += "aul" +DEPENDS += "xdgmime" +DEPENDS += "ail" +DEPENDS += "bundle" +DEPENDS += "sqlite3" +DEPENDS += "ecore" +DEPENDS += "libprivilege-control" +DEPENDS += "glib-2.0" +DEPENDS += "dbus-glib" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + sed -i ${S}/packaging/app-svc.manifest -e "s|TZ_SYS_DB|${prefix}/dbspace|g" + cp ${S}/packaging/app-svc.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} . \ + -Dwith_wayland=TRUE + + 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 -- + + # Create database + mkdir -p ${D}${prefix}/dbspace + sqlite3 ${D}${prefix}/dbspace/.appsvc.db < data/appsvc_db.sql + + +} + +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 += " app-svc " +PACKAGES += " app-svc-dev " + +app-svc_files = "" +app-svc_files += "%verify(not md5 mtime size) %attr(664,root,users) ${prefix}/dbspace/.appsvc.db" +app-svc_files += "%verify(not md5 mtime size) %attr(664,root,users) ${prefix}/dbspace/.appsvc.db-journal" +app-svc_files += "${prefix}/bin/appsvc_test" +app-svc_files += "${prefix}/lib/libappsvc.so.0" +app-svc_files += "${prefix}/lib/libappsvc.so.0.1.0" +MANIFESTFILES_${PN} = "app-svc.manifest" + +app-svc-dev_files = "" +app-svc-dev_files += "${prefix}/lib/pkgconfig/appsvc.pc" +app-svc-dev_files += "${prefix}/lib/libappsvc.so" +app-svc-dev_files += "${prefix}/include/appsvc/appsvc.h" +MANIFESTFILES_${PN}-dev = "app-svc.manifest" + +FILES_${PN} = "${app-svc_files}" +FILES_${PN}-dev = "${app-svc-dev_files}" + +PKG_app-svc= "app-svc" +PKG_app-svc-dev= "app-svc-dev" + +require app-svc-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/app-svc/app-svc_git.bb b/meta-application-manager/recipes-application-framework/app-svc/app-svc_git.bb new file mode 100644 index 0000000..66651b1 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/app-svc/app-svc_git.bb @@ -0,0 +1,10 @@ +require app-svc.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/app-svc;tag=859ec161b49125408a7c74cacc29e78ad27d9a3c;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/aul/aul-extraconf.inc b/meta-application-manager/recipes-application-framework/aul/aul-extraconf.inc new file mode 100644 index 0000000..65d4b2a --- /dev/null +++ b/meta-application-manager/recipes-application-framework/aul/aul-extraconf.inc @@ -0,0 +1,30 @@ +do_prep_append() { + sed -i 's!/usr/bin/mkdir -p!/bin/mkdir -p!g' ${S}/packaging/ac.service + # preload_list.txt and preexec_list.txt are generated from .in files so they are located in the build directory instead of the source one + sed -i 's@INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/legacy/preload_list.txt DESTINATION /usr/share/aul )@INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/legacy/preload_list.txt DESTINATION /usr/share/aul )@' ${S}/CMakeLists.txt + sed -i 's@INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/feature/preexec_list.txt DESTINATION /usr/share/aul )@INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/feature/preexec_list.txt DESTINATION /usr/share/aul )@' ${S}/CMakeLists.txt +} + +SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch" +aul_files += "${prefix}/share/aul/mida_db.sql" + + +RDEPENDS_${PN}_remove_class-native = "systemd-native" +RDEPENDS_${PN}_remove_class-native = "glibc-native" + +DEPENDS_remove_class-native = "dlog-native" + +EXTRA_OECMAKE+="-DCMAKE_AR:PATH=ar" + +do_install_append() { + + mkdir -p ${D}${prefix}/lib/systemd/user/default.target.wants + ln -s ../amd_session_agent.service ${D}${prefix}/lib/systemd/user/default.target.wants/amd_session_agent.service + + mkdir -p ${D}${systemd_unitdir}/system/default.target.wants + ln -s ../ac.service ${D}${systemd_unitdir}/system/default.target.wants/ac.service + +} + +FILES_${PN} += "${prefix}/lib/systemd/user/default.target.wants/amd_session_agent.service" +FILES_${PN} += "${systemd_unitdir}/system/default.target.wants/ac.service"
\ No newline at end of file diff --git a/meta-application-manager/recipes-application-framework/aul/aul.inc b/meta-application-manager/recipes-application-framework/aul/aul.inc new file mode 100644 index 0000000..366e59d --- /dev/null +++ b/meta-application-manager/recipes-application-framework/aul/aul.inc @@ -0,0 +1,222 @@ +DESCRIPTION = "App utility library" +HOMEPAGE = "http://nohomepage.org" +SECTION = "System/Libraries" +LICENSE = "Apache-2.0" +PV = "0.0.300" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by aul + + +#PROVIDES by aul-dev +PROVIDES += "aul-dev" + + +#PROVIDES by aul-test +PROVIDES += "aul-test" + + +RDEPENDS = "" +#RDEPENDS of aul (${PN}) +RDEPENDS_${PN} += "glibc" +RDEPENDS_${PN} += "systemd" + +#RDEPENDS of aul-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "aul" + +#RDEPENDS of aul-test (${PN}-test) +RDEPENDS_${PN}-test += "aul" + + +DEPENDS = "" +#DEPENDS of aul +DEPENDS += "pkgmgr-info" +DEPENDS += "librua" +inherit tizen_cmake +DEPENDS += "attr" +DEPENDS += "tizen-platform-config" +DEPENDS += "privacy-manager-server" +inherit pkgconfig +DEPENDS += "bundle" +DEPENDS += "ail" +DEPENDS += "smack" +DEPENDS += "dlog" +DEPENDS += "sqlite3" +DEPENDS += "xdgmime" +DEPENDS += "libprivilege-control" +DEPENDS += "app-checker" +DEPENDS += "vconf" +DEPENDS += "dbus-glib" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + sed -i 's|TZ_SYS_DB|${prefix}/dbspace|g' ${S}/packaging/aul.manifest + cp ${S}/packaging/aul.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} . + oe_runmake ${PARALLEL_MAKE} + + + +} + +do_install() { + export RPM_BUILD_ROOT=${D} + cd ${S} + LANG=C + export LANG + unset DISPLAY + rm -rf ${D} + mkdir -p ${D} + + rm -rf ${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}${sysconfdir}/init.d + install -m 755 launchpad_run ${D}${sysconfdir}/init.d + + mkdir -p ${D}${sysconfdir}/rc.d/rc3.d + mkdir -p ${D}${sysconfdir}/rc.d/rc4.d + ln -sf ../../init.d/launchpad_run ${D}/${sysconfdir}/rc.d/rc3.d/S34launchpad_run + ln -sf ../../init.d/launchpad_run ${D}/${sysconfdir}/rc.d/rc4.d/S80launchpad_run + + mkdir -p ${D}${prefix}/dbspace + sqlite3 ${D}${prefix}/dbspace/.mida.db < ${D}${prefix}/share/aul/mida_db.sql + rm -rf ${D}${prefix}/share/aul/mida_db.sql + + mkdir -p ${D}${systemd_unitdir}/system + mkdir -p ${D}${prefix}/lib/systemd/user + install -m 0644 ${S}/packaging/ac.service ${D}${systemd_unitdir}/system/ac.service + install -m 0644 ${S}/packaging/amd_session_agent.service ${D}${prefix}/lib/systemd/user/amd_session_agent.service + + +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig + systemctl enable ac + systemctl --global enable amd_session_agent + systemctl daemon-reload + if [ $1 == 1 ]; then + systemctl restart ac.service + fi + +} + +pkg_prerm_${PN}() { + #!/bin/sh -e + + if [ $1 == 0 ]; then + systemctl stop ac.service + systemctl disable ac + systemctl --global disable amd_session_agent + fi + +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig + systemctl daemon-reload + +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " aul " +PACKAGES += " aul-dev " +PACKAGES += " aul-test " + +aul_files = "" +aul_files += "${prefix}/lib/libaul.so.0" +aul_files += "${prefix}/lib/libaul.so.0.1.0" +aul_files += "${sysconfdir}/init.d/launchpad_run" +aul_files += "${sysconfdir}/rc.d/rc3.d/S34launchpad_run" +aul_files += "${sysconfdir}/rc.d/rc4.d/S80launchpad_run" +aul_files += "%attr(0644,root,users) ${prefix}/dbspace/.mida.db" +aul_files += "%attr(0644,root,users) ${prefix}/dbspace/.mida.db-journal" +aul_files += "${prefix}/bin/aul_mime.sh" +aul_files += "${prefix}/bin/aul_test" +aul_files += "${prefix}/bin/app_launcher" +aul_files += "${prefix}/bin/amd_session_agent" +aul_files += "${prefix}/share/aul/miregex/*" +aul_files += "${prefix}/share/aul/service/*" +aul_files += "${prefix}/share/aul/preload_list.txt" +aul_files += "${prefix}/share/aul/preexec_list.txt" +aul_files += "${systemd_unitdir}/system/ac.service" +aul_files += "${prefix}/lib/systemd/user/amd_session_agent.service" +aul_files += "${prefix}/bin/amd" +aul_files += "${prefix}/bin/daemon-manager-release-agent" +aul_files += "${prefix}/bin/daemon-manager-launch-agent" +MANIFESTFILES_${PN} = "aul.manifest" + +aul-dev_files = "" +aul-dev_files += "${prefix}/include/aul/*.h" +aul-dev_files += "${prefix}/lib/*.so" +aul-dev_files += "${prefix}/lib/pkgconfig/*.pc" + +aul-test_files = "" +aul-test_files += "${prefix}/bin/launch_app" +aul-test_files += "${prefix}/bin/open_app" +aul-test_files += "${prefix}/bin/aul_service.sh" +aul-test_files += "${prefix}/bin/aul_service_test.sh" + +FILES_${PN} = "${aul_files}" +FILES_${PN}-dev = "${aul-dev_files}" +FILES_${PN}-test = "${aul-test_files}" + +PKG_aul= "aul" +PKG_aul-dev= "aul-dev" +PKG_aul-test= "aul-test" + +require aul-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/aul/aul_git.bb b/meta-application-manager/recipes-application-framework/aul/aul_git.bb new file mode 100644 index 0000000..2816749 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/aul/aul_git.bb @@ -0,0 +1,10 @@ +require aul.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/aul-1;tag=ef7b405abf2577b9e5bf7aa24944e24552ca5b8e;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/aul/files/remove-dlog-for-native-build.patch b/meta-application-manager/recipes-application-framework/aul/files/remove-dlog-for-native-build.patch new file mode 100644 index 0000000..183eb6c --- /dev/null +++ b/meta-application-manager/recipes-application-framework/aul/files/remove-dlog-for-native-build.patch @@ -0,0 +1,393 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c99e444..2753a59 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,11 +19,11 @@ MESSAGE("Build type: ${CMAKE_BUILD_TYPE}") + + # Set required packages + INCLUDE(FindPkgConfig) +-SET(AUL-1_PKG_CHECK_MODULES dlog libprivilege-control app-checker rua glib-2.0 vconf pkgmgr-info privacy-manager-client) ++SET(AUL-1_PKG_CHECK_MODULES libprivilege-control app-checker rua glib-2.0 vconf pkgmgr-info privacy-manager-client) + pkg_check_modules(pkgs REQUIRED ${AUL-1_PKG_CHECK_MODULES} ) + +-pkg_check_modules(libpkgs REQUIRED dlog bundle dbus-glib-1 ail xdgmime app-checker libtzplatform-config) +-PKG_CHECK_MODULES(PKGS REQUIRED glib-2.0 gio-2.0 dlog bundle) ++pkg_check_modules(libpkgs REQUIRED bundle dbus-glib-1 ail xdgmime app-checker libtzplatform-config) ++PKG_CHECK_MODULES(PKGS REQUIRED glib-2.0 gio-2.0 bundle) + + FIND_LIBRARY(LIB_DL dl) + +diff --git a/am_daemon/amd_appinfo.c b/am_daemon/amd_appinfo.c +index 0e1b862..990d784 100755 +--- a/am_daemon/amd_appinfo.c ++++ b/am_daemon/amd_appinfo.c +@@ -197,7 +197,7 @@ static int __app_info_insert_handler (const pkgmgrinfo_appinfo_h handle, void *d + r = pkgmgrinfo_appinfo_get_pkgid(handle, &pkgid); + c->val[_AI_PKGID] = strdup(pkgid); + +- SECURE_LOGD("%s : %s : %s", c->val[_AI_FILE], c->val[_AI_COMP], c->val[_AI_TYPE]); ++ //SECURE_LOGD("%s : %s : %s", c->val[_AI_FILE], c->val[_AI_COMP], c->val[_AI_TYPE]); + + g_hash_table_insert(cf->tbl, c->val[_AI_FILE], c); + +@@ -259,7 +259,7 @@ static void __vconf_cb(keynode_t *key, void *data) + return; + } + +- SECURE_LOGD("noti_string : %s",noti_string); ++ //SECURE_LOGD("noti_string : %s",noti_string); + type_string = strtok_r(noti_string, ":", &saveptr); + appid = strtok_r(NULL, ":", &saveptr); + uid_string = strtok_r(NULL, ":", &saveptr); +@@ -278,7 +278,7 @@ static void __vconf_cb(keynode_t *key, void *data) + _E("pkgmgrinfo_appinfo_get_appinfo fail"); + } + +- SECURE_LOGD("appid : %s /handle : %x", appid, handle); ++ //SECURE_LOGD("appid : %s /handle : %x", appid, handle); + + __app_info_insert_handler(handle, data); + +@@ -304,7 +304,7 @@ int app_func(pkgmgrinfo_appinfo_h handle, void *user_data) + + pkgmgrinfo_appinfo_get_appid(handle, &appid); + r = g_hash_table_remove(cf->tbl, appid); +- SECURE_LOGD("upgrading... (%s)", appid); ++ //SECURE_LOGD("upgrading... (%s)", appid); + + return 0; + } +@@ -316,7 +316,7 @@ static int __cb(int req_id, const char *pkg_type, + int ret = 0; + pkgmgrinfo_pkginfo_h handle; + +- SECURE_LOGD("appid(%s), key(%s), value(%s)", pkgid, key, val); ++ //SECURE_LOGD("appid(%s), key(%s), value(%s)", pkgid, key, val); + + if((strncmp(key,"start", 5) == 0) && (strncmp(val, "update", 6) == 0) ) { + ret = pkgmgrinfo_pkginfo_get_pkginfo(pkgid, &handle); +@@ -533,7 +533,7 @@ const struct appinfo *appinfo_find(uid_t caller_uid, const char *appid) + r = pkgmgrinfo_appinfo_get_pkgid(handle, &pkgid); + res->val[_AI_PKGID] = strdup(pkgid); + +- SECURE_LOGD("%s : %s : %s", res->val[_AI_FILE], res->val[_AI_COMP], res->val[_AI_TYPE]); ++ //SECURE_LOGD("%s : %s : %s", res->val[_AI_FILE], res->val[_AI_COMP], res->val[_AI_TYPE]); + + return res; + } +@@ -563,7 +563,7 @@ const char *appinfo_get_filename(const struct appinfo *c) + { + if (!c) { + errno = EINVAL; +- SECURE_LOGE("appinfo get filename: %s", strerror(errno)); ++ //SECURE_LOGE("appinfo get filename: %s", strerror(errno)); + return NULL; + } + +diff --git a/am_daemon/amd_launch.c b/am_daemon/amd_launch.c +index 685699a..4993870 100755 +--- a/am_daemon/amd_launch.c ++++ b/am_daemon/amd_launch.c +@@ -713,7 +713,7 @@ int _start_app(char* appid, bundle* kb, int cmd, int caller_pid, uid_t caller_ui + if (_status_get_app_info_status(pid) == STATUS_DYING) { + pid = -ETERMINATING; + } else if (caller_pid == pid) { +- SECURE_LOGD("caller process & callee process is same.[%s:%d]", appid, pid); ++ //SECURE_LOGD("caller process & callee process is same.[%s:%d]", appid, pid); + pid = -ELOCALLAUNCH_ID; + } else { + if ((ret = __nofork_processing(cmd, pid, kb, fd)) < 0) { +diff --git a/am_daemon/amd_request.c b/am_daemon/amd_request.c +index 349cfd3..c1923bb 100755 +--- a/am_daemon/amd_request.c ++++ b/am_daemon/amd_request.c +@@ -188,7 +188,7 @@ static gboolean __add_history_handler(gpointer user_data) + rec.arg = (char *)pkt_uid->pkt->data; + } + +- SECURE_LOGD("add rua history %s %s", rec.pkg_name, rec.app_path); ++ //SECURE_LOGD("add rua history %s %s", rec.pkg_name, rec.app_path); + + ret = rua_add_history(&rec); + if (ret == -1) +@@ -219,14 +219,14 @@ static int __release_srv(uid_t caller_uid, const char *filename) + + ai = (struct appinfo *)appinfo_find(caller_uid, filename); + if (!ai) { +- SECURE_LOGE("release service: '%s' not found", filename); ++ //SECURE_LOGE("release service: '%s' not found", filename); + return -1; + } + + r = appinfo_get_boolean(ai, AIT_RESTART); + if (r == 1) { + /* Auto restart */ +- SECURE_LOGD("Auto restart set: '%s'", filename); ++ //SECURE_LOGD("Auto restart set: '%s'", filename); + return _start_srv(ai, NULL); + } + +@@ -349,7 +349,7 @@ static gboolean __request_handler(gpointer data) + appid = malloc(MAX_PACKAGE_STR_SIZE); + strncpy(appid, (const char*)pkt->data, MAX_PACKAGE_STR_SIZE-1); + ret = _status_app_is_running(appid, cr.uid); +- SECURE_LOGD("APP_IS_RUNNING : %s : %d",appid, ret); ++ //SECURE_LOGD("APP_IS_RUNNING : %s : %d",appid, ret); + __send_result_to_client(clifd, ret); + free(appid); + break; +diff --git a/am_daemon/amd_status.c b/am_daemon/amd_status.c +index 12f595e..525134f 100755 +--- a/am_daemon/amd_status.c ++++ b/am_daemon/amd_status.c +@@ -70,7 +70,7 @@ int _status_add_app_info_list(char *appid, char *app_path, int pid, int pad_pid, + { + info_t = (app_status_info_t *)iter->data; + +- SECURE_LOGD(" [%d] : %s, %d, %d", info_t->user, info_t->appid, info_t->pid, info_t->status); ++ //SECURE_LOGD(" [%d] : %s, %d, %d", info_t->user, info_t->appid, info_t->pid, info_t->status); + } + + return 0; +@@ -94,7 +94,7 @@ int _status_update_app_info_list(int pid, int status, uid_t uid) + { + info_t = (app_status_info_t *)iter->data; + +- //SECURE_LOGD("%s, %d, %d", info_t->appid, info_t->pid, info_t->status); ++ ////SECURE_LOGD("%s, %d, %d", info_t->appid, info_t->pid, info_t->status); + } + + return 0; +@@ -119,7 +119,7 @@ int _status_remove_app_info_list(int pid, uid_t uid) + { + info_t = (app_status_info_t *)iter->data; + +- //SECURE_LOGD("%s, %d, %d", info_t->appid, info_t->pid, info_t->status); ++ ////SECURE_LOGD("%s, %d, %d", info_t->appid, info_t->pid, info_t->status); + } + + return 0; +@@ -336,7 +336,7 @@ int _status_get_appid_bypid(int fd, int pid) + pkt->cmd = APP_GET_APPID_BYPID_ERROR; + + if (__get_pkgname_bypid(pid, (char *)pkt->data, MAX_PACKAGE_STR_SIZE) == 0) { +- SECURE_LOGD("appid for %d is %s", pid, pkt->data); ++ //SECURE_LOGD("appid for %d is %s", pid, pkt->data); + pkt->cmd = APP_GET_APPID_BYPID_OK; + goto out; + } +diff --git a/include/simple_util.h b/include/simple_util.h +index e0dc4c7..edb1600 100755 +--- a/include/simple_util.h ++++ b/include/simple_util.h +@@ -25,7 +25,7 @@ + + #include <unistd.h> + #include <ctype.h> +-#include <dlog.h> ++//#include <dlog.h> + #include <tzplatform_config.h> + + #define GLOBAL_USER tzplatform_getuid(TZ_SYS_GLOBALAPP_USER) +@@ -52,9 +52,9 @@ + #define MAX_LOCAL_BUFSZ 128 + #define MAX_PID_STR_BUFSZ 20 + +-#define _E(fmt, arg...) LOGE(fmt, ##arg) +-#define _D(fmt, arg...) LOGD(fmt, ##arg) +-#define _W(fmt, arg...) LOGW(fmt, ##arg) ++#define _E(fmt, arg...) //LOGE(fmt, ##arg) ++#define _D(fmt, arg...) //LOGD(fmt, ##arg) ++#define _W(fmt, arg...) //LOGW(fmt, ##arg) + + #define retvm_if(expr, val, fmt, arg...) do { \ + if (expr) { \ +diff --git a/src/launch.c b/src/launch.c +index 1e7a925..bc69a16 100755 +--- a/src/launch.c ++++ b/src/launch.c +@@ -319,7 +319,7 @@ int app_request_to_launchpad(int cmd, const char *pkgname, bundle *kb) + int must_free = 0; + int ret = 0; + +- SECURE_LOGD("launch request : %s", pkgname); ++ //SECURE_LOGD("launch request : %s", pkgname); + if (kb == NULL) { + kb = bundle_create(); + must_free = 1; +diff --git a/src/mida.c b/src/mida.c +index 9bb37fc..61dc852 100755 +--- a/src/mida.c ++++ b/src/mida.c +@@ -334,7 +334,7 @@ int mida_add_app(const char *mime_type, const char *pkg_name) + cnt = __count_with_field(MIDA_TBL_NAME, MIDA_F_MIMETYPE, mime_type, 0); + + if (cnt == 0) { +- SECURE_LOGD("Inserting (%s, %s)", pkg_name, mime_type); ++ //SECURE_LOGD("Inserting (%s, %s)", pkg_name, mime_type); + /* insert */ + _sqlbuf = sqlite3_mprintf( + "INSERT INTO %s (%s,%s) values (\"%s\", \"%s\");", +@@ -344,7 +344,7 @@ int mida_add_app(const char *mime_type, const char *pkg_name) + rc = _exec(mida_db, _sqlbuf); + sqlite3_free(_sqlbuf); + } else { +- SECURE_LOGD("Setting %s for %s", pkg_name, mime_type); ++ //SECURE_LOGD("Setting %s for %s", pkg_name, mime_type); + /* update */ + _sqlbuf = sqlite3_mprintf( + "UPDATE %s SET %s = '%s' where %s = '%s';", +@@ -443,7 +443,7 @@ int svc_add_app(const char *svc_name, const char *pkg_name) + + if (cnt == 0) { + /* insert */ +- SECURE_LOGD("Inserting (%s, %s)", pkg_name, svc_name); ++ //SECURE_LOGD("Inserting (%s, %s)", pkg_name, svc_name); + _sqlbuf = sqlite3_mprintf( + "INSERT INTO %s (%s,%s) values (\"%s\", \"%s\");", + SVC_TBL_NAME, SVC_F_PKGNAME, SVC_F_SVCNAME, pkg_name, +@@ -453,7 +453,7 @@ int svc_add_app(const char *svc_name, const char *pkg_name) + sqlite3_free(_sqlbuf); + } else { + /* update */ +- SECURE_LOGD("Setting %s for %s", pkg_name, svc_name); ++ //SECURE_LOGD("Setting %s for %s", pkg_name, svc_name); + _sqlbuf = sqlite3_mprintf( + "UPDATE %s SET %s = '%s' where %s = '%s';", + SVC_TBL_NAME, SVC_F_PKGNAME, pkg_name, +@@ -509,7 +509,7 @@ int is_supported_svc(const char *svc_name) + if (cnt > 0) + rc = 1; + else +- SECURE_LOGD("%s is not supported.", svc_name); ++ //SECURE_LOGD("%s is not supported.", svc_name); + + __fini(); + return rc; +diff --git a/src/mime.c b/src/mime.c +index 0649e16..6ef272b 100755 +--- a/src/mime.c ++++ b/src/mime.c +@@ -70,7 +70,7 @@ SLPAPI int aul_get_mime_from_content(const char *content, char *mimetype, + if (__match_content_with_regex(content, + &(miregex_tbl->regex_preg))) { + founded = miregex_tbl->mimetype; +- SECURE_LOGD("content %s => mimetype %s\n", content, founded); ++ //SECURE_LOGD("content %s => mimetype %s\n", content, founded); + break; + } + miregex_tbl = miregex_tbl->next; +@@ -360,9 +360,9 @@ static int __launch_with_defapp(const char *mime_type, const char *mime_content) + if (_aul_get_defapp_from_mime + (mime_type, unaliased_mime_type, defapp, + sizeof(unaliased_mime_type), sizeof(defapp)) < 0) { +- SECURE_LOGD("mimetype : %s, unaliased mimetype : %s, mime_content : %s," +- " no default app", mime_type, +- unaliased_mime_type, mime_content); ++ //SECURE_LOGD("mimetype : %s, unaliased mimetype : %s, mime_content : %s," ++ // " no default app", mime_type, ++ // unaliased_mime_type, mime_content); + bundle_add(kb, AUL_K_UNALIASED_MIME_TYPE, unaliased_mime_type); + ret = aul_launch_app(MIME_APP_SELECTOR, kb); + /* TODO: When launching MIME APP SELECTOR, what should +@@ -379,22 +379,22 @@ static int __launch_with_defapp(const char *mime_type, const char *mime_content) + + if (ail_ret == AIL_ERROR_OK) { + ail_destroy_appinfo(handle); +- SECURE_LOGD("mimetype : %s, unaliased mimetype : %s, " +- "mime_content : %s, defapp : %s", mime_type, +- unaliased_mime_type, +- mime_content, defapp); ++ //SECURE_LOGD("mimetype : %s, unaliased mimetype : %s, " ++ // "mime_content : %s, defapp : %s", mime_type, ++ // unaliased_mime_type, ++ // mime_content, defapp); + bundle_add(kb, AUL_K_UNALIASED_MIME_TYPE, + unaliased_mime_type); + ret = aul_launch_app(defapp, kb); + } else if (ail_ret == AIL_ERROR_NO_DATA) { +- SECURE_LOGD("defapp %s for mimetype : %s, mime_content : %s " +- "does NOT exist", defapp, +- mime_type, mime_content); ++ //SECURE_LOGD("defapp %s for mimetype : %s, mime_content : %s " ++ // "does NOT exist", defapp, ++ // mime_type, mime_content); + mida_delete_with_pkgname(defapp); + ail_destroy_appinfo(handle); + goto retry; + } else { +- SECURE_LOGE("ail_get_appinfo with %s failed", defapp); ++ //SECURE_LOGE("ail_get_appinfo with %s failed", defapp); + if (kb) { + bundle_free(kb); + kb = NULL; +diff --git a/src/pkginfo.c b/src/pkginfo.c +index 975c01e..7cb4771 100755 +--- a/src/pkginfo.c ++++ b/src/pkginfo.c +@@ -123,7 +123,7 @@ SLPAPI int aul_app_get_appid_bypid(int pid, char *appid, int len) + + if(pid == getpid() || getuid()==0 || geteuid()==0) { + if (__get_pkgname_bypid(pid, appid, len) == 0) { +- SECURE_LOGD("appid for %d is %s", pid, appid); ++ //SECURE_LOGD("appid for %d is %s", pid, appid); + return AUL_R_OK; + } + /* support app launched by shell script*/diff --git a/am_session_agent/agent.c b/am_session_agent/agent.c +index 1d1efd0..1968f49 100644 +--- a/am_session_agent/agent.c ++++ b/am_session_agent/agent.c +@@ -216,13 +216,13 @@ _static_ void __real_launch(const char *app_path, bundle * kb) + for (i = 0; i < app_argc; i++) { + if( (i%2) == 1) + continue; +- SECURE_LOGD("input argument %d : %s##", i, app_argv[i]); ++ //SECURE_LOGD("input argument %d : %s##", i, app_argv[i]); + } + + PERF("setup argument done"); + + /* Temporary log: launch time checking */ +- LOG(LOG_DEBUG, "LAUNCH", "[%s:Platform:agent:done]", app_path); ++ //LOG(LOG_DEBUG, "LAUNCH", "[%s:Platform:agent:done]", app_path); + #ifdef PRELOAD_ACTIVATE + __preload_exec(app_argc, app_argv); + #endif +@@ -347,7 +347,7 @@ _static_ void __modify_bundle(bundle * kb, int caller_pid, + char value[256]; + + ptr += flag; +- SECURE_LOGD("parsing app_path: EXEC - %s\n", exe); ++ //SECURE_LOGD("parsing app_path: EXEC - %s\n", exe); + + do { + flag = __parser(ptr, key, sizeof(key)); +@@ -604,7 +604,7 @@ _static_ void __agent_main_loop(int main_fd) + PERF("packet processing start"); + + pkg_name = bundle_get_val(kb, AUL_K_PKG_NAME); +- SECURE_LOGD("pkg name : %s\n", pkg_name); ++ //SECURE_LOGD("pkg name : %s\n", pkg_name); + + /* get caller uid and check if not coming from someone else than AMD */ + uid = __get_caller_uid(kb); +@@ -660,8 +660,8 @@ _static_ void __agent_main_loop(int main_fd) + + if (__prepare_exec(pkg_name, app_path, + menu_info, kb) < 0) { +- SECURE_LOGE("preparing work fail to launch - " +- "can not launch %s\n", pkg_name); ++ //SECURE_LOGE("preparing work fail to launch - " ++ // "can not launch %s\n", pkg_name); + exit(-1); + } + +@@ -672,7 +672,7 @@ _static_ void __agent_main_loop(int main_fd) + + exit(-1); + } +- SECURE_LOGD("==> real launch pid : %d %s\n", pid, app_path); ++ //SECURE_LOGD("==> real launch pid : %d %s\n", pid, app_path); + is_real_launch = 1; + } + end: diff --git a/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common-extraconf.inc b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common-extraconf.inc new file mode 100644 index 0000000..0dce5f5 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common-extraconf.inc @@ -0,0 +1,5 @@ +ALLOW_EMPTY_${PN} = "1" + +# Fix incorrect file list from upstream .spec file. Avoids +# Bitbake QA error. +capi-base-common-dev_files += "${libdir}/libcapi-base-common.so" 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 new file mode 100644 index 0000000..13cb7f7 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common.inc @@ -0,0 +1,135 @@ +DESCRIPTION = "Common header files of Tizen Native API" +HOMEPAGE = "http://nohomepage.org" +SECTION = "System/API" +LICENSE = "Apache-2.0" +PV = "0.1.6" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by capi-base-common-dev +PROVIDES += "capi-base-common-dev" + + +#PROVIDES by capi-base-common + + +RDEPENDS = "" +#RDEPENDS of capi-base-common-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "capi-base-common" + +#RDEPENDS of capi-base-common (${PN}) +RDEPENDS_${PN} += "glibc" + + +DEPENDS = "" +#DEPENDS of capi-base-common +inherit tizen_cmake + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/capi-base-common.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 ; + + MAJORVER=`echo 0.1.6 | awk 'BEGIN {FS="."}{print $1}'` + + 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} . -DFULLVER=0.1.6 -DMAJORVER=${MAJORVER} + oe_runmake ${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}${prefix}/share/license + cp LICENSE ${D}${prefix}/share/license/capi-base-common + + +} + +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 += " capi-base-common-dev " +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" +MANIFESTFILES_${PN} = "capi-base-common.manifest" + +FILES_${PN}-dev = "${capi-base-common-dev_files}" +FILES_${PN} = "${capi-base-common_files}" + +PKG_capi-base-common-dev= "capi-base-common-dev" +PKG_capi-base-common= "capi-base-common" + +require capi-base-common-extraconf.inc + 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 new file mode 100644 index 0000000..3f9bcbe --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-base-common/capi-base-common_git.bb @@ -0,0 +1,10 @@ +require capi-base-common.inc + +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" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info-extraconf.inc b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info-extraconf.inc new file mode 100644 index 0000000..1830479 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info-extraconf.inc @@ -0,0 +1,3 @@ +SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch" + +DEPENDS_remove_class-native = "dlog-native"
\ No newline at end of file diff --git a/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info.inc b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info.inc new file mode 100644 index 0000000..2eef94b --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info.inc @@ -0,0 +1,139 @@ +DESCRIPTION = "A System Information library in SLP C API" +HOMEPAGE = "http://nohomepage.org" +SECTION = "System/API" +LICENSE = "Apache-2.0" +PV = "0.2.0" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by capi-system-info-dev +PROVIDES += "capi-system-info-dev" + + +#PROVIDES by capi-system-info + + +RDEPENDS = "" +#RDEPENDS of capi-system-info-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "capi-system-info" + + +DEPENDS = "" +#DEPENDS of capi-system-info +inherit tizen_cmake +DEPENDS += "libxml2" +inherit pkgconfig +DEPENDS += "iniparser" +DEPENDS += "dlog" +DEPENDS += "ecore" +DEPENDS += "vconf" +DEPENDS += "capi-base-common" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/capi-system-info.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 ; + + MAJORVER=`echo 0.2.0 | awk 'BEGIN {FS="."}{print $1}'` + + 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} . -DFULLVER=0.2.0 -DMAJORVER=${MAJORVER} -DENABLE_WAYLAND=TRUE + oe_runmake ${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}${prefix}/bin + cp -f script/make_info_file.sh ${D}${prefix}/bin/make_info_file.sh + + +} + +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 += " capi-system-info-dev " +PACKAGES += " capi-system-info " + +capi-system-info-dev_files = "" +capi-system-info-dev_files += "${prefix}/include/system/system_info.h" +capi-system-info-dev_files += "${prefix}/lib/pkgconfig/*.pc" +capi-system-info-dev_files += "${prefix}/lib/libcapi-system-info.so" +MANIFESTFILES_${PN}-dev = "capi-system-info.manifest" + +capi-system-info_files = "" +capi-system-info_files += "${prefix}/lib/libcapi-system-info.so.*" +capi-system-info_files += "${prefix}/bin/make_info_file.sh" +MANIFESTFILES_${PN} = "capi-system-info.manifest" + +FILES_${PN}-dev = "${capi-system-info-dev_files}" +FILES_${PN} = "${capi-system-info_files}" + +PKG_capi-system-info-dev= "capi-system-info-dev" +PKG_capi-system-info= "capi-system-info" + +require capi-system-info-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info_git.bb b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info_git.bb new file mode 100644 index 0000000..0093c8a --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-system-info/capi-system-info_git.bb @@ -0,0 +1,10 @@ +require capi-system-info.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/api/system-info;tag=7c1c890c5fdc4c80d99b6a74d1011bfb144ee5b3;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/capi-system-info/files/remove-dlog-for-native-build.patch b/meta-application-manager/recipes-application-framework/capi-system-info/files/remove-dlog-for-native-build.patch new file mode 100644 index 0000000..83ee24b --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-system-info/files/remove-dlog-for-native-build.patch @@ -0,0 +1,491 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2cc7e4e..1381725 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,9 +12,9 @@ INCLUDE_DIRECTORIES(${INC_DIR}) + + IF(ENABLE_WAYLAND) + ADD_DEFINITIONS("-DWAYLAND_PLATFORM") +-SET(requires "dlog capi-base-common iniparser libxml-2.0") ++SET(requires "capi-base-common iniparser libxml-2.0") + ELSE(ENABLE_WAYLAND) +-SET(requires "dlog capi-base-common xi xrandr iniparser libxml-2.0") ++SET(requires "capi-base-common xi xrandr iniparser libxml-2.0") + ENDIF(ENABLE_WAYLAND) + SET(pc_requires "capi-base-common") + +diff --git a/src/system_info.c b/src/system_info.c +index 491f5b5..507499e 100644 +--- a/src/system_info.c ++++ b/src/system_info.c +@@ -20,7 +20,7 @@ + #include <string.h> + #include <unistd.h> + +-#include <dlog.h> ++//#include <dlog.h> + + #include <system_info.h> + #include <system_info_private.h> +@@ -170,7 +170,7 @@ void __attribute__((constructor)) system_info_init(void) + ret = system_info_get_platform_string("tizen.org/system/model_name", &str); + + if (ret != SYSTEM_INFO_ERROR_NONE) { +- LOGE("initialize error"); ++ //LOGE("initialize error"); + return; + } + +@@ -204,24 +204,24 @@ int system_info_get_value(system_info_key_e key, system_info_data_type_e data_ty + system_info_get_value_cb system_info_getter; + + if (value == NULL) { +- LOGE("INVALID_PARAMETER(0x%08x) : invalid output param", SYSTEM_INFO_ERROR_INVALID_PARAMETER); ++ //LOGE("INVALID_PARAMETER(0x%08x) : invalid output param", SYSTEM_INFO_ERROR_INVALID_PARAMETER); + return SYSTEM_INFO_ERROR_INVALID_PARAMETER; + } + + if (system_info_get(key, &system_info)) { +- LOGE("INVALID_PARAMETER(0x%08x) : invalid key", SYSTEM_INFO_ERROR_INVALID_PARAMETER); ++ //LOGE("INVALID_PARAMETER(0x%08x) : invalid key", SYSTEM_INFO_ERROR_INVALID_PARAMETER); + return SYSTEM_INFO_ERROR_INVALID_PARAMETER; + } + + if (system_info->data_type != data_type) { +- LOGE("INVALID_PARAMETER(0x%08x) : invalid data type", SYSTEM_INFO_ERROR_INVALID_PARAMETER); ++ //LOGE("INVALID_PARAMETER(0x%08x) : invalid data type", SYSTEM_INFO_ERROR_INVALID_PARAMETER); + return SYSTEM_INFO_ERROR_INVALID_PARAMETER; + } + + system_info_getter = system_info->get_value_cb; + + if (system_info_getter == NULL) { +- LOGE("IO_ERROR(0x%08x) : failed to call getter for the system information", SYSTEM_INFO_ERROR_IO_ERROR); ++ //LOGE("IO_ERROR(0x%08x) : failed to call getter for the system information", SYSTEM_INFO_ERROR_IO_ERROR); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + +@@ -257,13 +257,13 @@ API int system_info_get_platform_bool(const char *key, bool *value) + supported = (bool *)value; + + if (access(CONFIG_FILE_PATH, R_OK)) { +- LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); ++ //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + ret = system_info_get_value_from_config_xml(PLATFORM_TAG, key, BOOL_TYPE, &string); + if (ret) { +- LOGE("cannot get %s", key); ++ //LOGE("cannot get %s", key); + return ret; + } + +@@ -286,13 +286,13 @@ API int system_info_get_platform_int(const char *key, int *value) + ret_val = (int *)value; + + if (access(CONFIG_FILE_PATH, R_OK)) { +- LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); ++ //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + ret = system_info_get_value_from_config_xml(PLATFORM_TAG, key, INT_TYPE, &string); + if (ret) { +- LOGE("cannot get %s", key); ++ //LOGE("cannot get %s", key); + return ret; + } + +@@ -312,13 +312,13 @@ API int system_info_get_platform_double(const char *key, double *value) + ret_val = (double *)value; + + if (access(CONFIG_FILE_PATH, R_OK)) { +- LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); ++ //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + ret = system_info_get_value_from_config_xml(PLATFORM_TAG, key, DBL_TYPE, &string); + if (ret) { +- LOGE("cannot get %s", key); ++ //LOGE("cannot get %s", key); + return ret; + } + +@@ -335,13 +335,13 @@ API int system_info_get_platform_string(const char *key, char **value) + char *string = NULL; + + if (access(CONFIG_FILE_PATH, R_OK)) { +- LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); ++ //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + ret = system_info_get_value_from_config_xml(PLATFORM_TAG, key, STR_TYPE, &string); + if (ret) { +- LOGE("cannot get %s", key); ++ //LOGE("cannot get %s", key); + return ret; + } + +@@ -359,13 +359,13 @@ API int system_info_get_custom_bool(const char *key, bool *value) + supported = (bool *)value; + + if (access(CONFIG_FILE_PATH, R_OK)) { +- LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); ++ //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + ret = system_info_get_value_from_config_xml(CUSTOM_TAG, key, BOOL_TYPE, &string); + if (ret) { +- LOGI("cannot get %s", key); ++ //LOGI("cannot get %s", key); + *supported = false; + return SYSTEM_INFO_ERROR_NONE; + } +@@ -389,13 +389,13 @@ API int system_info_get_custom_int(const char *key, int *value) + ret_val = (int *)value; + + if (access(CONFIG_FILE_PATH, R_OK)) { +- LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); ++ //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + ret = system_info_get_value_from_config_xml(CUSTOM_TAG, key, INT_TYPE, &string); + if (ret) { +- LOGI("cannot get %s", key); ++ //LOGI("cannot get %s", key); + *ret_val = 0; + return SYSTEM_INFO_ERROR_NONE; + } +@@ -416,13 +416,13 @@ API int system_info_get_custom_double(const char *key, double *value) + ret_val = (double *)value; + + if (access(CONFIG_FILE_PATH, R_OK)) { +- LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); ++ //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + ret = system_info_get_value_from_config_xml(CUSTOM_TAG, key, DBL_TYPE, &string); + if (ret) { +- LOGI("cannot get %s", key); ++ //LOGI("cannot get %s", key); + *ret_val = 0; + return SYSTEM_INFO_ERROR_NONE; + } +@@ -440,13 +440,13 @@ API int system_info_get_custom_string(const char *key, char **value) + char *string = NULL; + + if (access(CONFIG_FILE_PATH, R_OK)) { +- LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); ++ //LOGE("cannot find file %s!!!", CONFIG_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + ret = system_info_get_value_from_config_xml(CUSTOM_TAG, key, STR_TYPE, &string); + if (ret) { +- LOGE("cannot get %s info from %s!!!", key, CONFIG_FILE_PATH); ++ //LOGE("cannot get %s info from %s!!!", key, CONFIG_FILE_PATH); + return ret; + } + +diff --git a/src/system_info_device.c b/src/system_info_device.c +index 18752e4..2826c61 100644 +--- a/src/system_info_device.c ++++ b/src/system_info_device.c +@@ -19,7 +19,7 @@ + #include <string.h> + #include <unistd.h> + +-#include <dlog.h> ++//#include <dlog.h> + + #include <system_info.h> + #include <system_info_private.h> +@@ -38,7 +38,7 @@ int system_info_get_manufacturer(system_info_key_e key, system_info_data_type_e + + manufacturer = strdup("samsung"); + if (manufacturer == NULL) { +- LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); ++ //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); + return SYSTEM_INFO_ERROR_OUT_OF_MEMORY; + } + +@@ -61,7 +61,7 @@ int system_info_get_tethering_supported(system_info_key_e key, system_info_data_ + } + + if (system_info_get_value_from_xml(TETHERING_INFO_FILE_PATH, model, "tethering-support", &string)) { +- LOGE("cannot get tethering-support info from %s!!!", TETHERING_INFO_FILE_PATH); ++ //LOGE("cannot get tethering-support info from %s!!!", TETHERING_INFO_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + +diff --git a/src/system_info_parse.c b/src/system_info_parse.c +index 0bc6b88..f3b412f 100644 +--- a/src/system_info_parse.c ++++ b/src/system_info_parse.c +@@ -19,7 +19,7 @@ + #include <stdlib.h> + #include <string.h> + +-#include <dlog.h> ++//#include <dlog.h> + + #include <system_info.h> + #include <system_info_private.h> +@@ -47,14 +47,14 @@ int system_info_ini_get_string(char *ini_file, char *key, char **output) + ini = iniparser_load(ini_file); + + if (ini == NULL) { +- LOGE("cannot file open %s file!!!", ini_file); ++ //LOGE("cannot file open %s file!!!", ini_file); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + str = iniparser_getstring(ini, key, NULL); + + if (str == NULL) { +- LOGE("NOT found %s(0x%08x)", key, SYSTEM_INFO_ERROR_IO_ERROR); ++ //LOGE("NOT found %s(0x%08x)", key, SYSTEM_INFO_ERROR_IO_ERROR); + iniparser_freedict(ini); + return SYSTEM_INFO_ERROR_IO_ERROR; + } +@@ -62,7 +62,7 @@ int system_info_ini_get_string(char *ini_file, char *key, char **output) + tmp = strdup(str); + + if (tmp == NULL) { +- LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); ++ //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); + iniparser_freedict(ini); + return SYSTEM_INFO_ERROR_OUT_OF_MEMORY; + } +@@ -86,13 +86,13 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi + doc = xmlParseFile(xml_file_path); + + if (doc == NULL) { +- LOGE("cannot file open %s file!!!", xml_file_path); ++ //LOGE("cannot file open %s file!!!", xml_file_path); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + cur = xmlDocGetRootElement(doc); + if (cur == NULL) { +- LOGE("empty document %s file!!!", xml_file_path); ++ //LOGE("empty document %s file!!!", xml_file_path); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_IO_ERROR; + } +@@ -103,7 +103,7 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi + } + + if (cur == NULL) { +- LOGE("cannot find %s root element file!!!", "sys-info"); ++ //LOGE("cannot find %s root element file!!!", "sys-info"); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_IO_ERROR; + } +@@ -137,7 +137,7 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi + free(string); + xmlFreeDoc(doc); + if (*value == NULL) { +- LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); ++ //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_OUT_OF_MEMORY; + } +@@ -170,7 +170,7 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi + free(string); + xmlFreeDoc(doc); + if (*value == NULL) { +- LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); ++ //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_OUT_OF_MEMORY; + } +@@ -183,7 +183,7 @@ int system_info_get_value_from_xml(char *xml_file_path, char *model, char *id_fi + } + } + +- LOGE("cannot find %s field from %s file!!!", id_field, xml_file_path); ++ //LOGE("cannot find %s field from %s file!!!", id_field, xml_file_path); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_IO_ERROR; + } +@@ -201,13 +201,13 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi + doc = xmlParseFile(CONFIG_FILE_PATH); + + if (doc == NULL) { +- LOGE("cannot file open %s file!!!", CONFIG_FILE_PATH); ++ //LOGE("cannot file open %s file!!!", CONFIG_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + cur = xmlDocGetRootElement(doc); + if (cur == NULL) { +- LOGE("empty document %s file!!!", CONFIG_FILE_PATH); ++ //LOGE("empty document %s file!!!", CONFIG_FILE_PATH); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_IO_ERROR; + } +@@ -218,7 +218,7 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi + } + + if (cur == NULL) { +- LOGE("cannot find %s root element file!!!", MODEL_CONFIG_TAG); ++ //LOGE("cannot find %s root element file!!!", MODEL_CONFIG_TAG); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_IO_ERROR; + } +@@ -231,7 +231,7 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi + } + + if (model_node == NULL) { +- LOGE("cannot find %s field from %s file!!!", name_field, CONFIG_FILE_PATH); ++ //LOGE("cannot find %s field from %s file!!!", name_field, CONFIG_FILE_PATH); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_IO_ERROR; + } +@@ -247,7 +247,7 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi + if (!strncmp(name, name_field, strlen(name))) { + if (!strncmp(name, name_field, strlen(name_field))) { + if (strncmp(type, type_field, strlen(type_field))) { +- LOGE("INVALID_PARAMETER(0x%08x) : invalid output param", SYSTEM_INFO_ERROR_INVALID_PARAMETER); ++ //LOGE("INVALID_PARAMETER(0x%08x) : invalid output param", SYSTEM_INFO_ERROR_INVALID_PARAMETER); + free(name); + free(type); + xmlFreeDoc(doc); +@@ -270,13 +270,13 @@ int system_info_get_value_from_config_xml(char *feature_tag, const char *name_fi + } + + if (!cur_node) { +- LOGE("cannot find %s field from %s file!!!", name_field, CONFIG_FILE_PATH); ++ //LOGE("cannot find %s field from %s file!!!", name_field, CONFIG_FILE_PATH); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + + if (*value == NULL) { +- LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); ++ //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); + xmlFreeDoc(doc); + return SYSTEM_INFO_ERROR_OUT_OF_MEMORY; + } +diff --git a/src/system_info_platform.c b/src/system_info_platform.c +index 405004f..82abf9c 100644 +--- a/src/system_info_platform.c ++++ b/src/system_info_platform.c +@@ -20,7 +20,7 @@ + #include <unistd.h> + #include <string.h> + +-#include <dlog.h> ++//#include <dlog.h> + + #include <system_info.h> + #include <system_info_private.h> +@@ -72,7 +72,7 @@ int system_info_get_core_cpu_arch(system_info_key_e key, system_info_data_type_e + CORE_CPU_ARCH = strdup("x86"); + + if (CORE_CPU_ARCH == NULL) { +- LOGE("Unknown cpu"); ++ //LOGE("Unknown cpu"); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + +@@ -92,7 +92,7 @@ int system_info_get_core_cpu_freq(system_info_key_e key, system_info_data_type_e + if (system_info_get_system_info_model_type() != SYSTEM_INFO_MODEL_TYPE_EMULATOR) { + cpuinfo_max_freq = fopen(CPU_INFO_MAX_FREQ_PATH, "r"); + if (NULL == cpuinfo_max_freq) { +- LOGE("cannot file open %s file!!!", CPU_INFO_MAX_FREQ_PATH); ++ //LOGE("cannot file open %s file!!!", CPU_INFO_MAX_FREQ_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } else { + if (fscanf(cpuinfo_max_freq, "%lf", &max_freq) < 1) { +@@ -106,7 +106,7 @@ int system_info_get_core_cpu_freq(system_info_key_e key, system_info_data_type_e + /* Emulator */ + cpuinfo = fopen(CPU_INFO_FILE_PATH, "r"); + if (NULL == cpuinfo) { +- LOGE("cannot file open %s file!!!", CPU_INFO_FILE_PATH); ++ //LOGE("cannot file open %s file!!!", CPU_INFO_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } else { + while (fgets(str, MAXBUFSIZE, cpuinfo)) { +@@ -144,7 +144,7 @@ int system_info_get_tizen_version_name(system_info_key_e key, system_info_data_t + + info = fopen(OS_RELEASE_FILE_PATH, "r"); + if (NULL == info) { +- LOGE("cannot file open %s file!!!", OS_RELEASE_FILE_PATH); ++ //LOGE("cannot file open %s file!!!", OS_RELEASE_FILE_PATH); + return SYSTEM_INFO_ERROR_IO_ERROR; + } + +@@ -159,7 +159,7 @@ int system_info_get_tizen_version_name(system_info_key_e key, system_info_data_t + + TIZEN_VERSION_NAME = strdup(tmpStr); + if (TIZEN_VERSION_NAME == NULL) { +- LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); ++ //LOGE("OUT_OF_MEMORY(0x%08x)", SYSTEM_INFO_ERROR_OUT_OF_MEMORY); + fclose(info); + return SYSTEM_INFO_ERROR_OUT_OF_MEMORY; + } +diff --git a/src/system_info_screen.c b/src/system_info_screen.c +index 9af9f81..c9979d7 100644 +--- a/src/system_info_screen.c ++++ b/src/system_info_screen.c +@@ -19,7 +19,7 @@ + #include <stdlib.h> + #include <string.h> + +-#include <dlog.h> ++//#include <dlog.h> + + #ifndef WAYLAND_PLATFORM + #include <X11/Xlib.h> +@@ -68,14 +68,14 @@ int system_info_screen_init() + memset(&g_pinfo, 0x0, sizeof(ProgInfo)); + #ifdef WAYLAND_PLATFORM + //In wayland environment, noting to do in this function, FIXME if necessary. +- LOGE("In wayland environment, system_info_screen_init Failed"); ++ //LOGE("In wayland environment, system_info_screen_init Failed"); + system_info_screen_initialized = 1; + return -1; + #else + int i; + g_pinfo.dpy = XOpenDisplay(NULL); + if (NULL == g_pinfo.dpy) { +- LOGE("XOpenDisplay Failed"); ++ //LOGE("XOpenDisplay Failed"); + return -1; + } + +@@ -85,7 +85,7 @@ int system_info_screen_init() + + if (!XRRQueryExtension(g_pinfo.dpy, &g_pinfo.event_base, &g_pinfo.error_base) || + !XRRQueryVersion(g_pinfo.dpy, &g_pinfo.major, &g_pinfo.minor)) { +- LOGE("XRRQuery Failed"); ++ //LOGE("XRRQuery Failed"); + XCloseDisplay(g_pinfo.dpy); + return -1; + } +@@ -93,7 +93,7 @@ int system_info_screen_init() + g_pinfo.res = XRRGetScreenResources(g_pinfo.dpy, g_pinfo.root); + + if (!g_pinfo.res) { +- LOGE("XRRGetScreenResources Failed"); ++ //LOGE("XRRGetScreenResources Failed"); + XCloseDisplay(g_pinfo.dpy); + return -1; + } +@@ -101,7 +101,7 @@ int system_info_screen_init() + for (i = 0; i < g_pinfo.res->noutput; i++) { + XRROutputInfo *output_info = XRRGetOutputInfo(g_pinfo.dpy, g_pinfo.res, g_pinfo.res->outputs[i]); + if (!output_info) { +- LOGE("XRRGetOutputInfo Failed"); ++ //LOGE("XRRGetOutputInfo Failed"); + XCloseDisplay(g_pinfo.dpy); + return -1; + } diff --git a/meta-application-manager/recipes-application-framework/capi-system-sensor/capi-system-sensor-extraconf.inc b/meta-application-manager/recipes-application-framework/capi-system-sensor/capi-system-sensor-extraconf.inc new file mode 100644 index 0000000..9a88afb --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-system-sensor/capi-system-sensor-extraconf.inc @@ -0,0 +1 @@ +SRC_URI +="file://001-Add-version-to-CMakeList.patch" diff --git a/meta-application-manager/recipes-application-framework/capi-system-sensor/capi-system-sensor.inc b/meta-application-manager/recipes-application-framework/capi-system-sensor/capi-system-sensor.inc new file mode 100644 index 0000000..06a7cdf --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-system-sensor/capi-system-sensor.inc @@ -0,0 +1,137 @@ +DESCRIPTION = "A Sensor library in TIZEN C API" +HOMEPAGE = "http://nohomepage.org" +SECTION = "framework/system" +LICENSE = "Apache-2.0" +PV = "0.1.17" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by capi-system-sensor-dev +PROVIDES += "capi-system-sensor-dev" + + +#PROVIDES by capi-system-sensor + + +RDEPENDS = "" +#RDEPENDS of capi-system-sensor-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "capi-system-sensor" + + +DEPENDS = "" +#DEPENDS of capi-system-sensor +DEPENDS += "sensor" +inherit tizen_cmake +inherit pkgconfig +DEPENDS += "dlog" +DEPENDS += "capi-base-common" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/capi-system-sensor.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 ; + + MAJORVER=`echo 0.1.17 | awk 'BEGIN {FS="."}{print $1}'` + + + 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} . -DFULLVER=0.1.17 -DMAJORVER=${MAJORVER} -DVERSION="0.1.17" + + oe_runmake ${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 -- + + +} + +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 += " capi-system-sensor-dev " +PACKAGES += " capi-system-sensor " + +capi-system-sensor-dev_files = "" +capi-system-sensor-dev_files += "${prefix}/include/system/sensors.h" +capi-system-sensor-dev_files += "${prefix}/lib/pkgconfig/*.pc" +capi-system-sensor-dev_files += "${prefix}/lib/libcapi-system-sensor.so" +MANIFESTFILES_${PN}-dev = "capi-system-sensor.manifest" + +capi-system-sensor_files = "" +capi-system-sensor_files += "${prefix}/lib/libcapi-system-sensor.so.*" +MANIFESTFILES_${PN} = "capi-system-sensor.manifest" + +FILES_${PN}-dev = "${capi-system-sensor-dev_files}" +FILES_${PN} = "${capi-system-sensor_files}" + +PKG_capi-system-sensor-dev= "capi-system-sensor-dev" +PKG_capi-system-sensor= "capi-system-sensor" + +require capi-system-sensor-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/capi-system-sensor/capi-system-sensor_git.bb b/meta-application-manager/recipes-application-framework/capi-system-sensor/capi-system-sensor_git.bb new file mode 100644 index 0000000..83bad0f --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-system-sensor/capi-system-sensor_git.bb @@ -0,0 +1,10 @@ +require capi-system-sensor.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/api/sensor;tag=536527ac22998472146e004b6ccdb8476a444576;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/capi-system-sensor/files/001-Add-version-to-CMakeList.patch b/meta-application-manager/recipes-application-framework/capi-system-sensor/files/001-Add-version-to-CMakeList.patch new file mode 100644 index 0000000..af13747 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/capi-system-sensor/files/001-Add-version-to-CMakeList.patch @@ -0,0 +1,7 @@ +--- a/CMakeLists.txt 2014-06-11 15:33:14.110487872 +0200 ++++ b/CMakeLists.txt 2014-06-11 15:32:42.708486993 +0200 +@@ -1,3 +1,4 @@ ++SET(VERSION "0.1.17") + + CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + SET(fw_name "capi-system-sensor") diff --git a/meta-application-manager/recipes-application-framework/heynoti/files/remove_dlog.patch b/meta-application-manager/recipes-application-framework/heynoti/files/remove_dlog.patch new file mode 100644 index 0000000..00c9a84 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/heynoti/files/remove_dlog.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c3c5f4d..6057c9e 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,7 +25,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + INCLUDE(FindPkgConfig) + + pkg_check_modules(glib_pkg REQUIRED gobject-2.0) +-pkg_check_modules(pkgs REQUIRED glib-2.0 dlog libtzplatform-config) ++pkg_check_modules(pkgs REQUIRED glib-2.0 libtzplatform-config) ++ADD_DEFINITIONS("-DUTIL_SYSLOG_OUT") ++ + FOREACH(flag ${pkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") + ENDFOREACH(flag) diff --git a/meta-application-manager/recipes-application-framework/heynoti/heynoti-extraconf.inc b/meta-application-manager/recipes-application-framework/heynoti/heynoti-extraconf.inc new file mode 100644 index 0000000..1104884 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/heynoti/heynoti-extraconf.inc @@ -0,0 +1,3 @@ +DEPENDS_remove_class-native = "dlog-native" + +SRC_URI_append_class-native = " file://remove_dlog.patch"
\ No newline at end of file diff --git a/meta-application-manager/recipes-application-framework/heynoti/heynoti.inc b/meta-application-manager/recipes-application-framework/heynoti/heynoti.inc new file mode 100644 index 0000000..a899abc --- /dev/null +++ b/meta-application-manager/recipes-application-framework/heynoti/heynoti.inc @@ -0,0 +1,145 @@ +DESCRIPTION = "HEY (ligHt Easy speedy) notification library" +HOMEPAGE = "http://nohomepage.org" +SECTION = "System/Libraries" +LICENSE = "Apache-2.0" +PV = "0.0.2" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by heynoti + + +#PROVIDES by heynoti-dev +PROVIDES += "heynoti-dev" + + +RDEPENDS = "" +#RDEPENDS of heynoti-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "heynoti" + + +DEPENDS = "" +#DEPENDS of heynoti +inherit tizen_cmake +DEPENDS += "tizen-platform-config" +inherit pkgconfig +DEPENDS += "dlog" +DEPENDS += "glib-2.0" +DEPENDS += "ecore" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/heynoti.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} . -DCMAKE_BUILD_TYPE="Debug" + + + 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}${prefix}/share/noti + mkdir -p ${D}/usr/share/license + install LICENSE ${D}/usr/share/license/heynoti + + +} + +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 += " heynoti " +PACKAGES += " heynoti-dev " + +heynoti_files = "" +heynoti_files += "${prefix}/lib/libheynoti.so.0" +heynoti_files += "${prefix}/lib/libheynoti.so.0.0.2" +heynoti_files += "${prefix}/bin/heynotitool" +heynoti_files += "${prefix}/share/noti" +heynoti_files += "/usr/share/license/heynoti" +MANIFESTFILES_${PN} = "heynoti.manifest" + +heynoti-dev_files = "" +heynoti-dev_files += "${prefix}/include/heynoti/SLP_Heynoti_PG.h" +heynoti-dev_files += "${prefix}/include/heynoti/heynoti.h" +heynoti-dev_files += "${prefix}/lib/pkgconfig/heynoti.pc" +heynoti-dev_files += "${prefix}/lib/libheynoti.so" +MANIFESTFILES_${PN}-dev = "heynoti.manifest" + +FILES_${PN} = "${heynoti_files}" +FILES_${PN}-dev = "${heynoti-dev_files}" + +PKG_heynoti= "heynoti" +PKG_heynoti-dev= "heynoti-dev" + +require heynoti-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/heynoti/heynoti_git.bb b/meta-application-manager/recipes-application-framework/heynoti/heynoti_git.bb new file mode 100644 index 0000000..d1b16a6 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/heynoti/heynoti_git.bb @@ -0,0 +1,10 @@ +require heynoti.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/heynoti;tag=3f82d6115368fb5a2d799436aecc7b339e6ae373;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/libcom-core/files/0001-remove-dbus-check.patch b/meta-application-manager/recipes-application-framework/libcom-core/files/0001-remove-dbus-check.patch new file mode 100644 index 0000000..dd1a6d3 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/libcom-core/files/0001-remove-dbus-check.patch @@ -0,0 +1,13 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,7 +17,7 @@ + pkg_check_modules(pkgs REQUIRED + glib-2.0 + dlog +- libsystemd-daemon +-) ++) ++ + + FOREACH(flag ${pkgs_CFLAGS}) + diff --git a/meta-application-manager/recipes-application-framework/libcom-core/libcom-core-extraconf.inc b/meta-application-manager/recipes-application-framework/libcom-core/libcom-core-extraconf.inc new file mode 100644 index 0000000..dfdcea3 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/libcom-core/libcom-core-extraconf.inc @@ -0,0 +1 @@ +INSANE_SKIP_${PN} = "dev-so"
\ No newline at end of file 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 new file mode 100644 index 0000000..19d99ee --- /dev/null +++ b/meta-application-manager/recipes-application-framework/libcom-core/libcom-core.inc @@ -0,0 +1,141 @@ +DESCRIPTION = "Library for the light-weight IPC" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Base/IPC" +LICENSE = "Apache-2.0" +PV = "0.5.9" + +SRC_URI = "file://0001-remove-dbus-check.patch " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by libcom-core + + +#PROVIDES by libcom-core-dev +PROVIDES += "libcom-core-dev" + + +RDEPENDS = "" +#RDEPENDS of libcom-core-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "libcom-core" + + +DEPENDS = "" +#DEPENDS of libcom-core +#Replace "DEPENDS" on gettext by "inherit gettext" +inherit gettext +inherit tizen_cmake +DEPENDS += "systemd" +DEPENDS += "dlog" +inherit pkgconfig +DEPENDS += "glib-2.0" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/libcom-core.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} + + rm -rf ${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}${prefix}/share/license + + +} + +pkg_postinst_libcom-core() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_libcom-core() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " libcom-core " +PACKAGES += " libcom-core-dev " + +libcom-core_files = "" +libcom-core_files += "${prefix}/lib/*.so*" +libcom-core_files += "${prefix}/share/license/*" +MANIFESTFILES_${PN} = "libcom-core.manifest" + +libcom-core-dev_files = "" +libcom-core-dev_files += "${prefix}/include/com-core/com-core.h" +libcom-core-dev_files += "${prefix}/include/com-core/packet.h" +libcom-core-dev_files += "${prefix}/include/com-core/com-core_packet.h" +libcom-core-dev_files += "${prefix}/include/com-core/com-core_thread.h" +libcom-core-dev_files += "${prefix}/include/com-core/secure_socket.h" +libcom-core-dev_files += "${prefix}/lib/pkgconfig/*.pc" +MANIFESTFILES_${PN}-dev = "libcom-core.manifest" + +FILES_${PN} = "${libcom-core_files}" +FILES_${PN}-dev = "${libcom-core-dev_files}" + +PKG_libcom-core= "libcom-core" +PKG_libcom-core-dev= "libcom-core-dev" + +require libcom-core-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/libcom-core/libcom-core_git.bb b/meta-application-manager/recipes-application-framework/libcom-core/libcom-core_git.bb new file mode 100644 index 0000000..f21c2de --- /dev/null +++ b/meta-application-manager/recipes-application-framework/libcom-core/libcom-core_git.bb @@ -0,0 +1,10 @@ +require libcom-core.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/com-core;tag=dbfd87c27e0f73b95b2ae16d0b76e059484d5375;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/librua/librua-extraconf.inc b/meta-application-manager/recipes-application-framework/librua/librua-extraconf.inc new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/librua/librua-extraconf.inc diff --git a/meta-application-manager/recipes-application-framework/librua/librua.inc b/meta-application-manager/recipes-application-framework/librua/librua.inc new file mode 100644 index 0000000..b614bc4 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/librua/librua.inc @@ -0,0 +1,149 @@ +DESCRIPTION = "Recently used application" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Application Framework/Libraries" +LICENSE = "Apache-2.0" +PV = "0.1.0" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by librua + + +#PROVIDES by librua-dev +PROVIDES += "librua-dev" + + +#PROVIDES by librua-test +PROVIDES += "librua-test" + + +RDEPENDS = "" +#RDEPENDS of librua-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "librua" + +#RDEPENDS of librua-test (${PN}-test) +RDEPENDS_${PN}-test += "librua" + + +DEPENDS = "" +#DEPENDS of librua +DEPENDS += "sqlite3" +DEPENDS += "tizen-platform-config" +inherit tizen_cmake +inherit pkgconfig +DEPENDS += "libslp-db-util" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/librua.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 -- + + +} + +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 += " librua " +PACKAGES += " librua-dev " +PACKAGES += " librua-test " + +librua_files = "" +librua_files += "${prefix}/lib/librua.so.*" +MANIFESTFILES_${PN} = "librua.manifest" + +librua-dev_files = "" +librua-dev_files += "${prefix}/include/rua" +librua-dev_files += "${prefix}/include/rua/*.h" +librua-dev_files += "${prefix}/lib/librua.so" +librua-dev_files += "${prefix}/lib/pkgconfig/rua.pc" +MANIFESTFILES_${PN}-dev = "librua.manifest" +DIRFILES_${PN}-dev = "" +DIRFILES_${PN}-dev += "${prefix}/include/rua" + +librua-test_files = "" +librua-test_files += "${prefix}/bin/rua-test" +MANIFESTFILES_${PN}-test = "librua.manifest" + +FILES_${PN} = "${librua_files}" +FILES_${PN}-dev = "${librua-dev_files}" +FILES_${PN}-test = "${librua-test_files}" + +PKG_librua= "librua" +PKG_librua-dev= "librua-dev" +PKG_librua-test= "librua-test" + +require librua-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/librua/librua_git.bb b/meta-application-manager/recipes-application-framework/librua/librua_git.bb new file mode 100644 index 0000000..6095e25 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/librua/librua_git.bb @@ -0,0 +1,10 @@ +require librua.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/librua;tag=b3f0019b1e8c118e7f96248d143f43a02c05a4e7;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info-extraconf.inc b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info-extraconf.inc new file mode 100644 index 0000000..19d3f61 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info-extraconf.inc @@ -0,0 +1,4 @@ +#SRC_URI += "file://TizenCommonCMakeMacro.patch" + +DEPENDS_remove_class-native = "dlog-native" +SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch"
\ No newline at end of file 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 new file mode 100644 index 0000000..be9193a --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info.inc @@ -0,0 +1,203 @@ +DESCRIPTION = "Packager Manager infomation api for package" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Application Framework/Package Management" +LICENSE = "Apache-2.0" +PV = "0.0.134" + +SRC_URI = " file://TizenCommonCMakeMacro.patch " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by pkgmgr-info-parser +PROVIDES += "pkgmgr-info-parser" + + +#PROVIDES by pkgmgr-info-parser-dev +PROVIDES += "pkgmgr-info-parser-dev" + + +#PROVIDES by pkgmgr-info + + +#PROVIDES by pkgmgr-info-dev +PROVIDES += "pkgmgr-info-dev" + + +RDEPENDS = "" +#RDEPENDS of pkgmgr-info-parser (${PN}-parser) +RDEPENDS_${PN}-parser += "pkgmgr-info" + +#RDEPENDS of pkgmgr-info-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "pkgmgr-info" + +#RDEPENDS of pkgmgr-info-parser-dev (${PN}-parser-dev) +RDEPENDS_${PN}-parser-dev += "tizen-platform-config" +RDEPENDS_${PN}-parser-dev += "pkgmgr-info" + + +DEPENDS = "" +#DEPENDS of pkgmgr-info +inherit tizen_cmake +DEPENDS += "libxml2" +DEPENDS += "dbus" +DEPENDS += "tizen-platform-config" +inherit pkgconfig +DEPENDS += "dlog" +DEPENDS += "smack" +DEPENDS += "dbus-glib" +DEPENDS += "sqlite3" +DEPENDS += "vconf" +DEPENDS += "libslp-db-util" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/pkgmgr-info.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 -- + + # create the directory for hosting Read-Write application manifest files + mkdir -p ${D}${prefix}/share/packages + + +} + +pkg_postinst_pkgmgr-info-parser() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig + chsmack -a '*' $D${prefix}/share/packages + +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_pkgmgr-info-parser() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " pkgmgr-info-parser " +PACKAGES += " pkgmgr-info " +PACKAGES += " pkgmgr-info-parser-dev " +PACKAGES += " pkgmgr-info-dev " + +pkgmgr-info-parser_files = "" +pkgmgr-info-parser_files += "${prefix}/lib/libpkgmgr_parser.so.*" +pkgmgr-info-parser_files += "/package-manager/preload/preload_list.txt" +pkgmgr-info-parser_files += "/package-manager/preload/manifest.xsd" +pkgmgr-info-parser_files += "/package-manager/preload/xml.xsd" +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" +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" +CONFFILES_${PN}-parser += "/package-manager/parserlib/metadata/mdparser_list.txt" +CONFFILES_${PN}-parser += "/package-manager/parserlib/category/category_parser_list.txt" +CONFFILES_${PN}-parser += "/package-manager/parserlib/tag_parser_list.txt" +MANIFESTFILES_${PN}-parser = "pkgmgr-info.manifest" + +pkgmgr-info_files = "" +pkgmgr-info_files += "${prefix}/lib/libpkgmgr-info.so.*" +pkgmgr-info_files += "%dir ${prefix}/share/packages" +MANIFESTFILES_${PN} = "pkgmgr-info.manifest" + +pkgmgr-info-parser-dev_files = "" +pkgmgr-info-parser-dev_files += "${prefix}/include/pkgmgr/pkgmgr_parser.h" +pkgmgr-info-parser-dev_files += "${prefix}/include/pkgmgr/pkgmgr_parser_db.h" +pkgmgr-info-parser-dev_files += "${prefix}/lib/pkgconfig/pkgmgr-parser.pc" +pkgmgr-info-parser-dev_files += "${prefix}/lib/libpkgmgr_parser.so" +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}/lib/pkgconfig/pkgmgr-info.pc" +pkgmgr-info-dev_files += "${prefix}/lib/libpkgmgr-info.so" +MANIFESTFILES_${PN}-dev = "pkgmgr-info.manifest" + +FILES_${PN}-parser = "${pkgmgr-info-parser_files}" +FILES_${PN} = "${pkgmgr-info_files}" +FILES_${PN}-parser-dev = "${pkgmgr-info-parser-dev_files}" +FILES_${PN}-dev = "${pkgmgr-info-dev_files}" + +PKG_pkgmgr-info-parser= "pkgmgr-info-parser" +PKG_pkgmgr-info= "pkgmgr-info" +PKG_pkgmgr-info-parser-dev= "pkgmgr-info-parser-dev" +PKG_pkgmgr-info-dev= "pkgmgr-info-dev" + +require pkgmgr-info-extraconf.inc + 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 new file mode 100644 index 0000000..1983693 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/TizenCommonCMakeMacro.patch @@ -0,0 +1,38 @@ +From fba91e42f737956fb27ef8ef75955ada9eef0539 Mon Sep 17 00:00:00 2001 +From: Xavier Roche <xavrock.os@gmail.com> +Date: Fri, 16 May 2014 18:05:01 +0200 +Subject: [PATCH] Removing TizenCommon macro in packaging + +Signed-off-by: Xavier Roche <xavrock.os@gmail.com> +--- + CMakeLists.txt | 1 - + parser/CMakeLists.txt | 1 - + 2 files changed, 2 deletions(-) + +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) + + SET(VERSION 0.0.17) + SET(VERSION_MAJOR 0) +-INCLUDE(TizenCommon) + + SET(PREFIX ${CMAKE_INSTALL_PREFIX}) + SET(EXEC_PREFIX "\${prefix}") +diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt +index 8904ecc..f183758 100755 +--- a/parser/CMakeLists.txt ++++ b/parser/CMakeLists.txt +@@ -6,7 +6,6 @@ cmake_minimum_required(VERSION 2.6) + #set(CMAKE_SKIP_BUILD_RPATH true) + set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) + +-INCLUDE(TizenCommon) + + ### Versioning + if(DEFINED ${VERSION}) +-- +1.7.9.5 + diff --git a/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/remove-dlog-for-native-build.patch b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/remove-dlog-for-native-build.patch new file mode 100644 index 0000000..bf83830 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info/remove-dlog-for-native-build.patch @@ -0,0 +1,71 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7b9f75d..216d778 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,14 +18,14 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/src ${CMAKE_ + + ### Required packages + INCLUDE(FindPkgConfig) +-pkg_check_modules(pkgs REQUIRED glib-2.0 dlog vconf sqlite3 db-util libxml-2.0 dbus-1 dbus-glib-1 libtzplatform-config libsmack) ++pkg_check_modules(pkgs REQUIRED glib-2.0 vconf sqlite3 db-util libxml-2.0 dbus-1 dbus-glib-1 libtzplatform-config libsmack) + + FOREACH(flag ${pkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") + ENDFOREACH(flag) + + +-pkg_check_modules(libpkgs REQUIRED glib-2.0 dlog vconf sqlite3 db-util libxml-2.0 dbus-1 dbus-glib-1 libtzplatform-config libsmack) ++pkg_check_modules(libpkgs REQUIRED glib-2.0 vconf sqlite3 db-util libxml-2.0 dbus-1 dbus-glib-1 libtzplatform-config libsmack) + + FOREACH(flag ${libpkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt +index 8904ecc..1968805 100755 +--- a/parser/CMakeLists.txt ++++ b/parser/CMakeLists.txt +@@ -26,7 +26,7 @@ message(STATUS "version/major : ${VERSION} / ${VERSION_MAJOR}") + ### Get required CFLAGS, LDFLAGS from pkg-config + + include(FindPkgConfig) +-pkg_check_modules(parser_pkgs REQUIRED dlog libxml-2.0 glib-2.0 sqlite3 db-util vconf) ++pkg_check_modules(parser_pkgs REQUIRED libxml-2.0 glib-2.0 sqlite3 db-util vconf) + + foreach(flag ${parser_pkgs_CFLAGS}) + set(parser_pkgs_CFLAGS_str "${parser_pkgs_CFLAGS_str} ${flag}") +diff --git a/include/pkgmgr-info-debug.h b/include/pkgmgr-info-debug.h +index 061fc50..809c048 100644 +--- a/include/pkgmgr-info-debug.h ++++ b/include/pkgmgr-info-debug.h +@@ -22,12 +22,14 @@ + #ifndef __PKGMGR_INFO_DEBUG_H__ + #define __PKGMGR_INFO_DEBUG_H__ + +-#include <dlog.h> +- +-#define _LOGE(fmt, arg...) LOGE(fmt, ##arg) +-#define _LOGD(fmt, arg...) LOGD(fmt, ##arg) ++#define NATIVEFAKELOG(fmt, ...) \ ++ do\ ++ {\ ++ printf("\n [%s: %s(): %d] " fmt"\n", rindex(__FILE__, '/')+1, __FUNCTION__, __LINE__, ##__VA_ARGS__);\ ++ } while (0) + +-#define PKGMGR_INFO_ENABLE_DLOG ++#define _LOGE(fmt, arg...) NATIVEFAKELOG(fmt, ##arg) ++#define _LOGD(fmt, arg...) NATIVEFAKELOG(fmt, ##arg) + + #define COLOR_RED "\033[0;31m" + #define COLOR_BLUE "\033[0;34m" +@@ -60,6 +62,12 @@ + while( 0 ) + + #else ++#define PKGMGR_INFO_DEBUG_ERR(fmt, ...)\ ++ do\ ++ {\ ++ printf("\n [%s: %s(): %d] " fmt"\n", rindex(__FILE__, '/')+1, __FUNCTION__, __LINE__, ##__VA_ARGS__);\ ++ }while (0) ++ + #define PKGMGR_INFO_DEBUG(fmt, ...) \ + do\ + {\ 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 new file mode 100644 index 0000000..8c50da2 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr-info/pkgmgr-info_git.bb @@ -0,0 +1,10 @@ +require pkgmgr-info.inc + +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" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/0001-remove-TizenConfig.patch b/meta-application-manager/recipes-application-framework/pkgmgr/files/0001-remove-TizenConfig.patch new file mode 100644 index 0000000..80e3396 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr/files/0001-remove-TizenConfig.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,8 +6,7 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) + + PROJECT(package-manager C) +-INCLUDE(TizenCommon) + + SET(VERSION 0.1.68) + SET(VERSION_MAJOR 0) + diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/Add_extralib.diff b/meta-application-manager/recipes-application-framework/pkgmgr/files/Add_extralib.diff new file mode 100644 index 0000000..efd9553 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr/files/Add_extralib.diff @@ -0,0 +1,28 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e0a9211..96a28f1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-# ++# + # Copyright (c) 2008 ~ 2010 Samsung Electronics Co., Ltd. + # All rights reserved + # +@@ -37,7 +37,7 @@ FOREACH(flag ${pkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") + ENDFOREACH(flag) + +-pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config notification) ++pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config notification xdgmime security-server) + + FOREACH(flag ${libpkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +@@ -76,7 +76,7 @@ ADD_LIBRARY(${PKGMGR_CLIENT} SHARED ${libpkgmgr-client_SOURCES}) + SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES SOVERSION ${VERSION_MAJOR}) + SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES VERSION ${VERSION}) + SET_TARGET_PROPERTIES(${PKGMGR_CLIENT} PROPERTIES COMPILE_FLAGS "${libpkgmgr-client_CFLAGS}") +-TARGET_LINK_LIBRARIES(${PKGMGR_CLIENT} pkgmgr_installer_client pkgmgr_installer_status_broadcast_server pkgmgr-info ${libpkgs_LDFLAGS}) ++TARGET_LINK_LIBRARIES(${PKGMGR_CLIENT} pkgmgr_installer_client pkgmgr_installer_status_broadcast_server pkgmgr-info ${libpkgs_LDFLAGS} -ldl) + ################################################################################################### + + ################################################################################################### diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/files/remove-dlog-for-native-build.patch b/meta-application-manager/recipes-application-framework/pkgmgr/files/remove-dlog-for-native-build.patch new file mode 100644 index 0000000..8b0d257 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr/files/remove-dlog-for-native-build.patch @@ -0,0 +1,213 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 96a28f1..471bb77 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,6 +18,8 @@ SET(LIBDIR ${LIB_INSTALL_DIR}) + SET(INCLUDEDIR "\${prefix}/include") + + ++ADD_DEFINITIONS("-DNDEBUG") ++ + set(CMAKE_SKIP_BUILD_RPATH true) + + #Verbose +@@ -28,16 +28,16 @@ INCLUDE(FindPkgConfig) + OPTION(X11_SUPPORT "Enable X support" ON) + IF(X11_SUPPORT) + ADD_DEFINITIONS("-DHAVE_X11") +- pkg_check_modules(pkgs REQUIRED security-server dlog elementary evas ecore appcore-efl ecore-x ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config) ++ pkg_check_modules(pkgs REQUIRED security-server elementary evas ecore appcore-efl ecore-x ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config) + ELSE() +- pkg_check_modules(pkgs REQUIRED security-server dlog elementary evas ecore appcore-efl ecore-wayland ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config) ++ pkg_check_modules(pkgs REQUIRED security-server elementary evas ecore appcore-efl ail ecore-file pkgmgr-parser pkgmgr-info iniparser libtzplatform-config) + ENDIF(X11_SUPPORT) + + FOREACH(flag ${pkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") + ENDFOREACH(flag) + +-pkg_check_modules(libpkgs REQUIRED dbus-glib-1 dlog ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config xdgmime) ++pkg_check_modules(libpkgs REQUIRED dbus-glib-1 ail pkgmgr-parser pkgmgr-info iniparser libtzplatform-config xdgmime) + + FOREACH(flag ${libpkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +diff --git a/client/include/pkgmgr-debug.h b/client/include/pkgmgr-debug.h +index 7ec0523..7599fd1 100644 +--- a/client/include/pkgmgr-debug.h ++++ b/client/include/pkgmgr-debug.h +@@ -22,10 +22,14 @@ + #ifndef __PKGMGR_DEBUG_H__ + #define __PKGMGR_DEBUG_H__ + +-#include <dlog.h> +- +-#define _LOGE(fmt, arg...) LOGE(fmt, ##arg) +-#define _LOGD(fmt, arg...) LOGD(fmt, ##arg) ++//#include <dlog.h> ++#define NATIVEFAKELOG(fmt, ...) \ ++ do\ ++ {\ ++ printf("\n [%s: %s(): %d] " fmt"\n", rindex(__FILE__, '/')+1, __FUNCTION__, __LINE__, ##__VA_ARGS__);\ ++ } while (0) ++#define _LOGE(fmt, arg...) NATIVEFAKELOG(fmt, ##arg) ++#define _LOGD(fmt, arg...) NATIVEFAKELOG(fmt, ##arg) + + + #define COLOR_RED "\033[0;31m" +@@ -35,25 +35,21 @@ + #define PKGMGR_DEBUG(fmt, ...)\ + do\ + {\ +- LOGD("[%s(): %d]" fmt, __FUNCTION__, __LINE__,##__VA_ARGS__);\ + } while (0) + + #define PKGMGR_DEBUG_ERR(fmt, ...)\ + do\ + {\ +- LOGE(COLOR_RED"[%s(): %d]" fmt COLOR_END, __FUNCTION__, __LINE__,##__VA_ARGS__);\ + }while (0) + + #define PKGMGR_BEGIN() \ + do\ + {\ +- LOGD(COLOR_BLUE"[%s(): %d] BEGIN >>>>"COLOR_END, __FUNCTION__ ,__LINE__);\ + } while( 0 ) + + #define PKGMGR_END() \ + do\ + {\ +- LOGD(COLOR_BLUE"[%s(): %d] END <<<<"COLOR_END, __FUNCTION__,__LINE__ );\ + } \ + while( 0 ) + +diff --git a/comm/CMakeLists.txt b/comm/CMakeLists.txt +index 7378df5..fd5a714 100755 +--- a/comm/CMakeLists.txt ++++ b/comm/CMakeLists.txt +@@ -25,7 +25,7 @@ message(STATUS "version/major : ${VERSION} / ${VERSION_MAJOR}") + ### Get required CFLAGS, LDFLAGS from pkg-config + + include(FindPkgConfig) +-pkg_check_modules(comm_pkgs REQUIRED dbus-1 dbus-glib-1 dlog pkgmgr-info) ++pkg_check_modules(comm_pkgs REQUIRED dbus-1 dbus-glib-1 pkgmgr-info) + + foreach(flag ${comm_pkgs_CFLAGS}) + set(comm_pkgs_CFLAGS_str "${comm_pkgs_CFLAGS_str} ${flag}") +diff --git a/comm/comm_config.h b/comm/comm_config.h +index 6fa50a9..7570b93 100755 +--- a/comm/comm_config.h ++++ b/comm/comm_config.h +@@ -36,7 +36,7 @@ + #endif + + /* Debug message macro */ +-#define USE_DLOG 1 /* Use dlog! */ ++//#define USE_DLOG 1 /* Use dlog! */ + + #ifndef NDEBUG + #ifdef USE_DLOG +@@ -54,14 +54,14 @@ + #include <sys/types.h> + #include <unistd.h> + #define dbg(fmtstr, args...) \ +- do { ++ do {\ + fprintf(stdout, "[%d:comm]%s:%d:%s(): " \ + fmtstr "\n", getpid(),\ + basename(__FILE__), __LINE__, __func__, ##args);\ + } while (0) + + #define ERR(fmtstr, args...) \ +- do { ++ do {\ + fprintf(stderr, "[%d:comm]%s:%d:%s(): " \ + fmtstr "\n", getpid(),\ + basename(__FILE__), __LINE__, __func__, ##args);\ +@@ -69,6 +69,14 @@ + #endif /* USE_DLOG */ + #else + #define dbg(fmtstr, args...) ++#define NATIVEFAKELOG(fmt, ...) \ ++ do\ ++ {\ ++ printf("\n [%s: %s(): %d] " fmt"\n", rindex(__FILE__, '/')+1, __FUNCTION__, __LINE__, ##__VA_ARGS__);\ ++ } while (0) ++#define ERR(fmt, arg...) NATIVEFAKELOG(fmt, ##arg) ++#define LOGD(fmt, arg...) NATIVEFAKELOG(fmt, ##arg) ++#define LOGE(fmt, arg...) NATIVEFAKELOG(fmt, ##arg) + #endif + + /* from comm_pkg_mgr.xml +diff --git a/comm/pkgmgr_installer.h b/comm/pkgmgr_installer.h +index 661249b..126b893 100755 +--- a/comm/pkgmgr_installer.h ++++ b/comm/pkgmgr_installer.h +@@ -40,7 +40,7 @@ extern "C" { + + #include <stdlib.h> + #include <getopt.h> +-#include <dlog.h> ++//#include <dlog.h> + + + +diff --git a/comm/test/CMakeLists.txt b/comm/test/CMakeLists.txt +index 016aca7..48c547e 100755 +--- a/comm/test/CMakeLists.txt ++++ b/comm/test/CMakeLists.txt +@@ -1,5 +1,5 @@ + include(FindPkgConfig) +-pkg_check_modules(test_pkgs REQUIRED dbus-glib-1 glib-2.0 dlog) ++pkg_check_modules(test_pkgs REQUIRED dbus-glib-1 glib-2.0 ) + + add_definitions(${test_pkgs_CFLAGS}) + +diff --git a/installers/sample/CMakeLists.txt b/installers/sample/CMakeLists.txt +index 162c8f4..6a027a1 100755 +--- a/installers/sample/CMakeLists.txt ++++ b/installers/sample/CMakeLists.txt +@@ -1,5 +1,5 @@ + include(FindPkgConfig) +-pkg_check_modules(parser_pkgs REQUIRED dlog libxml-2.0) ++pkg_check_modules(parser_pkgs REQUIRED libxml-2.0) + + foreach(flag ${parser_pkgs_CFLAGS}) + set(parser_pkgs_CFLAGS_str "${parser_pkgs_CFLAGS_str} ${flag}") +diff --git a/installers/sample/sample_parserlib.c b/installers/sample/sample_parserlib.c +index 4eb175b..d017318 100755 +--- a/installers/sample/sample_parserlib.c ++++ b/installers/sample/sample_parserlib.c +@@ -33,7 +33,7 @@ + #include <libxml/xmlreader.h> + + /* debug output */ +-#include <dlog.h> ++//#include <dlog.h> + #undef LOG_TAG + #define LOG_TAG "PKGMGR_PARSER" + +diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt +index 0eeb65b..f2f951b 100755 +--- a/tool/CMakeLists.txt ++++ b/tool/CMakeLists.txt +@@ -17,7 +17,7 @@ FOREACH(flag ${pkgs_test_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") + ENDFOREACH(flag) + +-pkg_check_modules(toolpkgs REQUIRED appcore-efl dlog bundle glib-2.0 pkgmgr-parser vconf security-server pkgmgr-info libtzplatform-config) ++pkg_check_modules(toolpkgs REQUIRED appcore-efl bundle glib-2.0 pkgmgr-parser vconf security-server pkgmgr-info libtzplatform-config) + FOREACH(flag ${libpkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") + ENDFOREACH(flag) +diff --git a/server/src/pkgmgr-server.c b/server/src/pkgmgr-server.c +index 8865c2f..45a775f 100755 +--- a/server/src/pkgmgr-server.c ++++ b/server/src/pkgmgr-server.c +@@ -59,6 +59,7 @@ + + /* debug output */ + #if defined(NDEBUG) ++#define DBGE(fmt, args...) + #define DBG(fmt, args...) + #define __SET_DBG_OUTPUT(fp) + #elif defined(PRINT) diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr-extraconf.inc b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr-extraconf.inc new file mode 100644 index 0000000..914d02b --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr-extraconf.inc @@ -0,0 +1,18 @@ +SRC_URI += "file://Add_extralib.diff" +SRC_URI_append_class-native = " file://remove-dlog-for-native-build.patch" + +do_compile_prepend_class-native() { + sed -i "s@"/usr/bin/pkginfo@"${STAGING_BINDIR_NATIVE}/pkginfo@g" ${S}/tool/pkg_initdb.c +} + +do_install_append() { + rm -fr "${D}${prefix}/bin/pkgcmd.real" + rm -fr "${D}${prefix}/bin/pkgcmd.wrapper" +} + +RDEPENDS_${PN}_remove_class-native = "systemd-native" +DEPENDS_remove_class-native = "dlog-native" + +RDEPENDS_${PN}-client += "pkgmgr-server" + +EXTRA_OECMAKE+="-DCMAKE_AR:PATH=ar"
\ No newline at end of file diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc new file mode 100644 index 0000000..144d882 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr.inc @@ -0,0 +1,308 @@ +DESCRIPTION = "Packager Manager client library package" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Application Framework/Package Management" +LICENSE = "Apache-2.0" +PV = "0.2.89" +PR = "r1" + +SRC_URI = " file://0001-remove-TizenConfig.patch " + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by pkgmgr-client +PROVIDES += "pkgmgr-client" + + +#PROVIDES by pkgmgr + + +#PROVIDES by pkgmgr-server +PROVIDES += "pkgmgr-server" + + +#PROVIDES by pkgmgr-types-dev +PROVIDES += "pkgmgr-types-dev" + + +#PROVIDES by pkgmgr-client-dev +PROVIDES += "pkgmgr-client-dev" + + +#PROVIDES by pkgmgr-installer-dev +PROVIDES += "pkgmgr-installer-dev" + + +#PROVIDES by pkgmgr-installer +PROVIDES += "pkgmgr-installer" + + +RDEPENDS = "" +#RDEPENDS of pkgmgr-client (${PN}-client) +RDEPENDS_${PN}-client += "shared-mime-info" +RDEPENDS_${PN}-client += "pkgmgr" + +#RDEPENDS of pkgmgr-server (${PN}-server) +RDEPENDS_${PN}-server += "pkgmgr" + +#RDEPENDS of pkgmgr-types-dev (${PN}-types-dev) +RDEPENDS_${PN}-types-dev += "pkgmgr" + +#RDEPENDS of pkgmgr-client-dev (${PN}-client-dev) +RDEPENDS_${PN}-client-dev += "pkgmgr" + +#RDEPENDS of pkgmgr-installer-dev (${PN}-installer-dev) +RDEPENDS_${PN}-installer-dev += "pkgmgr" + +#RDEPENDS of pkgmgr-installer (${PN}-installer) +RDEPENDS_${PN}-installer += "pkgmgr" + + +DEPENDS = "" +#DEPENDS of pkgmgr +DEPENDS += "pkgmgr-info" +#Replace "DEPENDS" on gettext by "inherit gettext" +inherit gettext +DEPENDS += "unzip" +inherit tizen_cmake +DEPENDS += "iniparser" +DEPENDS += "notification" +DEPENDS += "dbus" +inherit pkgconfig +DEPENDS += "dlog" +DEPENDS += "security-server" +DEPENDS += "ail" +DEPENDS += "smack" +DEPENDS += "bundle" +DEPENDS += "ecore" +DEPENDS += "app-core" +DEPENDS += "tizen-platform-config" +DEPENDS += "dbus-glib" +DEPENDS_append_class-native = " fdupes-native" +DEPENDS_append_class-target = " fdupes-native" + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/pkgmgr.manifest ${S}/packaging/pkgmgr-client.manifest ${S}/packaging/pkgmgr-client-devel.manifest ${S}/packaging/pkgmgr-server.manifest ${S}/packaging/pkgmgr-installer.manifest ${S}/packaging/pkgmgr-installer-devel.manifest ${S}/packaging/pkgmgr-types-devel.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=/usr \ + -DCMAKE_INSTALL_LIBDIR:PATH=/usr/lib \ + -DINCLUDE_INSTALL_DIR:PATH=/usr/include \ + -DLIB_INSTALL_DIR:PATH=/usr/lib \ + -DSYSCONF_INSTALL_DIR:PATH=/etc/ \ + -DSHARE_INSTALL_PREFIX:PATH=/usr/share \ + -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ + ${EXTRA_OECMAKE} . + + oe_runmake ${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=/usr/bin \ + install + rm -f ${D}${infodir}/dir + find ${D} -regex ".*\.la$" | xargs rm -f -- + find ${D} -regex ".*\.a$" | xargs rm -f -- + rm -f ${D}/usr/bin/pkgmgr_backend_sample + rm -f ${D}/usr/lib/libpkgmgr_backend_lib_sample.so + rm -f ${D}/usr/lib/libpkgmgr_parser_lib_sample.so + + mkdir -p ${D}/package-manager/backend + mkdir -p ${D}/package-manager/backendlib + mkdir -p ${D}/opt/upgrade + + mkdir -p ${D}/package-manager/server + + #find_lang package-manager + + #fdupes ${D} + + +} + +pkg_postinst_pkgmgr-installer() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postinst_pkgmgr-server() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig + # For pkgmgr-install: + # Update mime database to support package mime types + update-mime-database $D/usr/share/mime + chsmack -a '*' $D/usr/share/packages + +} + +pkg_postinst_pkgmgr-client() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_pkgmgr-client() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +pkg_postrm_pkgmgr-installer() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " pkgmgr-client " +PACKAGES += " pkgmgr " +PACKAGES += " pkgmgr-server " +PACKAGES += " pkgmgr-types-dev " +PACKAGES += " pkgmgr-client-dev " +PACKAGES += " pkgmgr-installer-dev " +PACKAGES += " pkgmgr-installer " + +pkgmgr-client_files = "" +pkgmgr-client_files += "/package-manager" +pkgmgr-client_files += "/package-manager/pkg_path.conf" +pkgmgr-client_files += "/usr/lib/libpkgmgr-client.so.*" +CONFFILES_${PN}-client = "" +CONFFILES_${PN}-client += "/package-manager/pkg_path.conf" +MANIFESTFILES_${PN}-client = "pkgmgr-client.manifest" +DIRFILES_${PN}-client = "" +DIRFILES_${PN}-client += "/package-manager" + +pkgmgr_files = "" +pkgmgr_files += "/package-manager/backend" +pkgmgr_files += "/package-manager/backendlib" +pkgmgr_files += "/opt/upgrade" +pkgmgr_files += "/opt/upgrade/pkgmgr.patch.sh" +pkgmgr_files += "/usr/bin/pkgcmd" +pkgmgr_files += "/usr/bin/pkg_createdb" +pkgmgr_files += "/usr/bin/pkg_createdb_user" +pkgmgr_files += "/usr/bin/pkg_syncdb" +pkgmgr_files += "/usr/bin/pkg_syncdb_user" +pkgmgr_files += "/usr/bin/pkg_initdb" +pkgmgr_files += "/usr/bin/pkg_initdb_user" +pkgmgr_files += "/usr/bin/pkg_getsize" +pkgmgr_files += "/usr/bin/pkginfo" +pkgmgr_files += "/usr/bin/pkgmgr-install" +pkgmgr_files += "%dir /usr/share/packages" +pkgmgr_files += "/usr/share/packages/org.tizen.pkgmgr-install.xml" +pkgmgr_files += "/usr/share/mime/packages/mime.wac.xml" +pkgmgr_files += "/usr/share/mime/packages/mime.tpk.xml" +MANIFESTFILES_${PN} = "pkgmgr.manifest" +DIRFILES_${PN} = "" +DIRFILES_${PN} += "/package-manager/backend" +DIRFILES_${PN} += "/package-manager/backendlib" +DIRFILES_${PN} += "/opt/upgrade" + +pkgmgr-server_files = "" +pkgmgr-server_files += "/usr/share/dbus-1/system-services/org.tizen.slp.pkgmgr.service" +pkgmgr-server_files += "/dbus-1/system.d/org.tizen.slp.pkgmgr.conf" +pkgmgr-server_files += "/usr/bin/pkgmgr-server" +pkgmgr-server_files += "/package-manager/server" +CONFFILES_${PN}-server = "" +CONFFILES_${PN}-server += "/dbus-1/system.d/org.tizen.slp.pkgmgr.conf" +MANIFESTFILES_${PN}-server = "pkgmgr-server.manifest" + +pkgmgr-types-dev_files = "" +pkgmgr-types-dev_files += "/usr/include/package-manager-types.h" +pkgmgr-types-dev_files += "/usr/include/package-manager-plugin.h" +pkgmgr-types-dev_files += "/usr/lib/pkgconfig/pkgmgr-types.pc" +MANIFESTFILES_${PN}-types-dev = "pkgmgr-types-devel.manifest" + +pkgmgr-client-dev_files = "" +pkgmgr-client-dev_files += "/usr/include/package-manager.h" +pkgmgr-client-dev_files += "/usr/include/pkgmgr-dbinfo.h" +pkgmgr-client-dev_files += "/usr/lib/pkgconfig/pkgmgr.pc" +pkgmgr-client-dev_files += "/usr/lib/libpkgmgr-client.so" +MANIFESTFILES_${PN}-client-dev = "pkgmgr-client-devel.manifest" + +pkgmgr-installer-dev_files = "" +pkgmgr-installer-dev_files += "/usr/include/pkgmgr" +pkgmgr-installer-dev_files += "/usr/include/pkgmgr/pkgmgr_installer.h" +pkgmgr-installer-dev_files += "/usr/lib/pkgconfig/pkgmgr-installer-status-broadcast-server.pc" +pkgmgr-installer-dev_files += "/usr/lib/pkgconfig/pkgmgr-installer.pc" +pkgmgr-installer-dev_files += "/usr/lib/pkgconfig/pkgmgr-installer-client.pc" +pkgmgr-installer-dev_files += "/usr/lib/libpkgmgr_installer.so" +pkgmgr-installer-dev_files += "/usr/lib/libpkgmgr_installer_client.so" +pkgmgr-installer-dev_files += "/usr/lib/libpkgmgr_installer_status_broadcast_server.so" +MANIFESTFILES_${PN}-installer-dev = "pkgmgr-installer-devel.manifest" +DIRFILES_${PN}-installer-dev = "" +DIRFILES_${PN}-installer-dev += "/usr/include/pkgmgr" + +pkgmgr-installer_files = "" +pkgmgr-installer_files += "/usr/lib/libpkgmgr_installer.so.*" +pkgmgr-installer_files += "/usr/lib/libpkgmgr_installer_status_broadcast_server.so.*" +pkgmgr-installer_files += "/usr/lib/libpkgmgr_installer_client.so.*" +MANIFESTFILES_${PN}-installer = "pkgmgr-installer.manifest" + +FILES_${PN}-client = "${pkgmgr-client_files}" +FILES_${PN} = "${pkgmgr_files}" +FILES_${PN}-server = "${pkgmgr-server_files}" +FILES_${PN}-types-dev = "${pkgmgr-types-dev_files}" +FILES_${PN}-client-dev = "${pkgmgr-client-dev_files}" +FILES_${PN}-installer-dev = "${pkgmgr-installer-dev_files}" +FILES_${PN}-installer = "${pkgmgr-installer_files}" + +PKG_pkgmgr-client= "pkgmgr-client" +PKG_pkgmgr= "pkgmgr" +PKG_pkgmgr-server= "pkgmgr-server" +PKG_pkgmgr-types-dev= "pkgmgr-types-dev" +PKG_pkgmgr-client-dev= "pkgmgr-client-dev" +PKG_pkgmgr-installer-dev= "pkgmgr-installer-dev" +PKG_pkgmgr-installer= "pkgmgr-installer" + +require pkgmgr-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_git.bb b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_git.bb new file mode 100644 index 0000000..74a3593 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/pkgmgr/pkgmgr_git.bb @@ -0,0 +1,10 @@ +require pkgmgr.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/slp-pkgmgr;tag=ceb738c1b4e04b9b07cbbc87ec0f4c949e4fbab3;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys-extraconf.inc b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys-extraconf.inc new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys-extraconf.inc 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 new file mode 100644 index 0000000..e5fbf31 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys.inc @@ -0,0 +1,107 @@ +DESCRIPTION = "Internal shared keys for vconf" +HOMEPAGE = "http://nohomepage.org" +SECTION = "Application Framework/Development" +LICENSE = "Apache-2.0" +PV = "0.0.82" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by vconf-internal-keys + + +#PROVIDES by vconf-internal-keys-dev +PROVIDES += "vconf-internal-keys-dev" + + +RDEPENDS = "" + +DEPENDS = "" +#DEPENDS of vconf-internal-keys +inherit tizen_cmake + +do_prep() { + cd ${S} + chmod -Rf a+rX,u+w,g-w,o-w ${S} + #setup -q + cp ${S}/packaging/vconf-internal-keys.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 -- + + + +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " vconf-internal-keys-dev " + +vconf-internal-keys-dev_files = "" +vconf-internal-keys-dev_files += "${prefix}/include/vconf/*" +vconf-internal-keys-dev_files += "${prefix}/lib/pkgconfig/*.pc" +MANIFESTFILES_${PN}-dev = "vconf-internal-keys.manifest" + +FILES_${PN}-dev = "${vconf-internal-keys-dev_files}" + +PKG_vconf-internal-keys-dev= "vconf-internal-keys-dev" + +require vconf-internal-keys-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_git.bb b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_git.bb new file mode 100644 index 0000000..0aff6fa --- /dev/null +++ b/meta-application-manager/recipes-application-framework/vconf-internal-keys/vconf-internal-keys_git.bb @@ -0,0 +1,10 @@ +require vconf-internal-keys.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/vconf-internal-keys;tag=9d1f756ba5062a60eeea11cf0b2b7fd60461bcf5;nobranch=1" + +BBCLASSEXTEND += " native " + diff --git a/meta-application-manager/recipes-application-framework/vconf/files/0002_compiler_changes.patch b/meta-application-manager/recipes-application-framework/vconf/files/0002_compiler_changes.patch new file mode 100644 index 0000000..e80c6b0 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/vconf/files/0002_compiler_changes.patch @@ -0,0 +1,46 @@ +--- a/include/vconf-internals.h ++++ b/include/vconf-internals.h +@@ -189,6 +189,6 @@ + int _vconf_keynode_set_keyname(keynode_t *keynode, const char *keyname); +-inline void _vconf_keynode_set_null(keynode_t *keynode); +-inline keynode_t *_vconf_keynode_new(void); +-inline void _vconf_keynode_free(keynode_t *keynode); ++void _vconf_keynode_set_null(keynode_t *keynode); ++keynode_t *_vconf_keynode_new(void); ++void _vconf_keynode_free(keynode_t *keynode); + + #endif +--- a/vconf.c ++++ b/vconf.c +@@ -119,7 +119,7 @@ + } + +-inline void _vconf_keynode_set_null(keynode_t *keynode) ++void _vconf_keynode_set_null(keynode_t *keynode) + { + keynode->type = VCONF_TYPE_NONE; + //keynode->value.d = NULL; + } +--- a/vconf.c ++++ b/vconf.c +@@ -130,7 +130,7 @@ + return keynode->next; + } + +-inline keynode_t *_vconf_keynode_new(void) ++keynode_t *_vconf_keynode_new(void) + { + keynode_t *keynode; + keynode = calloc(1, sizeof(keynode_t)); +--- a/vconf.c ++++ b/vconf.c +@@ -138,7 +138,7 @@ + } + +-inline void _vconf_keynode_free(keynode_t *keynode) ++void _vconf_keynode_free(keynode_t *keynode) + { + if(keynode) { + if (keynode->keyname) + free(keynode->keyname); + diff --git a/meta-application-manager/recipes-application-framework/vconf/files/remove-dlog-for-native.patch b/meta-application-manager/recipes-application-framework/vconf/files/remove-dlog-for-native.patch new file mode 100644 index 0000000..b714d45 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/vconf/files/remove-dlog-for-native.patch @@ -0,0 +1,25 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 28d168d..9dd6e52 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + + INCLUDE(FindPkgConfig) + pkg_check_modules(glib_pkg REQUIRED gobject-2.0) +-pkg_check_modules(pkgs REQUIRED glib-2.0 dlog libtzplatform-config vconf-internal-keys) ++pkg_check_modules(pkgs REQUIRED glib-2.0 libtzplatform-config vconf-internal-keys) + + FOREACH(flag ${pkgs_CFLAGS}) + SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") +diff --git a/include/vconf-log.h b/include/vconf-log.h +index fa53102..f70d1e1 100755 +--- a/include/vconf-log.h ++++ b/include/vconf-log.h +@@ -26,7 +26,6 @@ + #include <unistd.h> + #include <stdlib.h> + +-#define VCONF_DLOG_OUT + + /************** Error ***************/ + #ifdef VCONF_SYSLOG_OUT diff --git a/meta-application-manager/recipes-application-framework/vconf/vconf-extraconf.inc b/meta-application-manager/recipes-application-framework/vconf/vconf-extraconf.inc new file mode 100644 index 0000000..abc8292 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/vconf/vconf-extraconf.inc @@ -0,0 +1,28 @@ +SRC_URI_append_class-native = " file://remove-dlog-for-native.patch \ + " +SRC_URI_append = " file://0002_compiler_changes.patch \ + " + +RDEPENDS_${PN}_remove_class-native = "glibc-native" +RDEPENDS_${PN}_remove_class-native = "systemd-native" +DEPENDS_remove_class-native = "dlog-native" + +DEPENDS_class-target += "glib-2.0" +DEPENDS_class-target += "vconf-native" +DEPENDS_class-target += "vconf-internal-keys" +DEPENDS_class-target += "dlog" + +do_install_append_class-native() { + sed -i "s@source /etc/tizen-platform.conf@source ${sysconfdir}/tizen-platform.conf@g" ${D}${prefix}/bin/vconf-init +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + [ "x\$D" == "x" ] && ldconfig + [ "x\$D" == "x" ] && systemctl daemon-reload + chsmack -a 'User' $D${prefix}/kdb + chsmack -a 'User' $D${prefix}/kdb/db + chsmack -a 'User' $D${prefix}/kdb/db/.backup + +} diff --git a/meta-application-manager/recipes-application-framework/vconf/vconf.inc b/meta-application-manager/recipes-application-framework/vconf/vconf.inc new file mode 100644 index 0000000..dccda42 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/vconf/vconf.inc @@ -0,0 +1,181 @@ +DESCRIPTION = "Configuration system library" +HOMEPAGE = "http://nohomepage.org" +SECTION = "System/Libraries" +LICENSE = "Apache-2.0" +PV = "0.2.51" + +SRC_URI = "" + +S = "${WORKDIR}/git" + +inherit autotools-brokensep + +BBCLASSEXTEND = "" +PROVIDES = "" + +#PROVIDES by vconf-keys-dev +PROVIDES += "vconf-keys-dev" + + +#PROVIDES by vconf + + +#PROVIDES by vconf-dev +PROVIDES += "vconf-dev" + + +RDEPENDS = "" +#RDEPENDS of vconf-keys-dev (${PN}-keys-dev) +RDEPENDS_${PN}-keys-dev += "vconf" +RDEPENDS_${PN}-keys-dev += "vconf-internal-keys-dev" + +#RDEPENDS of vconf (${PN}) +RDEPENDS_${PN} += "glibc" +RDEPENDS_${PN} += "systemd" + +#RDEPENDS of vconf-dev (${PN}-dev) +RDEPENDS_${PN}-dev += "vconf" +RDEPENDS_${PN}-dev += "glib-2.0" + + +DEPENDS = "" +#DEPENDS of vconf +inherit tizen_cmake +DEPENDS += "vconf-internal-keys" +DEPENDS += "tizen-platform-config" +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 vconf-0.2.51 + cp ${S}/packaging/vconf.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} . \ + -DTZ_SYS_CONFIG=${prefix}/kdb + + 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}${prefix}/kdb/db + mkdir -p ${D}${prefix}/kdb/db/.backup + mkdir -p ${D}${systemd_unitdir}/system/basic.target.wants + mkdir -p ${D}${prefix}/lib/tmpfiles.d + install -m0644 ${S}/packaging/vconf-setup.service ${D}${systemd_unitdir}/system/ + install -m0644 ${S}/packaging/vconf-setup.conf ${D}${prefix}/lib/tmpfiles.d/ + ln -sf ../vconf-setup.service ${D}${systemd_unitdir}/system/basic.target.wants/ + + +} + +pkg_postinst_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig + systemctl daemon-reload + chsmack -a 'User' $D${prefix}/kdb + chsmack -a 'User' $D${prefix}/kdb/db + chsmack -a 'User' $D${prefix}/kdb/db/.backup + +} + +pkg_postrm_${PN}() { + #!/bin/sh -e + + [ "x$D" == "x" ] && ldconfig + systemctl daemon-reload + +} + +PACKAGES = "${PN}-dbg ${PN}-doc ${PN}-locale" +PACKAGES += " vconf-keys-dev " +PACKAGES += " vconf " +PACKAGES += " vconf-dev " + +vconf-keys-dev_files = "" +vconf-keys-dev_files += "${prefix}/include/vconf/vconf-keys.h" +MANIFESTFILES_${PN}-keys-dev = "vconf.manifest" + +vconf_files = "" +vconf_files += "${sysconfdir}/preconf.d/vconf-setup" +vconf_files += "${prefix}/bin/vconftool" +vconf_files += "${prefix}/bin/vconf-init" +vconf_files += "${prefix}/kdb/kdb_first_boot" +vconf_files += "${prefix}/lib/*.so.*" +vconf_files += "%attr(777,root,users) ${prefix}/kdb/db" +vconf_files += "%attr(777,root,root) ${prefix}/kdb/db/.backup" +vconf_files += "${systemd_unitdir}/system/basic.target.wants/vconf-setup.service" +vconf_files += "${systemd_unitdir}/system/vconf-setup.service" +vconf_files += "${prefix}/lib/tmpfiles.d/vconf-setup.conf" +MANIFESTFILES_${PN} = "vconf.manifest" +DIRFILES_${PN} = "" +DIRFILES_${PN} += "%attr(777,root,users) ${prefix}/kdb/db" +DIRFILES_${PN} += "%attr(777,root,root) ${prefix}/kdb/db/.backup" + +vconf-dev_files = "" +vconf-dev_files += "${prefix}/include/vconf/vconf.h" +vconf-dev_files += "${prefix}/lib/pkgconfig/*.pc" +vconf-dev_files += "${prefix}/lib/*.so" +MANIFESTFILES_${PN}-dev = "vconf.manifest" + +FILES_${PN}-keys-dev = "${vconf-keys-dev_files}" +FILES_${PN} = "${vconf_files}" +FILES_${PN}-dev = "${vconf-dev_files}" + +PKG_vconf-keys-dev= "vconf-keys-dev" +PKG_vconf= "vconf" +PKG_vconf-dev= "vconf-dev" + +require vconf-extraconf.inc + diff --git a/meta-application-manager/recipes-application-framework/vconf/vconf_git.bb b/meta-application-manager/recipes-application-framework/vconf/vconf_git.bb new file mode 100644 index 0000000..bc66995 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/vconf/vconf_git.bb @@ -0,0 +1,10 @@ +require vconf.inc + +PRIORITY = "10" + +LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" + +SRC_URI += "git://review.tizen.org/platform/core/appfw/vconf;tag=4743f153c4f30c05e65c895ee03b689fafa29a43;nobranch=1" + +BBCLASSEXTEND += " native " + |