From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7007432827793833984 X-Received: by 2002:a05:6512:468:: with SMTP id x8mr9543318lfd.369.1631545103814; Mon, 13 Sep 2021 07:58:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3b88:: with SMTP id g8ls442852lfv.1.gmail; Mon, 13 Sep 2021 07:58:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzQPTLiTvWBblHWxlLa64Bx1VP9+S8ybRp7ObFzhZKf8FZoNnxMwpjRcroF9eYH8fpwFQ0H X-Received: by 2002:a05:6512:36c3:: with SMTP id e3mr550255lfs.8.1631545102629; Mon, 13 Sep 2021 07:58:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631545102; cv=none; d=google.com; s=arc-20160816; b=jnQmOspCcCl3pa1fXQyzzlEUrl8I5/umbVFidaHMlLTGKZXCKyhElZvUoiWPazCQP0 R0ClsidenSOFqvuL5+Yrw57CtbaVNImrhI7nUtzcL2nRrO+ZdAa+NCsh8Fi0uATBNJlE E9F5gha+DBj1yeCrLAuuggVK49vRzBhchuCtdXr7OQ4HS8z8YM+wWJttVfgBtOJ7/waa TKpKBnslB/+x7mrd+F5nwZLX/GHqwePSyOhqjgCWIbFBCwVfBnfjo5Rj+N++bL+0E+Dq m0FZJHUDGFVBGcjqnYb1o8wNcfxMwrWQEvVj4e+Fd+5OgSM3hqUAJx7vmRqd6BAW/06z wK8A== 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:date:subject:to:from; bh=/nwRrBhpsJAtidVxsfMDmHBU2opgHLWFH/IACXUv734=; b=lPJUkdiFaN4NURbP0+9CNRKyfpjA673a6giXof2CTwY4MZBrd3wstpvWHc+0KoNtWo edeeF4MJVToF5aXw8GN0W4VWI5AoGRYqsvO3oydpn/yRQe45oa0Ya4QzGRC/iAGrHs2X B89OLj/IgLXxjIzBwcBrT/pOeBJlSouMO9GG9LV4xygwAVmFIbng7yQfCPk4ec0w4C5R 6w71jx8oIYh/+UjCLXhadgTs0gvqlsgWXEwuHVAGqJ5lQLe+GC1IO2hTrMtRWMgTFbiu N+5S/u51za5wMLa4DPakmvUrOvrrFjy7HgZ1q6odsFLLFDkXGKlkLIgsNTqbXG8Y4gqn LyoQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id t12si280928ljh.0.2021.09.13.07.58.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 13 Sep 2021 07:58:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 18DEwA9m009612 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 13 Sep 2021 16:58:19 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 4/5] meta-isar: Rework mc:qemuamd64-buster configs Date: Mon, 13 Sep 2021 16:58:09 +0200 Message-Id: <20210913145810.26394-5-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210913145810.26394-1-ubely@ilbers.de> References: <20210913145810.26394-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: Z+aIVH5JpkV4 We remove mc:qemuamd64-buster-tgz config that explicitly creates tgz-img, but add this image type (and ext4-img also) to 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 | 1 - meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 9 --------- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 ++ scripts/ci_build.sh | 1 - 4 files changed, 2 insertions(+), 11 deletions(-) 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 96a8beb..f354b70 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -49,7 +49,6 @@ BBMULTICONFIG = " \ qemui386-bullseye \ qemuamd64-stretch \ qemuamd64-buster \ - qemuamd64-buster-tgz \ qemuamd64-bullseye \ container-amd64-stretch \ container-amd64-buster \ 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..14aec13 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 ext4-img targz-img" diff --git a/scripts/ci_build.sh b/scripts/ci_build.sh index 837cd67..53d3d6d 100755 --- a/scripts/ci_build.sh +++ b/scripts/ci_build.sh @@ -36,7 +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:isar-initramfs \ mc:qemumipsel-stretch:isar-image-base \ mc:qemumipsel-buster:isar-image-base \ -- 2.20.1