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/template.atom-c3000-debug/local.conf.sample | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'conf/template.atom-c3000-debug/local.conf.sample') 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 -- 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-debug/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-debug/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