meta-isar: Fix container configurations

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 <jan.kiszka@siemens.com>

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 \

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"

meta-isar/conf/machine/container.conf

@@ -1,5 +0,0 @@
-# This software is a part of ISAR.
-# Copyright (C) 2015-2017 ilbers GmbH
-
-IMAGE_TYPE = "container-img"
-

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"

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"

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"

meta-isar/conf/multiconfig/container-bullseye.conf

@@ -1,4 +0,0 @@
-# This software is a part of ISAR.
-
-MACHINE ?= "container"
-DISTRO ?= "debian-bullseye"

meta-isar/conf/multiconfig/container-buster.conf

@@ -1,4 +0,0 @@
-# This software is a part of ISAR.
-
-MACHINE ?= "container"
-DISTRO ?= "debian-buster"

meta-isar/conf/multiconfig/container-stretch.conf

@@ -1,4 +0,0 @@
-# This software is a part of ISAR.
-
-MACHINE ?= "container"
-DISTRO ?= "debian-stretch"

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="\
@@ -263,14 +260,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