X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-app-framework%2Fclasses%2Faglwgt.bbclass;h=b208babdf783f10f21ad577174910f122c38af47;hb=refs%2Fchanges%2F65%2F10165%2F4;hp=afe9a55169ed532e3c526f01116ea6b59174a4db;hpb=2ceaa31f4137a5a9fb759338827f4b5d1d995772;p=AGL%2Fmeta-agl.git

diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass
index afe9a5516..b208babdf 100644
--- a/meta-app-framework/classes/aglwgt.bbclass
+++ b/meta-app-framework/classes/aglwgt.bbclass
@@ -17,13 +17,14 @@ DEPENDS_append = " af-binder"
 
 do_aglwgt_package()  {
         cd ${B}
-        make package || ( \
-          bbwarn "Your makefile must support the 'make package' target" ; \
+        make package || \
+        ${S}/conf.d/autobuild/agl/autobuild package BUILD_DIR=${B} DEST=${B}/package || \
+        ( bbwarn "Your makefile must support the 'make package' target" ; \
           bbwarn "and generate a .wgt file using wgtpack in the"; \
           bbwarn "subfolder ./package/ !" ; \
           bbwarn "Fix your package as it will not work within the SDK" ; \
           bbwarn "See: https://wiki.automotivelinux.org/troubleshooting/app-recipes" \
-                        )
+        )
 }
 
 python () {
@@ -37,17 +38,24 @@ POST_INSTALL_SCRIPT ?= "${POST_INSTALL_LEVEL}-${PN}.sh"
 EXTRA_WGT_POSTINSTALL ?= ""
 
 do_aglwgt_deploy() {
-    install -d ${D}/usr/AGL/apps
-    install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/
+    if [ "${AGLWGT_AUTOINSTALL_${PN}}" = "0" ]
+    then
+        install -d ${D}/usr/AGL/apps/manualinstall
+        install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/manualinstall
+    else
+        install -d ${D}/usr/AGL/apps/autoinstall
+        install -m 0644 ${B}/package/*.wgt ${D}/usr/AGL/apps/autoinstall
+    fi
+
     APP_FILES=""
-    for file in ${D}/usr/AGL/apps/*.wgt;do
+    for file in ${D}/usr/AGL/apps/autoinstall/*.wgt;do
         APP_FILES="${APP_FILES} $(basename $file)";
     done
     install -d ${D}/${sysconfdir}/agl-postinsts
     cat > ${D}/${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} <<EOF
 #!/bin/sh -e
 for file in ${APP_FILES}; do
-    /usr/bin/afm-install install /usr/AGL/apps/\$file
+    /usr/bin/afm-install install /usr/AGL/apps/autoinstall/\$file
 done
 sync
 ${EXTRA_WGT_POSTINSTALL}
@@ -55,7 +63,13 @@ EOF
     chmod a+x ${D}/${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT}
 }
 
-FILES_${PN} += "/usr/AGL/apps/*.wgt ${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT}"
+FILES_${PN} += "/usr/AGL/apps/autoinstall/*.wgt \
+    /usr/AGL/apps/manualinstall/*.wgt \
+    ${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} \
+    "
+
+do_install() {
+}
 
 addtask aglwgt_deploy  before do_package after do_install
 addtask aglwgt_package before do_aglwgt_deploy after do_compile