1 files changed, 36 insertions, 62 deletions
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}"