From bee43bc3d4896603e4cb1839f5a4e8c30c771e5c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 27 Apr 2021 08:53:16 +0200 Subject: distro conf: require sota.conf.inc for atom, xeon Depends-on: I658c86f562743a50e5c078899e133e279b96027b Change-Id: I7165753a5f609ef337fd1f0b450f055a5768059e Signed-off-by: Alexandru Avadanii --- conf/distro/eneanfvaccess.conf | 3 +++ conf/template.atom-c3000-debug/local.conf.sample | 11 +---------- conf/template.atom-c3000/local.conf.sample | 11 +---------- conf/template.xeon-d-debug/local.conf.sample | 11 +---------- conf/template.xeon-d/local.conf.sample | 11 +---------- images/enea-nfv-access-common.inc | 18 +++++++++++------- 6 files changed, 18 insertions(+), 47 deletions(-) diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index 2c81393..3dcec36 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf @@ -7,6 +7,9 @@ DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}" SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}" +# OSTree integration +require ${@bb.utils.contains('SOTA_MACHINE', '${MACHINE}', 'conf/distro/sota.conf.inc', '', d)} + INHERIT += "distrooverrides" DISTRO_FEATURES_append = " odm efi-secure-boot usrmerge" DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot" diff --git a/conf/template.atom-c3000-debug/local.conf.sample b/conf/template.atom-c3000-debug/local.conf.sample index 60e8955..b96bf48 100644 --- a/conf/template.atom-c3000-debug/local.conf.sample +++ b/conf/template.atom-c3000-debug/local.conf.sample @@ -155,6 +155,7 @@ EXTRA_IMAGE_FEATURES = " \ # - 'image-swab' to perform host system intrusion detection # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +# NOTE: image-prelink is removed by sota.conf.inc USER_CLASSES ?= "buildstats image-mklibs image-prelink" # @@ -241,16 +242,6 @@ CONF_VERSION = "1" SKIP_META_VIRT_SANITY_CHECK = "1" -# -# OSTree integration -# - -SOTA_MACHINE ?= "${MACHINE}" - -DISTRO_FEATURES_append = " sota" -DISTRO_FEATURES_NATIVE_append = " sota" -INHERIT += " sota" - # Various packages dynamically add users and groups to the system at package # install time. For programs that do not care what the uid/gid is of the # resulting users/groups, the order of the install will determine the final diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index b015f43..c6cbdba 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -152,6 +152,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # - 'image-swab' to perform host system intrusion detection # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +# NOTE: image-prelink is removed by sota.conf.inc USER_CLASSES ?= "buildstats image-mklibs image-prelink" # @@ -238,16 +239,6 @@ CONF_VERSION = "1" SKIP_META_VIRT_SANITY_CHECK = "1" -# -# OSTree integration -# - -SOTA_MACHINE ?= "${MACHINE}" - -DISTRO_FEATURES_append = " sota" -DISTRO_FEATURES_NATIVE_append = " sota" -INHERIT += " sota" - # Various packages dynamically add users and groups to the system at package # install time. For programs that do not care what the uid/gid is of the # resulting users/groups, the order of the install will determine the final diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample index 6474a37..4be1706 100644 --- a/conf/template.xeon-d-debug/local.conf.sample +++ b/conf/template.xeon-d-debug/local.conf.sample @@ -156,6 +156,7 @@ EXTRA_IMAGE_FEATURES = " \ # - 'image-swab' to perform host system intrusion detection # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +# NOTE: image-prelink is removed by sota.conf.inc USER_CLASSES ?= "buildstats image-mklibs image-prelink" # @@ -242,16 +243,6 @@ CONF_VERSION = "1" SKIP_META_VIRT_SANITY_CHECK = "1" -# -# OSTree integration -# - -SOTA_MACHINE ?= "${MACHINE}" - -DISTRO_FEATURES_append = " sota" -DISTRO_FEATURES_NATIVE_append = " sota" -INHERIT += " sota" - # Various packages dynamically add users and groups to the system at package # install time. For programs that do not care what the uid/gid is of the # resulting users/groups, the order of the install will determine the final diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index 5cfebf5..a1a874d 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample @@ -153,6 +153,7 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # - 'image-swab' to perform host system intrusion detection # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended +# NOTE: image-prelink is removed by sota.conf.inc USER_CLASSES ?= "buildstats image-mklibs image-prelink" # @@ -239,16 +240,6 @@ CONF_VERSION = "1" SKIP_META_VIRT_SANITY_CHECK = "1" -# -# OSTree integration -# - -SOTA_MACHINE ?= "${MACHINE}" - -DISTRO_FEATURES_append = " sota" -DISTRO_FEATURES_NATIVE_append = " sota" -INHERIT += " sota" - # Various packages dynamically add users and groups to the system at package # install time. For programs that do not care what the uid/gid is of the # resulting users/groups, the order of the install will determine the final diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc index 2a7a8c6..b174064 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-nfv-access-common.inc @@ -22,15 +22,19 @@ ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;" IMAGE_FSTYPES += "ext4 ext4.gz tar.gz" -# Add ostree specific image types if sota support is set -IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ota-ext4 wic', ' ', d)}" -SOTA_CLIENT = "" -SOTA_CLIENT_PROV = "" - -# Remove aktualizr from the image, we don't use it and creates odd dependencies, e.g. +# Remove aktualizr packages from the image, we don't use it and creates odd dependencies, e.g. # it creates a systemd unit that depends on network-online.target, which leads to enabling # NetworkManager-wait-online.service, delaying boot up. -IMAGE_INSTALL_remove = " \ +SOTA_CLIENT_PROV = "" +IMAGE_INSTALL_remove_sota = " \ aktualizr \ aktualizr-info \ " + +# We currently don't use automatic push/sign/check to a backend server, so skip running useless +# OSTree tasks during image build. +IMAGE_FSTYPES_remove_sota = " \ + ostreepush \ + garagesign \ + garagecheck \ + " -- cgit v1.2.3-54-g00ecf