diff options
5 files changed, 101 insertions, 83 deletions
diff --git a/meta-application-manager/recipes-application-framework/aul/aul-extraconf.inc b/meta-application-manager/recipes-application-framework/aul/aul-extraconf.inc index 65d4b2a..87be6a4 100644 --- a/meta-application-manager/recipes-application-framework/aul/aul-extraconf.inc +++ b/meta-application-manager/recipes-application-framework/aul/aul-extraconf.inc @@ -1,12 +1,4 @@ -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" @@ -16,15 +8,7 @@ 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 +SRC_URI = " \ + file://0001_remove_ttrace_tizen-extension-client.patch \ + file://0002_avoid_undeclare_error_of_errno_and_EEXIST.patch \ +" diff --git a/meta-application-manager/recipes-application-framework/aul/aul.inc b/meta-application-manager/recipes-application-framework/aul/aul.inc index 1b853c3..435978b 100644 --- a/meta-application-manager/recipes-application-framework/aul/aul.inc +++ b/meta-application-manager/recipes-application-framework/aul/aul.inc @@ -1,10 +1,10 @@ DESCRIPTION = "App utility library" HOMEPAGE = "http://nohomepage.org" -SECTION = "System/Libraries" +SECTION = "Application Framework/Libraries" LICENSE = "Apache-2.0" PV = "0.0.300" -SRC_URI = "file://amd_session_agent.service.patch" +SRC_URI = "" S = "${WORKDIR}/git" @@ -28,6 +28,7 @@ RDEPENDS = "" #RDEPENDS of aul (${PN}) RDEPENDS_${PN} += "glibc" RDEPENDS_${PN} += "systemd" +RDEPENDS_${PN} += "tizen-platform-config" #RDEPENDS of aul-dev (${PN}-dev) RDEPENDS_${PN}-dev += "aul" @@ -39,22 +40,23 @@ 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" + +DEPENDS += "glib-2.0" +DEPENDS += "capi-system-info" +DEPENDS += "iniparser" +DEPENDS += "wayland" +DEPENDS += "libxml2" + do_prep() { cd ${S} @@ -79,7 +81,7 @@ do_compile() { unset DISPLAY LD_AS_NEEDED=1; export LD_AS_NEEDED ; - + MAJORVER=`echo ${PV} | awk 'BEGIN {FS="."}{print $1}'` ; cmake \ -DCMAKE_VERBOSE_MAKEFILE=ON \ @@ -92,9 +94,14 @@ do_compile() { -DCMAKE_SKIP_RPATH:BOOL=ON \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake \ + -DFULLVER=${PV} \ + -DMAJORVER=${MAJORVER} \ + -Dwith_wayland=TRUE \ + -DTIZEN_FEATURE_DEFAULT_USER:BOOL=${TIZEN_FEATURE_DEFAULT_USER} \ ${EXTRA_OECMAKE} . oe_runmake ${PARALLEL_MAKE} + sqlite3 .appsvc.db < ./data/appsvc_db.sql } @@ -119,56 +126,32 @@ do_install() { 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 - - + mkdir -p ${D}${sysconfdir}/skel/.applications/dbspace + install -m 0644 .appsvc.db ${D}${sysconfdir}/skel/.applications/dbspace/.appsvc.db + + mkdir -p ${D}${prefix}/share/appsvc + cp -R alias/* ${D}${prefix}/share/appsvc + + mkdir -p ${D}${systemd_unitdir}/system/sysinit.target.wants + install -m 0644 ${S}/packaging/${PN}.service ${D}${systemd_unitdir}/system/aul.service + ln -sf ${S}/packaging/aul.service ${D}${systemd_unitdir}/system/sysinit.target.wants/aul.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 + chsmack -a 'User::Home' ${sysconfdir}/skel/.applications/dbspace/.appsvc.db } 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" @@ -177,26 +160,20 @@ 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}/lib/libaul.so.*" aul_files += "${prefix}/bin/aul_test" aul_files += "${prefix}/bin/app_launcher" -aul_files += "${prefix}/bin/amd_session_agent" +aul_files += "${prefix}/bin/appgroup_info" +aul_files += "${prefix}/bin/app_com_tool" +aul_files += "${prefix}/bin/launch_app" +aul_files += "${prefix}/bin/appid2pid" +aul_files += "${prefix}/bin/launch_debug" 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" +aul_files += "${prefix}/share/appsvc/*" +aul_files += "${sysconfdir}/skel/.applications/dbspace/.appsvc.db" +aul_files += "${systemd_unitdir}/system/aul.service" +aul_files += "${systemd_unitdir}/system/sysinit.target.wants/aul.service" MANIFESTFILES_${PN} = "aul.manifest" aul-dev_files = "" @@ -205,10 +182,7 @@ 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}" diff --git a/meta-application-manager/recipes-application-framework/aul/aul_git.bb b/meta-application-manager/recipes-application-framework/aul/aul_git.bb index 2816749..a0fee90 100644 --- a/meta-application-manager/recipes-application-framework/aul/aul_git.bb +++ b/meta-application-manager/recipes-application-framework/aul/aul_git.bb @@ -4,7 +4,7 @@ PRIORITY = "10" LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI += "git://review.tizen.org/platform/core/appfw/aul-1;tag=ef7b405abf2577b9e5bf7aa24944e24552ca5b8e;nobranch=1" +SRC_URI += "git://review.tizen.org/platform/core/appfw/aul-1;tag=b14acdd722084f62a2bee2ded3d4ce7f8400559a;nobranch=1" BBCLASSEXTEND += " native " diff --git a/meta-application-manager/recipes-application-framework/aul/files/0001_remove_ttrace_tizen-extension-client.patch b/meta-application-manager/recipes-application-framework/aul/files/0001_remove_ttrace_tizen-extension-client.patch new file mode 100644 index 0000000..effbcb6 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/aul/files/0001_remove_ttrace_tizen-extension-client.patch @@ -0,0 +1,48 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 088b6d0..7160c32 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -13,9 +13,9 @@ ENDIF (with_x11) + + # Set required packages + INCLUDE(FindPkgConfig) +-SET(AUL-1_LIB_PKG_CHECK_MODULES dlog bundle xdgmime libtzplatform-config pkgmgr-info capi-system-info vconf sqlite3 iniparser gio-2.0 glib-2.0 libxml-2.0 ttrace) ++SET(AUL-1_LIB_PKG_CHECK_MODULES dlog bundle xdgmime libtzplatform-config pkgmgr-info capi-system-info vconf sqlite3 iniparser gio-2.0 glib-2.0 libxml-2.0) + IF (with_wayland) +- pkg_check_modules(libpkgs REQUIRED ${AUL-1_LIB_PKG_CHECK_MODULES} wayland-client tizen-extension-client ecore-wayland) ++ pkg_check_modules(libpkgs REQUIRED ${AUL-1_LIB_PKG_CHECK_MODULES} wayland-client ecore-wayland) + ENDIF (with_wayland) + IF (with_x11) + pkg_check_modules(libpkgs REQUIRED ${AUL-1_LIB_PKG_CHECK_MODULES}) +diff --git a/src/launch.c b/src/launch.c +index 72d8a9d..3ae466b 100644 +--- a/src/launch.c ++++ b/src/launch.c +@@ -25,7 +25,7 @@ + #include <dirent.h> + #include <glib.h> + #include <gio/gio.h> +-#include <ttrace.h> ++//#include <ttrace.h> + + #include <bundle_internal.h> + +@@ -289,7 +289,7 @@ int app_request_to_launchpad_for_uid(int cmd, const char *appid, bundle *kb, uid + int ret = 0; + bundle *b; + +- traceBegin(TTRACE_TAG_APPLICATION_MANAGER, "AUL:REQ_TO_PAD"); ++ //traceBegin(TTRACE_TAG_APPLICATION_MANAGER, "AUL:REQ_TO_PAD"); + SECURE_LOGD("launch request : %s", appid); + if (kb == NULL) { + kb = bundle_create(); +@@ -340,7 +340,7 @@ int app_request_to_launchpad_for_uid(int cmd, const char *appid, bundle *kb, uid + if (must_free) + bundle_free(kb); + +- traceEnd(TTRACE_TAG_APPLICATION_MANAGER); ++ //traceEnd(TTRACE_TAG_APPLICATION_MANAGER); + + return ret; + } + diff --git a/meta-application-manager/recipes-application-framework/aul/files/0002_avoid_undeclare_error_of_errno_and_EEXIST.patch b/meta-application-manager/recipes-application-framework/aul/files/0002_avoid_undeclare_error_of_errno_and_EEXIST.patch new file mode 100644 index 0000000..80ba737 --- /dev/null +++ b/meta-application-manager/recipes-application-framework/aul/files/0002_avoid_undeclare_error_of_errno_and_EEXIST.patch @@ -0,0 +1,12 @@ +diff --git a/src/service_db.c b/src/service_db.c +index 4e6edea..79a0aaa 100755 +--- a/src/service_db.c ++++ b/src/service_db.c +@@ -24,6 +24,7 @@ + #include <ctype.h> + #include <tzplatform_config.h> + ++#include "aul.h" + #include "aul_svc_db.h" + #include "aul_util.h" + |