From dad22a2b3c3cced169c4790e8fe5d8cf2cc62ee2 Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Tue, 12 May 2020 20:58:56 -0400 Subject: Rework test/debug image features and crosssdk image definitions Changes include: - The agl-test-wgt/agl-devel-wgt image features and the scheme of appending to their FEATURE_PACKAGES definitions turned out to be problematic with respect to resulting in unexpected extra packages ending up in agl-image-{minimal,ivi}, etc., when building with agl-demo configured (which is typical usage). To avoid this, the FEATURE_PACKAGE definitions for the image features have been replaced with tweaks to define COMPLEMENTARY_GLOBS for the features to bring in the test/debug/coverage packages via that mechanism. - The above removes the need to define the extra test/devel packagegroups, and requires some minor tweaks to aglwgt.bbclass to use a -debug package for the debug widget instead of -dbg, to avoid collisions with the dbg-pkgs image feature. As well, the afb-test package has been added as to RDEPENDS of all test widget packages, since that seems sensible and avoids needing to explicitly adding it elsewhere. - Attempt to rework the various crosssdk image definitions to use a layered set of .inc files to remove duplication and ensure that additions to the SDK are declared once in the appropriate profile. It is likely that a clean sheet implementation would have some things coming from meta-agl-profile-graphical, so further rework may be required/desired to continue cleaning things up. Bug-AGL: SPEC-3300, SPEC-3375 Signed-off-by: Scott Murray Change-Id: I942b61501beb41d037001b70a501f90b9a59c45d --- meta-app-framework/classes/aglwgt.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta-app-framework') diff --git a/meta-app-framework/classes/aglwgt.bbclass b/meta-app-framework/classes/aglwgt.bbclass index faa17e3a8..b5f7be8bf 100644 --- a/meta-app-framework/classes/aglwgt.bbclass +++ b/meta-app-framework/classes/aglwgt.bbclass @@ -47,6 +47,7 @@ AGLWGT_PACKAGE_WARN = "false" # NOTE: This should revisited after a round of autobuild script rework # to address SPEC-3300. ALLOW_EMPTY_${PN}-coverage = "1" +ALLOW_EMPTY_${PN}-debug = "1" ALLOW_EMPTY_${PN}-test = "1" @@ -145,7 +146,7 @@ do_install() { addtask aglwgt_deploy before do_package after do_install addtask aglwgt_package before do_aglwgt_deploy after do_compile -PACKAGES += "${PN}-test ${PN}-coverage" +PACKAGES += "${PN}-test ${PN}-debug ${PN}-coverage" FILES_${PN} += " \ /usr/AGL/apps/release/*.wgt \ @@ -154,11 +155,11 @@ FILES_${PN} += " \ ${sysconfdir}/agl-postinsts/${POST_INSTALL_SCRIPT} \ " FILES_${PN}-test = "/usr/AGL/apps/test/*.wgt" -FILES_${PN}-dbg = "/usr/AGL/apps/debug/*.wgt" +FILES_${PN}-debug = "/usr/AGL/apps/debug/*.wgt" FILES_${PN}-coverage = "/usr/AGL/apps/coverage/*.wgt" -# Test widgets need the base widget -RDEPENDS_${PN}-test = "${PN}" +# Test widgets need the parent widget and the test framework +RDEPENDS_${PN}-test = "${PN} afb-test" # Signature keys # These are default keys for development purposes ! -- cgit 1.2.3-korg