From patchwork Sun May 2 21:35:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 478 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:df46:0:0:0:0:0 with SMTP id j6csp2320933oou; Sun, 2 May 2021 22:35:38 -0700 (PDT) X-Received: by 2002:adf:de87:: with SMTP id w7mr4503844wrl.195.1620020138371; Sun, 02 May 2021 22:35:38 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1620020138; cv=pass; d=google.com; s=arc-20160816; b=rMEHIaTTGqPjdI6IAwhOPz2Il1S2oO/37kLndFlJZ1EuGa9vT0vwyhEuIJdbxMwW05 wjLcskTTaxJab6MIW3HXnfgZ2jponw5zoVBDJYP0/cXZkQXYS9AOcSPgzpnllvVVsCbG 9GcC4FVVGLMubpdZlZ07eMAgJ6q3EE+4okcwUOVAsA14ooEICw3mI3qMIhPJwuicovcK uIKVR6UvmCVyyyqxwcW/zvPNbKog7//9w6ZBmpu3m3wgINInXrPDCi9MOa6l8oYNfur6 E0p8ruk81/Z3TY00f+guopOHdjoiEK3AQ9+dGCj+0RBH2WLpcuFZX+5s5IYptdl7pZ98 Xd4A== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-language:mime-version :user-agent:date:message-id:cc:to:subject:from:sender:dkim-signature; bh=ed+DaE/oNhfP3f14rlogIqcXv6rTnHK5JZp4MUpcLbc=; b=SPH4ZqNY2CCTgAkzxLUXEfb9U6Q/3+0gZU3ZoRlTKBLhYkhS3V98wph8sgVuRbX82m m7+Tft4sE9dTjyYZ16i6c+X8+TWD6+1Gj+Z77VkjYzDQpfwL5nOp/SKL41u6ifQgiL9o 8CGV/czgob0NxJ+ScErl29xdrF0U4HdECEPA2oVreKu+ofIKaPG8i7dBnYdHq3Fjy/HM BN+AayZnSAg2ptHXPCfpCrAtCaX/vaBn47m2Wx32e3hGVkCchSPcncg7XDaHXHW87C4Z okSt7/Clpa/yegPHT+AILFL1Uz9vD0gpxvyNtUtc5KxrCkFSIxN2VU0eocISLWiY6SXs 7cqA== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=FHCuKUX9; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbkmxx2camgqesfiboai@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBKMXX2CAMGQESFIBOAI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id 35sor7060727wrl.49.2021.05.02.22.35.37 (Google Transport Security); Sun, 02 May 2021 22:35:38 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbcji7smnv4nbbkmxx2camgqesfiboai@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=FHCuKUX9; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbcji7smnv4nbbkmxx2camgqesfiboai@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBCJI7SMNV4NBBKMXX2CAMGQESFIBOAI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1620020137; cv=pass; d=google.com; s=arc-20160816; b=Ae1V5Rfbwggit7GruX/zQoTm1ejSftK4ZXIN3UDO3ZXcNJRgnm2iPBBfCo5v9Dzt9e TdolTdXHy4rxBgOeDewKZLkxps8yCTNy9xqM9O0eatEntYTQ//HTIrHq/wZfVAkYf0bl pANPiV3JovY+mV041SZiH5Oin7C5DbbKxnj7fv6LIz9xLeArS8meeRolTp3A9bqRqT1n v/SdWxM8O1Sx9S3vlXsSpcPI96kZ3+Y2aJa4/kRvW1sLkB+isj0KJeKnmilcZT9nQ2zc TKrPuyYdbVaDDELJruPh8rg8kAFOTtH9+B4N0NTKEqrN3TBHV2P/rp8/o+wHymh777SS h4/w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:content-language:mime-version :user-agent:date:message-id:cc:to:subject:from:sender:dkim-signature; bh=ed+DaE/oNhfP3f14rlogIqcXv6rTnHK5JZp4MUpcLbc=; b=wX8RH8iOh0bB5m4a3VkLsTpl5zRNjWurfYRxLr4GK9CjQM7VQjfEXOnDQ6zEzVM8Jg C2j5rODbLvxturywcFbM4LtStrrIwXL2ht/u2ifd9jf0Ap7uwOv7GIuGCrI0u304ymJ/ Mddj7eKC4DcVmOfyCRTf4th36X3shxtDWfj+kpwW3rOsw2AU0vyg3Zm9RvbLWQvp2h0y J7g/s50d1HYzkiQaOB5IPbGTcZx+sQIbQErbAjxy6a1Ojixjfq1MC6FJydNSOcH6+sGM fgeOQTH51/ATfYKWov7EvIzlR3QScjXg+QdwgauVUH6s6gYJd+ebjqyeLZlTkf+5mXaR +Vwg== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:subject:to:cc:message-id:date:user-agent:mime-version :content-language:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=ed+DaE/oNhfP3f14rlogIqcXv6rTnHK5JZp4MUpcLbc=; b=FHCuKUX9097D+bD/j2CwHYX/rZX1/jTlZLNNeLE6yGD9dYr1I/wCIFtI85YJBQ7enQ wxzS5d0N8QNMHmxX1JODzIUBRX9dinozVp6xDg8IwM3KoDKQcbSRWnlUU39uwHeli8zR NVM0BBVsKaXipBkB10Y+ptJfg5s6tdNZE7jkpFsvdfGYenY06sYMYxaGFJAD1jzf4fH9 ZHLkO+Dps7jesssr0bT0mT72LiwwyjE/ng9GB+OqvCwgn56GZDl/AlBI8Dc1XeQFp+0f 2biw1daCwKTfESVRVWXR7MlEhviY45TEoTS8PWdXMgB/ZqstkxyZtvgOFCyxR4w3TXgz 1Kyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:subject:to:cc:message-id:date :user-agent:mime-version:content-language:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=ed+DaE/oNhfP3f14rlogIqcXv6rTnHK5JZp4MUpcLbc=; b=jU0W1Aep9egIXsmgF3BG2gAKZpGB4vSob74BTQewsRlVSDX0nJiLIUi3UD8F6W+ZZV B/bTBK3ZtyexeC82E6o5nWEGWB6TXelRGd1Kk2UOyBMETE1zAbzooHG/V2+oFULP3DKY CD4UYQ1WWVuJGnMy+mMKt2tEiMyQo/nIWj/1or7LFDaB7cCspsennthpTFdp3SqLpYi1 Fn664drlh/80+QXUihD1efWEiHT1fMTsJs0n+Kcom0+h8WzBpC5OYASwRl/G3QmloHXA gMqNbExOneeY64Fk+hX9KKTBViaRWuPovJaaQihNNCGHKEQrWRemr3kxPauJsSq5QZST ROfQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530nX17p6q8gldrSh5ZeyMGWWZhN3N/Bl1IxCi38JMXTRBcYkY0D wV6SE1X+VB1+KyW8Z6V6JjA= X-Google-Smtp-Source: ABdhPJxd8MYzEywP56mLpWARs6ncME2tidbO91+C7ahnnJGd61epihkMYKu/VsOVooAHVSTzQxEftw== X-Received: by 2002:adf:9bd0:: with SMTP id e16mr7985808wrc.346.1620020137776; Sun, 02 May 2021 22:35:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:e341:: with SMTP id a62ls5743854wmh.2.gmail; Sun, 02 May 2021 22:35:36 -0700 (PDT) X-Received: by 2002:a05:600c:4303:: with SMTP id p3mr19725150wme.166.1620020136940; Sun, 02 May 2021 22:35:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620020136; cv=none; d=google.com; s=arc-20160816; b=vAPHngEUwsc0+ajmXykYHNxEGTg3866oEHk0zliLnQCpAqgEXd9MkDHY4VWK61UO4E /0KH0fL12cr4YWtF3tbEtUFxkAtpgdTvYFeeLsEaEPRTQERrSe2HnFBVkqyJkHEF7uI1 a+fA1S9tyrmRoKmiVBFOhBXfTyoo/aOKON/kazrYeG4V1ITbigwg20IyAwsBtX/5hD/U 3CVKpalZh72H2MqflmHHi+jTMTxyF67R2ExPQMPJfyoJ1vXSVq6AEqTau6Fx5+7lSw7z ZRG4AYUDKhhGserA+r8LX5Kbq0/n7VxJc4ABjwX7jonBJ8ecOqTC8tGzQV48xwE4M58C 1fhQ== 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=N8U+5sOWYuhxipfX+rc3sUY9jeOa1JIUG7cXnxdHGh8=; b=i8FoEHlJX3mF+b2gWg87YtFRMfhSUHQ96X1jfR92I8iImmD/9swTB+t87qAFckCEFH hnOuqG1tFJ8X/jy2TutdraxJyw2G/m6AE7P480fyR/OITZHxAbSBaNeZ5ROACu2zeVHB wC54rnUi+/dhdgfTDkX1UxGopFimvX1I3c+6H0+l74VKN6NSnfohC3R12Wq6++XKeE4K 38PXDqYP6S71hys7jQsZqLuC5Ighv5ScTJ+BYIh9aqfCfppOFrkaRXL1RzlRCJaBTh1u uiF7eb+49rHiPHVbHUlnI+e1IbdEpwpJMZPOVil4v0+gmfwypeS1TbRS1sMIXZNNLEwl 0mzA== 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 Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id e4si94056wrj.5.2021.05.02.22.35.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 02 May 2021 22:35:36 -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; 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 1435Zadt016088 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 3 May 2021 07:35:36 +0200 Received: from [167.87.76.240] ([167.87.76.240]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1435ZaFl008685; Mon, 3 May 2021 07:35:36 +0200 From: Jan Kiszka Subject: [PATCH v2] meta-isar: Fix container configurations To: isar-users , Anton Mikanovich Cc: "Cirujano-Cuesta, Silvano" , "Moessbauer, Felix (CT RDA IOT SES-DE)" Message-ID: <6531f7bf-ed26-05b2-23e0-934a9015f3a8@siemens.com> Date: Mon, 3 May 2021 07:35:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 Content-Language: en-US X-Original-Sender: jan.kiszka@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1698714236467928811?= X-GMAIL-MSGID: =?utf-8?q?1698714236467928811?= 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 avoid 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 --- Changes in v2: - adjust remaining references in local.conf.sample and build.sh (now passes CI) meta-isar/conf/local.conf.sample | 6 +++--- meta-isar/conf/machine/container-amd64.conf | 7 +++++++ meta-isar/conf/machine/container.conf | 5 ----- .../multiconfig/container-amd64-bullseye.conf | 7 +++++++ .../multiconfig/container-amd64-buster.conf | 7 +++++++ .../multiconfig/container-amd64-stretch.conf | 7 +++++++ .../conf/multiconfig/container-bullseye.conf | 4 ---- .../conf/multiconfig/container-buster.conf | 4 ---- .../conf/multiconfig/container-stretch.conf | 4 ---- scripts/ci_build.sh | 17 ++++------------- 10 files changed, 35 insertions(+), 33 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/local.conf.sample b/meta-isar/conf/local.conf.sample index 77585ec..6cf1656 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -51,9 +51,9 @@ BBMULTICONFIG = " \ qemuamd64-buster \ qemuamd64-buster-tgz \ qemuamd64-bullseye \ - container-stretch \ - container-buster \ - container-bullseye \ + container-amd64-stretch \ + container-amd64-buster \ + container-amd64-bullseye \ qemumipsel-stretch \ qemumipsel-buster \ qemumipsel-bullseye \ 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..8456d34 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,14 +259,8 @@ 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 +bitbake $BB_ARGS -c do_populate_sdk mc:container-amd64-stretch:isar-image-base while [ -e bitbake.sock ]; do sleep 1; done