diff options
author | Scott Murray <scott.murray@konsulko.com> | 2020-04-28 21:10:50 +0000 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2020-05-12 12:51:12 +0000 |
commit | 406020ff1b649c4a02248cef5e82abf5315d44d6 (patch) | |
tree | de7f7e96fa6db3da02e452d0be8baa59e5be518e /meta-agl-profile-core | |
parent | 77a17c57856077a5eb2bfb5336710a75f1af95af (diff) |
Widget packaging rework
aglwgt.bbclass changes:
- Made the autobuild/agl/autobuild script a hard requirement, as all
upstream widgets have it, and this is the first step to actually
using it in the class to drive building the widgets after a
subsequent round of autobuild script updates.
- Reworked wgt packaging to simplify the logic and split the test,
debug, and coverage widgets into separate packages to allow
installing them separately.
- The on target install directories for the widgets have been changed
to release, test, debug, and coverage under /usr/AGL/apps, with the
previous logic with respect to the AGLWGT_AUTOINSTALL variable
being retained for the few widgets that need to go into the
manualinstall directory. An "autoinstall" symlink has been added to
point at the release directory to maintain previous behavior.
This should allow a simple path to configuring installation of the
debug or coverage widgets on first boot with future changes.
- Added logic to only assume test widgets exist for recipes with
names starting with "agl-service-". This can be over-ridden by
defining AGLWGT_HAVE_TESTS as "true" in a recipe.
- Added AGLWGT_EXTRA_BUILD_ARGS variable for passing extra arguments
to widget builds. Currently its default value includes the previous
VERBOSE=true that was passed to every autobuild invocation, and
"${PARALLEL_MAKE}" which has been added to improve build speed.
- Added AGLWGT_PACKAGE_WARN variable to control extra warnings
around the existence of test/debug/coverage widgets when packaging.
Once further build rework is done, the default for this will likely
be changed to "true", currently the output is too verbose to do so.
- Removed over-rides to force building of test widget when building
with the agl-ptest feature set, as it is now unnecessary and will
result in an undesired extra copy of the test widget in the release
folder.
Other changes:
- Created new devel and test packagegroup variants for several of the
existing packagegroups to contain the associated widgets.
- Added agl-devel-wgt and agl-test-wgt IMAGE_FEATURES to control the
addition of dbg/coverage and test widgets to images. Additions to
the FEATURE_PACKAGES variables have been added in several places to
add the corresponding widget packagegroups.
- Added the agl-devel-wgt image feature to the agl-devel feature
template definition to match current behavior.
Bug-AGL: SPEC-3300
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: I3a28615db94bbc04e30e98ac3dce8cae942a499f
Diffstat (limited to 'meta-agl-profile-core')
4 files changed, 22 insertions, 6 deletions
diff --git a/meta-agl-profile-core/conf/include/agl-devel.inc b/meta-agl-profile-core/conf/include/agl-devel.inc index 914ab393e..aca49c811 100644 --- a/meta-agl-profile-core/conf/include/agl-devel.inc +++ b/meta-agl-profile-core/conf/include/agl-devel.inc @@ -9,6 +9,8 @@ IMAGE_INSTALL_append = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic.vmdk wic. # Install libdrm-test, including modetest, to images with GUI IMAGE_INSTALL_append = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', ' libdrm-tests', '', d)}" +IMAGE_FEATURES_append = " agl-devel-wgt" + # disable install of debug files in SDK # initial value: SDKIMAGE_FEATURES="dev-pkgs dbg-pkgs staticdev-pkgs" SDKIMAGE_FEATURES="dev-pkgs" diff --git a/meta-agl-profile-core/conf/include/base-agl.inc b/meta-agl-profile-core/conf/include/base-agl.inc index c5cf1a57f..d568b067b 100644 --- a/meta-agl-profile-core/conf/include/base-agl.inc +++ b/meta-agl-profile-core/conf/include/base-agl.inc @@ -2,6 +2,10 @@ # Comment this out to be able to select the kernel modules yourself. IMAGE_INSTALL_append = " kernel-modules" +# Base image feature package definitions for agl-test-wgt and agl-devel-wgt +FEATURE_PACKAGES_agl-test-wgt = "packagegroup-agl-core-services-test" +FEATURE_PACKAGES_agl-devel-wgt = "packagegroup-agl-core-services-devel" + # Likewise as we included all kernel modules by default in the filesystem, # we do not need a separate tarball stored. # Comment this out to receive the separate modules tarball again. diff --git a/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb b/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb index 97ce254f5..b8db6c911 100644 --- a/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb +++ b/meta-agl-profile-core/recipes-devtools/packagegroups/packagegroup-agl-core-devel.bb @@ -4,7 +4,6 @@ LICENSE = "MIT" inherit packagegroup RDEPENDS_${PN} = "\ - afb-test \ strace \ ldd \ less \ diff --git a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb index b6f8f07c8..9f7015992 100644 --- a/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb +++ b/meta-agl-profile-core/recipes-platform/packagegroups/packagegroup-agl-core-services.bb @@ -3,14 +3,25 @@ LICENSE = "MIT" inherit packagegroup +PROVIDES = "${PACKAGES}" PACKAGES = "\ packagegroup-agl-core-services \ + packagegroup-agl-core-services-test \ + packagegroup-agl-core-services-devel \ " -ALLOW_EMPTY_${PN} = "1" - RDEPENDS_${PN} += "\ -agl-service-data-persistence \ -agl-service-network \ -agl-service-platform-info \ + agl-service-data-persistence \ + agl-service-network \ + agl-service-platform-info \ + " + +RDEPENDS_${PN}-test = "\ + ${@' '.join([x + '-test' for x in str.split(d.getVar('RDEPENDS_${PN}'))])} \ + afb-test \ + " + +RDEPENDS_${PN}-devel = "\ + ${@' '.join([x + '-dbg' for x in str.split(d.getVar('RDEPENDS_${PN}'))])} \ + ${@' '.join([x + '-coverage' for x in str.split(d.getVar('RDEPENDS_${PN}'))])} \ " |