From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6957028370925223936 X-Received: by 2002:a5d:6daa:: with SMTP id u10mr22250349wrs.119.1620020137811; 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-Google-Smtp-Source: ABdhPJy7+XBn9td/UO2EW2dw+YCM8m7Z9Gq+KFGfcQpFOEZO+h5bltxFSS62JGGWUqg1jBcGVY7y 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 Return-Path: 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; 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 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-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: +82YVrr/4YXG 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 -- 2.26.2 -- Siemens AG, T RDA IOT Corporate Competence Center Embedded Linux