From 944d50670242469b4d9b827f399971457a4b13b9 Mon Sep 17 00:00:00 2001
From: Romain Forlot <romain.forlot@iot.bzh>
Date: Mon, 10 Jul 2017 16:14:38 +0000
Subject: Possibility to copy wgt without installing them
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adding a variable that control if wgt file should be automatically
installed. Now WGT are spread between autoinstall and manualinstall
directories.
By default autoinstall is chosen.

Change-Id: I51f4aa4426704714a77a53dab37adcaf5e1fd954
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/10165
Reviewed-by: Stéphane Desneux <stephane.desneux@iot.bzh>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
---
 meta-app-framework/classes/aglwgt.bbclass | 36 +++++++++++++++++++------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass
index 37638e666..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,31 +38,38 @@ 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
-INSTALL_RESULT=0
 for file in ${APP_FILES}; do
-    /usr/bin/afm-install install /usr/AGL/apps/\$file
-    if [ $? -ne 0 ]; then
-        echo "Application \$file failed to install"
-        INSTALL_RESULT=1
-    fi
+    /usr/bin/afm-install install /usr/AGL/apps/autoinstall/\$file
 done
 sync
 ${EXTRA_WGT_POSTINSTALL}
-exit $INSTALL_RESULT
 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
-- 
cgit 1.2.3-korg