From 5f980c14dafb466e1d71e0b6e7487aa522ade9f9 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Wed, 24 Mar 2021 11:58:07 +0100 Subject: Upgrade to gatesgarth This is an initial commit, containing quick fixes and hacks to allow building the images. All these issues will be re-evaluated and fixed properly in their own commits. Signed-off-by: Adrian Dudau --- conf/template.atom-c3000/local.conf.sample | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf/template.atom-c3000/local.conf.sample') diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index b015f43..374cace 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -273,3 +273,5 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +IMAGE_INSTALL += "dpdk" -- cgit v1.2.3-54-g00ecf From 511186d28fb9d6e6ec851cd5e3a1e0a62d937b9d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 19 Apr 2021 09:05:24 +0200 Subject: conf/local.conf: Drop 'dpdk' from IMAGE_INSTALL This was added as a workaround during the gatesgarth rebase and is no longer needed. Signed-off-by: Alexandru Avadanii Change-Id: I627c75b77d1fc2ec4fb6de9c45ac3712cce7966f --- conf/template.atom-c3000/local.conf.sample | 2 -- conf/template.xeon-d/local.conf.sample | 2 -- 2 files changed, 4 deletions(-) (limited to 'conf/template.atom-c3000/local.conf.sample') diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index 374cace..b015f43 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -273,5 +273,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -IMAGE_INSTALL += "dpdk" diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index fd14580..5cfebf5 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample @@ -274,5 +274,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -IMAGE_INSTALL += "dpdk" -- cgit v1.2.3-54-g00ecf 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(-) (limited to 'conf/template.atom-c3000/local.conf.sample') 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 From b0b7aa09e307af9678a94bdf27a310a326b9034b Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Tue, 15 Jun 2021 15:02:11 +0200 Subject: [tmp] allow python2 support for element-vcpe Temporary solution until we upgrade vcpe to python3 and remove python2 support! python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes" Change-Id: If20d79fb4051633a941c368f71443ae9bf10ad6a Signed-off-by: Adrian Calianu --- conf/template.atom-c3000-debug/local.conf.sample | 3 +++ conf/template.atom-c3000/local.conf.sample | 3 +++ conf/template.xeon-d-debug/local.conf.sample | 3 +++ conf/template.xeon-d/local.conf.sample | 3 +++ 4 files changed, 12 insertions(+) (limited to 'conf/template.atom-c3000/local.conf.sample') diff --git a/conf/template.atom-c3000-debug/local.conf.sample b/conf/template.atom-c3000-debug/local.conf.sample index b96bf48..b5e3f8c 100644 --- a/conf/template.atom-c3000-debug/local.conf.sample +++ b/conf/template.atom-c3000-debug/local.conf.sample @@ -267,3 +267,6 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +# to be removed together with python2 layer +I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index c6cbdba..558e110 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -264,3 +264,6 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +# to be removed together with python2 layer +I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample index 4be1706..e80ee61 100644 --- a/conf/template.xeon-d-debug/local.conf.sample +++ b/conf/template.xeon-d-debug/local.conf.sample @@ -268,3 +268,6 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +# to be removed together with python2 layer +I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index a1a874d..2b10f27 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample @@ -265,3 +265,6 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" + +# to be removed together with python2 layer +I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" -- cgit v1.2.3-54-g00ecf From b99118b3140a973c34f56101dd5534ba605c569f Mon Sep 17 00:00:00 2001 From: Adrian Calianu Date: Thu, 1 Jul 2021 14:42:03 +0200 Subject: conf: remove python2 from EneaEdge Signed-off-by: Adrian Calianu Change-Id: Ic7f02246a56515284b62281ea053d431b5eb68cb --- conf/template.atom-c3000-debug/local.conf.sample | 3 --- conf/template.atom-c3000/bblayers.conf.sample | 1 - conf/template.atom-c3000/local.conf.sample | 3 --- conf/template.xeon-d-debug/local.conf.sample | 3 --- conf/template.xeon-d/bblayers.conf.sample | 1 - conf/template.xeon-d/local.conf.sample | 3 --- 6 files changed, 14 deletions(-) (limited to 'conf/template.atom-c3000/local.conf.sample') diff --git a/conf/template.atom-c3000-debug/local.conf.sample b/conf/template.atom-c3000-debug/local.conf.sample index b5e3f8c..b96bf48 100644 --- a/conf/template.atom-c3000-debug/local.conf.sample +++ b/conf/template.atom-c3000-debug/local.conf.sample @@ -267,6 +267,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -# to be removed together with python2 layer -I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.atom-c3000/bblayers.conf.sample b/conf/template.atom-c3000/bblayers.conf.sample index f5d25ce..71c77cc 100644 --- a/conf/template.atom-c3000/bblayers.conf.sample +++ b/conf/template.atom-c3000/bblayers.conf.sample @@ -28,5 +28,4 @@ BBLAYERS ?= " \ ##OEROOT##/meta-secure-core/meta-signing-key \ ##OEROOT##/meta-secure-core/meta-efi-secure-boot \ ##OEROOT##/meta-enea-user-keys \ - ##OEROOT##/meta-python2 \ " diff --git a/conf/template.atom-c3000/local.conf.sample b/conf/template.atom-c3000/local.conf.sample index 558e110..c6cbdba 100644 --- a/conf/template.atom-c3000/local.conf.sample +++ b/conf/template.atom-c3000/local.conf.sample @@ -264,6 +264,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -# to be removed together with python2 layer -I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.xeon-d-debug/local.conf.sample b/conf/template.xeon-d-debug/local.conf.sample index e80ee61..4be1706 100644 --- a/conf/template.xeon-d-debug/local.conf.sample +++ b/conf/template.xeon-d-debug/local.conf.sample @@ -268,6 +268,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -# to be removed together with python2 layer -I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" diff --git a/conf/template.xeon-d/bblayers.conf.sample b/conf/template.xeon-d/bblayers.conf.sample index f5d25ce..71c77cc 100644 --- a/conf/template.xeon-d/bblayers.conf.sample +++ b/conf/template.xeon-d/bblayers.conf.sample @@ -28,5 +28,4 @@ BBLAYERS ?= " \ ##OEROOT##/meta-secure-core/meta-signing-key \ ##OEROOT##/meta-secure-core/meta-efi-secure-boot \ ##OEROOT##/meta-enea-user-keys \ - ##OEROOT##/meta-python2 \ " diff --git a/conf/template.xeon-d/local.conf.sample b/conf/template.xeon-d/local.conf.sample index 2b10f27..a1a874d 100644 --- a/conf/template.xeon-d/local.conf.sample +++ b/conf/template.xeon-d/local.conf.sample @@ -265,6 +265,3 @@ USERADD_GID_TABLES = "files/group" # Unfortunately, setting the variable below breaks the build, so do not set it # for now # USERADD_ERROR_DYNAMIC = "1" - -# to be removed together with python2 layer -I_SWEAR_TO_MIGRATE_TO_PYTHON3 = "yes" -- cgit v1.2.3-54-g00ecf