From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7012879449257410560 X-Received: by 2002:a05:6512:3190:: with SMTP id i16mr4088082lfe.241.1632813245448; Tue, 28 Sep 2021 00:14:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3a83:: with SMTP id q3ls2807869lfu.2.gmail; Tue, 28 Sep 2021 00:14:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJympQaVUdOjbDnPuhIfZD083PoXIKuyoFHfRKzjpd4cZ5TdGfWG/dAS4MsbgnBwIj+arhl0 X-Received: by 2002:a05:6512:691:: with SMTP id t17mr4159834lfe.53.1632813244295; Tue, 28 Sep 2021 00:14:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632813244; cv=none; d=google.com; s=arc-20160816; b=DJwmYe2r4FSNw+2/o75tshkrGXZ76x4Q3Yq7tIonFa/g3Fe99/Ye3BKDKMfO6938Op jsZKFtGq3puYyuZLp9rlpH/1MPBz/l2AT8z9MerWq/Zf/gcQAMFKcv9g46Kon4jiItBj jkPm6jbW2rD70N8VHy1T0Ntkw3I/egH7cRSLRqh3MJi7S+0bfQwTI0BpFbzFNB/wdPmI HI8gt8CAGUeo/yS5RA/cttKE19IRwQ4fzC5ONyvOE6+LjEuUIzFKKYZ4oQ//+lTLBLEz 42fMbhkFb6uZQKySyhOC7qBaXIuKm/RoS2CLMrXisHDkyvwxXiPsgKYLnoD2d2MnoTYE 942A== 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=wMm+qwa+3vXD4z5fFSy6F98piNCzEpY5PDR5ZwvYIKc=; b=KJnjr7bSjK5KkGou7HDNBtm5ey0ODF8i7XWiwJL5T/shoRsUet9wQ6Nfu9wYemDEyu CH+RRm2NViDvsbMTaM1e7lMiT7NI2o53CVdSBcDdNUvpAVWNOhflOV7SD8LoYnn/DMWt BZystroJ7faPksVC6+wZkKgJfE1J70Df/wBfsD973O43R3xO0/mrRoFRC3ikvtaOYjRx /CridDWPqhq2LchrJRWFwO+K+DmOhT2dIoi0qbaflrDHbIELZqBrC2FEsxIy60ViDLkC pIFGTnGAm9YVXZ0glvexluT4sp4+OF4axMyq+AC/F7DnZP4WSZ1yKJvhUsMkeYeDICyb pKFw== 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 o26si1165482lfc.4.2021.09.28.00.14.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Sep 2021 00:14:04 -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 18S7Dqmj008903 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 28 Sep 2021 09:14:01 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 4/5] meta-isar: Rework mc:qemuamd64-buster configs Date: Tue, 28 Sep 2021 09:13:51 +0200 Message-Id: <20210928071352.31382-5-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210928071352.31382-1-ubely@ilbers.de> References: <20210928071352.31382-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: HCWReA0YjISd 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" 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 + 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 - -- 2.20.1