From b71d5c65f6a749eb6b04ba46e289d430686a5eee Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Mon, 7 Jun 2021 17:14:20 -0400 Subject: Add agl-package-management feature Changes: - Move addition of package-management to IMAGE_FEATURES and associated package feed variables to a new agl-package-management feature template. The feature is not included by default in the base set. - To somewhat maintain the previous developer experience the new feature has been made a dependency of the agl-devel feature. In practice, the only images affected by this change are agl-image-minimal and agl-image-weston from meta-agl-core, the demo platform images in meta-agl have package management enabled by default. Bug-AGL: SPEC-3971 Signed-off-by: Scott Murray Change-Id: I56665e1cd82db19a697fdae2551a9276eab08961 Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26393 Tested-by: Jenkins Job builder account ci-image-build: Jenkins Job builder account ci-image-boot-test: Jenkins Job builder account Reviewed-by: Jan-Simon Moeller --- meta-agl-core/conf/distro/poky-agl.conf | 7 ------- meta-agl-core/conf/include/agl-package-management.inc | 6 ++++++ templates/feature/agl-devel/included.dep | 1 + templates/feature/agl-package-management/50_local.conf.inc | 2 ++ .../README_feature_agl-package-management.md | 8 ++++++++ 5 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 meta-agl-core/conf/include/agl-package-management.inc create mode 100644 templates/feature/agl-devel/included.dep create mode 100644 templates/feature/agl-package-management/50_local.conf.inc create mode 100644 templates/feature/agl-package-management/README_feature_agl-package-management.md diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf index 95b8fbec7..d835a080c 100644 --- a/meta-agl-core/conf/distro/poky-agl.conf +++ b/meta-agl-core/conf/distro/poky-agl.conf @@ -152,13 +152,6 @@ INITRAMFS_FSTYPES = "${AGL_DEFAULT_INITRAMFS_FSTYPES} ${AGL_EXTRA_INITRAMFS_FSTY # THE FUTURE is 'wic' # IMAGE_FSTYPES_append = " wic" -# enable the packagemanagement -IMAGE_FEATURES =+ "package-management" -PACKAGE_FEED_URIS = "http://192.168.7.1:8000/tmp/deploy/" -PACKAGE_FEED_BASE_PATHS = "rpm" -PACKAGE_FEED_ARCHS = "" -#${PACKAGE_ARCHS}" - # Complementary package definitions for agl-test-wgt and agl-devel-wgt # image features COMPLEMENTARY_GLOB[agl-test-wgt] = '*-test' diff --git a/meta-agl-core/conf/include/agl-package-management.inc b/meta-agl-core/conf/include/agl-package-management.inc new file mode 100644 index 000000000..9acf439c2 --- /dev/null +++ b/meta-agl-core/conf/include/agl-package-management.inc @@ -0,0 +1,6 @@ +# Enable package management +IMAGE_FEATURES =+ "package-management" +PACKAGE_FEED_URIS = "http://192.168.7.1:8000/tmp/deploy/" +PACKAGE_FEED_BASE_PATHS = "rpm" +PACKAGE_FEED_ARCHS = "" +#${PACKAGE_ARCHS}" diff --git a/templates/feature/agl-devel/included.dep b/templates/feature/agl-devel/included.dep new file mode 100644 index 000000000..115ecf19a --- /dev/null +++ b/templates/feature/agl-devel/included.dep @@ -0,0 +1 @@ +agl-package-management diff --git a/templates/feature/agl-package-management/50_local.conf.inc b/templates/feature/agl-package-management/50_local.conf.inc new file mode 100644 index 000000000..641a327c9 --- /dev/null +++ b/templates/feature/agl-package-management/50_local.conf.inc @@ -0,0 +1,2 @@ +#see meta-agl/meta-agl/conf/include/agl-package-management.inc +require conf/include/agl-package-management.inc diff --git a/templates/feature/agl-package-management/README_feature_agl-package-management.md b/templates/feature/agl-package-management/README_feature_agl-package-management.md new file mode 100644 index 000000000..37562dd00 --- /dev/null +++ b/templates/feature/agl-package-management/README_feature_agl-package-management.md @@ -0,0 +1,8 @@ +--- +description: Feature agl-package-management +authors: Scott Murray , Jan-Simon Möller +--- + +### Feature agl-package-management + +Adds package management to images. -- cgit 1.2.3-korg