From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7012879449257410560 X-Received: by 2002:a05:6000:2af:: with SMTP id l15mr20515375wry.17.1633424046288; Tue, 05 Oct 2021 01:54:06 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:ef50:: with SMTP id c16ls1277488wrp.3.gmail; Tue, 05 Oct 2021 01:54:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwVQQLrIFXfp2t+ZtMg7IyJX2h5QmXEQ3QnyXXWUiyo5qZ9RP5rZX/FiBhD45ADzFTBD746 X-Received: by 2002:adf:a2d7:: with SMTP id t23mr20570660wra.156.1633424045393; Tue, 05 Oct 2021 01:54:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633424045; cv=none; d=google.com; s=arc-20160816; b=yn+S3Q8m465C03HMAeLYg9aiR7613WP9+SxIv92LNPv/vboajlGPs1ueG/F58Ayq8X z+Ii+bMWs6JOPnjQxKaJ21FpvlzRg6Kt2W5iiCKvLKFkOSw+IpRtfT2/m5Lfrelysow2 MNxvlpSfY8JtE5ybLZ45GFTLAExx/Qvrpt4krb+tn2FH+yIgbx49YuRRFAUsMw2+uSlX w/pWdx0vByu8PEHfySHduH6HaumqWOGkl9J4xS0wQaacq0OJYjEmefw9nnuNLPF26+BY 5iQNg+Ndmn1csrQU5dEU1PLyotNu55NS92Zk+Wc+cnB04V83VUihpug8KoVKU4SHLZkM NWAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=V7JLPAkGbadWb3t9Fnw13cmmUswpd7BzuM0EuEGnk+w=; b=EyUFE3o7YZnXOZ6tOkfyX4gBBcN4UWEKKxon5Hnmqmu2uEcSZSe8qHtER3WOSavQG6 I69iFuW4qNy3YVp4JvD7gdKZ2Vz3re2Q54BpdqDydDu2ceZxsac0Q3DmyzSpFkNC7nUY q7qJ6jj593imE1F79YbD2eOLEMe9I0neh5e70SHwp4GiF5bvw/UQdIwP+66Fk9ANoUmm ObUiAtvR45e1NcYKlAqzUsxNzFvBAwZOBQ2Bhy+6qpxdSN+jkFBdXCmnTgPcX2ZoPMX8 YzxaBzXIejCvd7e5WshDXvVgu3GOLlNk6Ts2OgbssSpEE6v7ikKQg99oKTngxjlrJTQd 1V/w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id p3si880754wrg.2.2021.10.05.01.54.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Oct 2021 01:54:05 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=henning.schild@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 thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 1958s4c2000722 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 5 Oct 2021 10:54:05 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 1958s4L7001954; Tue, 5 Oct 2021 10:54:04 +0200 Date: Tue, 5 Oct 2021 10:54:04 +0200 From: Henning Schild To: Uladzimir Bely Cc: isar-users@googlegroups.com Subject: Re: [PATCH v2 4/5] meta-isar: Rework mc:qemuamd64-buster configs Message-ID: <20211005105404.75cb33fa@md1za8fc.ad001.siemens.net> In-Reply-To: <20210928071352.31382-5-ubely@ilbers.de> References: <20210928071352.31382-1-ubely@ilbers.de> <20210928071352.31382-5-ubely@ilbers.de> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: yb4uG814ysTF Am Tue, 28 Sep 2021 09:13:51 +0200 schrieb Uladzimir Bely : > We remove mc:qemuamd64-buster-tgz config that explicitly creates > tgz-img, and mc:qemuamd64-buster-cpiogz config that createc cpiogz > image, but add these image types to common mc:qemuamd64-buster config. > > This gives several output image types for this machine and > allows to test this feature in CI. > > Signed-off-by: Uladzimir Bely > --- > meta-isar/conf/local.conf.sample | 2 -- > meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf | 9 --------- > meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 9 --------- > meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 ++ > scripts/ci_build.sh | 5 ++--- > 5 files changed, 4 insertions(+), 23 deletions(-) > delete mode 100644 > meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf delete mode > 100644 meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf > > diff --git a/meta-isar/conf/local.conf.sample > b/meta-isar/conf/local.conf.sample index 88a8175..d90c739 100644 > --- a/meta-isar/conf/local.conf.sample > +++ b/meta-isar/conf/local.conf.sample > @@ -49,8 +49,6 @@ BBMULTICONFIG = " \ > qemui386-bullseye \ > qemuamd64-stretch \ > qemuamd64-buster \ > - qemuamd64-buster-tgz \ > - qemuamd64-buster-cpiogz \ > qemuamd64-bullseye \ > container-amd64-stretch \ > container-amd64-buster \ > diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf > b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf deleted > file mode 100644 index cadcdac..0000000 > --- a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf > +++ /dev/null > @@ -1,9 +0,0 @@ > -# This software is a part of ISAR. > -# Copyright (c) Siemens AG, 2020 > -# > -# SPDX-License-Identifier: MIT > - > -MACHINE ?= "qemuamd64" > -DISTRO ?= "debian-buster" > - > -IMAGE_TYPE = "cpiogz-img" > diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf > b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf deleted file > mode 100644 index 17de338..0000000 > --- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf > +++ /dev/null > @@ -1,9 +0,0 @@ > -# This software is a part of ISAR. > -# Copyright (c) Siemens AG, 2018 > -# > -# SPDX-License-Identifier: MIT > - > -MACHINE ?= "qemuamd64" > -DISTRO ?= "debian-buster" > - > -IMAGE_TYPE ?= "targz-img" > diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf > b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index > 3fabd67..d8139f7 100644 --- > a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ > b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -2,3 +2,5 @@ > > MACHINE ?= "qemuamd64" > DISTRO ?= "debian-buster" > + > +IMAGE_TYPE ?= "wic-img targz-img cpiogz-img" I think the patch order might be wrong, this one maybe will not yet work at this point. > diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh > index 48a51f2..c39ba3b 100755 > --- a/scripts/ci_build.sh > +++ b/scripts/ci_build.sh > @@ -36,8 +36,6 @@ TARGETS_SET="\ > mc:qemui386-buster:isar-image-base \ > mc:qemuamd64-stretch:isar-image-base \ > mc:qemuamd64-buster:isar-image-base \ > - mc:qemuamd64-buster-tgz:isar-image-base \ > - mc:qemuamd64-buster-cpiogz:isar-image-base \ > mc:qemuamd64-buster:isar-initramfs \ > mc:qemumipsel-stretch:isar-image-base \ > mc:qemumipsel-buster:isar-image-base \ > @@ -196,6 +194,7 @@ if [ -n "$REPRO_BUILD" ]; then > sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= > "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf sed -i -e > 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf sed -i -e > 's/^BASE_REPO_KEY/#BASE_REPO_KEY/g' conf/local.conf + > bitbake $BB_ARGS $REPRO_TARGETS_SET > while [ -e bitbake.sock ]; do sleep 1; done > # Enable use of unsigned cached base repository > @@ -205,6 +204,7 @@ if [ -n "$REPRO_BUILD" ]; then > bitbake $BB_ARGS $REPRO_TARGETS_SET > while [ -e bitbake.sock ]; do sleep 1; done > # Disable use of unsigned cached base repository > + a few whitespace ghost changes ... but maybe intended ... > sed -i -e 's/ISAR_USE_CACHED_BASE_REPO ?= > "1"/#ISAR_USE_CACHED_BASE_REPO ?= "1"/g' conf/local.conf sed -i -e > 's/^BB_NO_NETWORK/#BB_NO_NETWORK/g' conf/local.conf # Try to build > with changed configuration with no cleanup @@ -273,4 +273,3 @@ while > [ -e bitbake.sock ]; do sleep 1; done echo 'SDK_FORMATS = > "docker-archive"' >> conf/local.conf bitbake $BB_ARGS -c > do_populate_sdk mc:container-amd64-stretch:isar-image-base while [ -e > bitbake.sock ]; do sleep 1; done -