From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6957028370925223936 X-Received: by 2002:a05:6512:1031:: with SMTP id r17mr4262334lfr.583.1619809393729; Fri, 30 Apr 2021 12:03:13 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:6c2:: with SMTP id u2ls3638558lff.3.gmail; Fri, 30 Apr 2021 12:03:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx3rg1nQYu236BFFt2uSswJ4iAWb4qBSP1GatPSXKGFpkUrGSelr6RGb8RyB7bx23KbzMPW X-Received: by 2002:a05:6512:3585:: with SMTP id m5mr322017lfr.127.1619809392704; Fri, 30 Apr 2021 12:03:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1619809392; cv=none; d=google.com; s=arc-20160816; b=d7LCSkmiY+Hc7yydEbKVMu94Eog+CBt6fcSGgxIvfDjsFmmzV/O8vzui8ciDh3mcJr rDppH9PTXnCi1WJJhzcDrK+rdoSY9mXKjkHNfUIgA3F3jv3RXuHFOJeOA/TxlHK44Cpr say+cwnWohXHuok/+MJIJWFAVgMJjyoYIA9SvPuw2oW82k/s5Z7+QAZ8QouWaT0S5X/Z dhJy3pfORmal0dJe62jz3wm6NxOV7PWMQtPlKiBUfco1kMHR8zOCrCDi6im4nW+OIou9 ezMl9i9LHdfT/yd+a631/6ypzacNqJa8DPAfoCU8Z5lO74duwX3ldwJh57ep8LnLP0yt SyDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:cc:to:subject:from; bh=puM/9IFCa29F2QyM9fK+EIf2vZY/a1qZ5h2T1X63Snk=; b=MPSQp05NSvopFmGt28ZuG9G5AUuPeMsQSj52CbDB/EtdswkgEJbe506ZcKXOQJFh5I xRE4pEPyiHDpFfiLpwy+84hB2in6Zf35vC+shTMF7z0lBYrq0hlQh1T3b/8quQdR8F0i J1x/8wsX80NzJ0J+1zCTRDDDPcjdXKhQBeX7T1pxBUwjbFCBZnU0RmsSsAGGzLV7wDaC RSnkHbuCZxF5+GTHNcOJmokXMc0leEVQheXX7zl4LgIFDqKgD8SJY0PsqNnWO9duGPZU mz6B0449yVOiao79XSqMKYH5Vky2PdSIXfU93czZ239DIL6J1UHCAIDlZUP8YAghHy+S kg3g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id l11si219786lfg.13.2021.04.30.12.03.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Apr 2021 12:03:12 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 13UJ3B99007064 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 30 Apr 2021 21:03:11 +0200 Received: from [167.87.32.183] ([167.87.32.183]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 13UIxTFg013849; Fri, 30 Apr 2021 20:59:29 +0200 From: Jan Kiszka Subject: [PATCH] meta-isar: Fix container configurations To: isar-users , Anton Mikanovich Cc: "Cirujano-Cuesta, Silvano" , "Moessbauer, Felix (CT RDA IOT SES-DE)" Message-ID: Date: Fri, 30 Apr 2021 20:59:29 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: u/F7M8/AJGL+ From: Jan Kiszka The machine conf was missing the target architecture, and all should in fact carry that arch (currently only amd64) in their names. As this avoids building containers for random non-host archs, we can remove the KFAIL protection from the bullseye variant. Also fix the copyright headers at this chance and use weak assignments. Signed-off-by: Jan Kiszka --- Sending already, at the risk of seeing breakages only during our nightly build. Will let you know if that should be the case. meta-isar/conf/machine/container-amd64.conf | 7 +++++++ meta-isar/conf/machine/container.conf | 5 ----- .../multiconfig/container-amd64-bullseye.conf | 7 +++++++ .../conf/multiconfig/container-amd64-buster.conf | 7 +++++++ .../conf/multiconfig/container-amd64-stretch.conf | 7 +++++++ .../conf/multiconfig/container-bullseye.conf | 4 ---- meta-isar/conf/multiconfig/container-buster.conf | 4 ---- meta-isar/conf/multiconfig/container-stretch.conf | 4 ---- scripts/ci_build.sh | 15 +++------------ 9 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 meta-isar/conf/machine/container-amd64.conf delete mode 100644 meta-isar/conf/machine/container.conf create mode 100644 meta-isar/conf/multiconfig/container-amd64-bullseye.conf create mode 100644 meta-isar/conf/multiconfig/container-amd64-buster.conf create mode 100644 meta-isar/conf/multiconfig/container-amd64-stretch.conf delete mode 100644 meta-isar/conf/multiconfig/container-bullseye.conf delete mode 100644 meta-isar/conf/multiconfig/container-buster.conf delete mode 100644 meta-isar/conf/multiconfig/container-stretch.conf diff --git a/meta-isar/conf/machine/container-amd64.conf b/meta-isar/conf/machine/container-amd64.conf new file mode 100644 index 0000000..d2978c4 --- /dev/null +++ b/meta-isar/conf/machine/container-amd64.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2021 +# +# SPDX-License-Identifier: MIT + +DISTRO_ARCH ?= "amd64" +IMAGE_TYPE ?= "container-img" diff --git a/meta-isar/conf/machine/container.conf b/meta-isar/conf/machine/container.conf deleted file mode 100644 index 367d790..0000000 --- a/meta-isar/conf/machine/container.conf +++ /dev/null @@ -1,5 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH - -IMAGE_TYPE = "container-img" - diff --git a/meta-isar/conf/multiconfig/container-amd64-bullseye.conf b/meta-isar/conf/multiconfig/container-amd64-bullseye.conf new file mode 100644 index 0000000..0c1b2f2 --- /dev/null +++ b/meta-isar/conf/multiconfig/container-amd64-bullseye.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2021 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "container-amd64" +DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/container-amd64-buster.conf b/meta-isar/conf/multiconfig/container-amd64-buster.conf new file mode 100644 index 0000000..95027f8 --- /dev/null +++ b/meta-isar/conf/multiconfig/container-amd64-buster.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2021 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "container-amd64" +DISTRO ?= "debian-buster" diff --git a/meta-isar/conf/multiconfig/container-amd64-stretch.conf b/meta-isar/conf/multiconfig/container-amd64-stretch.conf new file mode 100644 index 0000000..76a34d5 --- /dev/null +++ b/meta-isar/conf/multiconfig/container-amd64-stretch.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2021 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "container-amd64" +DISTRO ?= "debian-stretch" diff --git a/meta-isar/conf/multiconfig/container-bullseye.conf b/meta-isar/conf/multiconfig/container-bullseye.conf deleted file mode 100644 index 200b241..0000000 --- a/meta-isar/conf/multiconfig/container-bullseye.conf +++ /dev/null @@ -1,4 +0,0 @@ -# This software is a part of ISAR. - -MACHINE ?= "container" -DISTRO ?= "debian-bullseye" diff --git a/meta-isar/conf/multiconfig/container-buster.conf b/meta-isar/conf/multiconfig/container-buster.conf deleted file mode 100644 index 78b0324..0000000 --- a/meta-isar/conf/multiconfig/container-buster.conf +++ /dev/null @@ -1,4 +0,0 @@ -# This software is a part of ISAR. - -MACHINE ?= "container" -DISTRO ?= "debian-buster" diff --git a/meta-isar/conf/multiconfig/container-stretch.conf b/meta-isar/conf/multiconfig/container-stretch.conf deleted file mode 100644 index 3ff8bcb..0000000 --- a/meta-isar/conf/multiconfig/container-stretch.conf +++ /dev/null @@ -1,4 +0,0 @@ -# This software is a part of ISAR. - -MACHINE ?= "container" -DISTRO ?= "debian-stretch" diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index adc22e4..6dec4d6 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -56,12 +56,9 @@ TARGETS_SET_BULLSEYE="\ " TARGETS_CONTAINERS="\ - mc:container-stretch:isar-image-base \ - mc:container-buster:isar-image-base \ -" - -TARGETS_CONTAINERS_BULLSEYE="\ - mc:container-bullseye:isar-image-base \ + mc:container-amd64-stretch:isar-image-base \ + mc:container-amd64-buster:isar-image-base \ + mc:container-amd64-bullseye:isar-image-base \ " CROSS_TARGETS_SET="\ @@ -262,12 +259,6 @@ sed -i -e 's/\(IMAGE_INSTALL = .*\) example-module-${KERNEL_NAME}\(.*\)/\1\2/g' sed -i -e 's/\(IMAGE_INSTALL = .*\) enable-fsck\(.*\)/\1\2/g' conf/local.conf bitbake $BB_ARGS $TARGETS_CONTAINERS while [ -e bitbake.sock ]; do sleep 1; done -if bitbake $BB_ARGS $TARGETS_CONTAINERS_BULLSEYE; then - echo "bullseye container: PASSED" -else - echo "bullseye container: KFAIL" -fi -while [ -e bitbake.sock ]; do sleep 1; done # and SDK container image creation echo 'SDK_FORMATS = "docker-archive"' >> conf/local.conf bitbake $BB_ARGS -c do_populate_sdk mc:container-stretch:isar-image-base -- 2.26.2