From: Romain Forlot <romain.forlot@iot.bzh>
Date: Tue, 17 Oct 2017 10:34:28 +0000 (+0000)
Subject: Invert make/autobuild order
X-Git-Tag: eel_4.99.2~15
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;ds=inline;h=9aa10da61a5b63ab4f1511bd0e6c83149be4364b;p=AGL%2Fmeta-agl.git

Invert make/autobuild order

because make all create a package dir then 'make package' doesn't fails
so autobuild isn't executed. Invert the order keep compability and give
priority to the autobuild script.

Needed for gerrit review: 11297 about low-can service update

Change-Id: I54e1da827ec7254afbab7de5498421914832f460
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11359
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>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
---

diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass
index b208babdf..ce566abca 100644
--- a/meta-app-framework/classes/aglwgt.bbclass
+++ b/meta-app-framework/classes/aglwgt.bbclass
@@ -17,8 +17,8 @@ DEPENDS_append = " af-binder"
 
 do_aglwgt_package()  {
         cd ${B}
+        ${S}/conf.d/autobuild/agl/autobuild package BUILD_DIR=${B} DEST=${B}/package VERBOSE=TRUE || \
         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/ !" ; \