From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062963440528130048 X-Received: by 2002:a05:6512:c03:b0:447:7912:7e6b with SMTP id z3-20020a0565120c0300b0044779127e6bmr2725624lfu.508.1649165093307; Tue, 05 Apr 2022 06:24:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:3813:0:b0:44a:9ec7:d611 with SMTP id f19-20020a193813000000b0044a9ec7d611ls545253lfa.3.gmail; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSsijNw+xbTaQDoknlggI06Od6/RdlzeSDjRjWMG29WpmUiFp3AuQiJTTH3G8/6/4agVBX X-Received: by 2002:ac2:4d5b:0:b0:44a:14c9:89fb with SMTP id 27-20020ac24d5b000000b0044a14c989fbmr2646242lfp.345.1649165092443; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649165092; cv=pass; d=google.com; s=arc-20160816; b=q/8MEfjhb2vW+ch80fXOV39KY37kVDoKbljTfWEEz9/Rl1Tx6vRq0Uzqog7Z6LGmVw OszivwBMr2NnWBsJeqSv1LdTtUg/UZfgVDsay0V1UQ/Wck3/mepxOGv8CanCa7cSBgFe C9HRGoHgydAPEA4XBkOfuYho1BBDBKe5Q6JaLG4mDJDbO8zRkDojItBy1abf49Qilj26 mbsJOOQ4usuS51snu5Pt6zvpY+F13VErqQ1dlpkZ5+JrjlpSxFtkQBxbFjGr6RMiiukD dweqAX/PSxPF11057snGiw6ulY1fl8SCH1nT26dlp/HALEJSXVvIjFZd5TR122JRSzZE DElw== ARC-Message-Signature: i=2; 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:cc:to:from:dkim-signature; bh=gcz6hwxUiOqP1Ao2YEhyXLt5eC1rkq16oHQwzaICKEo=; b=UE8JbN2tduokuX1VrVkIBc/vHBm7UN6VpddzeWS4l9IOxnnDEVpOBjCP0kpnaHcBi5 mGh1lxqFKKB4pIqv9HeCCyobPDIT8CiW0vXXkW+Woysv9pPEegzdaBaPCOnvU0MJi1FQ XsvWaU4yQZUDziYi3FSIcZqxfWOqhTe76iowawJ510hk5UlT+mh8LHM4RwJDDxLWnmVE WBLLFenyGGKOlQv8GoiAMgXRIBZz2mH7yaJtcmpj9xErT+2HSEyyj7tr+FAXiOgekMlH xhENJbsb4IjrbzfWBXRCdT0VkN+NZdxBNpkg+ZkQ/rON5rCpWtbpY67YWLiQDaUv6mMN 3RNw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZYMDvoC8; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0a::601 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0601.outbound.protection.outlook.com. [2a01:111:f400:fe0a::601]) by gmr-mx.google.com with ESMTPS id c5-20020a2e9d85000000b0024b16acae2bsi352722ljj.8.2022.04.05.06.24.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:24:52 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0a::601 as permitted sender) client-ip=2a01:111:f400:fe0a::601; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZYMDvoC8; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0a::601 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LbFlZoqFcF1vhUKYvczW5HF7Ip7FbiLIZ5BYgCZCTlJZ+ioc5HdpZ4Ps8QPOyjmazMP+lwmEN2RE3rmyRQIDmhXi31EilC6VcWLDTXWkE1rb+vfYYJVyiVBOBhfWFxLnLtuaVWkVPXO5uH9kW84B5iu/nAiUSpG6mLK+AVH7GhaBitqYRhIRObcLSv8jFDnaS28nlAghkGYs72/51RgsAg5SUCj9So8v/I+jmKg5G1KrPdRwroARMyltn81223XACFPEKH3IfxmFiqX0TPFHmEtQUJgC0/s4+l4GvDhKLy/0TRG/5WeI9A8sGvVLpOcVgMI5lwJBFoGKMCvpKTUzWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gcz6hwxUiOqP1Ao2YEhyXLt5eC1rkq16oHQwzaICKEo=; b=Wd1k++27heeUV/O2E15TDinXy7PM1f3G07i/Iw+3cohZE4Fc4o7qisZvBZmR0lWw6pA3X/ZOULa0z3l4X9Y/b0wceAlk+TBvYIrIFazje2ioX6p1FMASl1+cGWQp63boy8xmKJmY7bkiYVbvYEOJggiwgcWS8JDgg9B9bZbQEk/BnHvj53pZv98ZuzySxJU7jhAP1ZmL/DhNvPlv1XKmtnjLFVlo3a05D8HK9ektbmex7cKLcUOQJazKODSrXnGm/beQxQb81slbofN/+GuLt/EDFZj3EJ9cwwymlIG3uZvl9a3NmQfXhQyc0ypnuPBAF8yMecvXgRS4+sJ5ixm73g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gcz6hwxUiOqP1Ao2YEhyXLt5eC1rkq16oHQwzaICKEo=; b=ZYMDvoC8He2PHnJ0rlhHUDtrMXqEO+tgGxkFGJugM8I59Fug4BayNz7yYeP+Ncm00rGawKqmRGJAwAErP6e5NIp4a19O8TRafwPyAnwvcnnJKrLuwFpRn6VXnxFic42ZdfjWygAFCNZjjoodsYv3m/e+cTeIcsTt2cncARbrv7StWudiIkDXEeVtjVXSomTHEGJ1Ik/JTFlSv9TD++yGwHh37X3HCiN/nYh9G8RquVkZP1NljvdViyRzAykCvP1NAagg2hc9JVvHz/WTXPceXkb2JY7ZjfO9PhSrjIip5y85dxNrNyNGiUe7jnKTXh+/Xk0Jk7N7JbjLbx/h/6OKSA== Received: from SV0P279CA0037.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::6) by DBAPR10MB4283.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:1cb::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Tue, 5 Apr 2022 13:24:51 +0000 Received: from HE1EUR01FT098.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::17) by SV0P279CA0037.outlook.office365.com (2603:10a6:f10:13::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.13 via Frontend Transport; Tue, 5 Apr 2022 13:24:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by HE1EUR01FT098.mail.protection.outlook.com (10.152.1.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5123.19 via Frontend Transport; Tue, 5 Apr 2022 13:24:50 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 5 Apr 2022 15:24:47 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 5 Apr 2022 15:24:47 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v2 6/7] meta-isar: remove IMAGE_FSTYPES from multiconfig definitions Date: Tue, 5 Apr 2022 15:24:30 +0200 Message-ID: <20220405132431.2895832-7-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220405132431.2895832-1-adriaan.schmidt@siemens.com> References: <20220405132431.2895832-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: adriaan.schmidt@siemens.com X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--11.649100-8.000000 X-TMASE-MatchedRID: U8xOoY+QaPmT5dDfN8TpsQp4UBC3atMiDSsx3Wb5DQk3aW/7bl6SZ2tq QgJyb0BRkshAoFcG3yQZkgLnW4KPXRlrc264S0YI5RTVXdccDuoHKdtUS/l9oT8Ckw9b/GFeo3E y1/GoJqWe87/vN9JpT2LpIIQT+xImcrci5qqtowC18ETvXXRjSsHVNeDWrWSGq5uw61JZjZCAMu qetGVetnyef22ep6XYymsk/wUE4hoz688Ors6dsBvmDYM/EQg4NXpzPmLo+2/Hp/TCOedpSwK/Q FOpzzud X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.649100-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: C99AFA5533CA634AE94B5E7CAA40F65C3380EF39C0FB8920CE1C67C3926248FF2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20208578-7f77-4aa9-5454-08da1707a9f4 X-MS-TrafficTypeDiagnostic: DBAPR10MB4283:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 96udW1MZLN0ruVzC9T0tdv8OGWwBdBZbRZyN43Ao5WdJecpJ0zf3fyKC1Bu4uH9oFgR2hdQF0tSjRSWxc2/fk71L4d7qCioMRMSRQS39JwdFUDU8krHU8VEPyh2C8AExYAOHMpPaawSnZBIPe/zdOBH2EHq4K+WZu3chD46NEe7OvAm4XKq0y91PHw7WvCStUWbb41qiy8gpNO1WBDea1YqFfCSxWmidNwmL+gJO6PDgKSo2FYDuhuJIsmjT0ELZ9iSZg+QQXrK6s6vp38Vg4a4yfxIq83UoG1wuQlUXA9THxHMaIv/gocVKp1xbvRh3Nh+CjeOVKJ6nVttRwkr+LMCHSJDvoCxGyvO8pERY3asMj1oKKPE30dByzbcAvkhijLyIGGWHTnETAxlhsc61YV2kYB1hmRaMOMA/00OntlsJWKGkVYdxLLVr4VcP1bj4fBCK83OdzJI3kJg+FSuuWUJl1FDAQO47F9wFH3LjBBppNdXKpQL76nTJC+jW18OptZnNuLiSXxZewOn87vC/IyxAwxtYlU4WCR93CmlD7X7psso2LXe0iYwVGxYCgL+dpbaYAojMuOGe0YUCbHN81rDIe3KeBJeq3+9fB8qgjekF2il4QqwpAgKLO5EWae/cToLm+iEACu4jAw9fq5ayqZ+GFJY4YtPTG8z5l7QfBzuzv3ytG7cXSjTaaKq1FOrTSY61V1o+jpfcTRIVmk7k3A== X-Forefront-Antispam-Report: CIP:194.138.21.72;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(47076005)(6916009)(336012)(36756003)(508600001)(316002)(5660300002)(4326008)(8676002)(70586007)(83380400001)(70206006)(86362001)(40460700003)(36860700001)(107886003)(186003)(82310400005)(8936002)(956004)(2616005)(16526019)(1076003)(82960400001)(356005)(44832011)(81166007)(2906002)(6666004)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:50.8845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20208578-7f77-4aa9-5454-08da1707a9f4 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.72];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT098.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR10MB4283 X-TUID: vR+/R1jqPpUk Now that we have support for building multiple image types using IMAGE_FSTYPES, doing it via multiconfig is the wrong approach. This removes the configs that are still using that pattern (buster-cpiogz and buster-targz), and instead adds the building of cpio and tar images to the qemuamd64-bullseye config. Signed-off-by: Adriaan Schmidt --- meta-isar/conf/local.conf.sample | 4 ---- .../conf/multiconfig/qemuamd64-bullseye-cpiogz.conf | 7 ------- meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf | 7 ------- meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 2 ++ meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf | 9 --------- meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 9 --------- testsuite/citest.py | 2 -- 7 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf 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 71ee8579..58f3e1a2 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -52,11 +52,7 @@ BBMULTICONFIG = " \ qemui386-bookworm \ qemuamd64-stretch \ qemuamd64-buster \ - qemuamd64-buster-tgz \ - qemuamd64-buster-cpiogz \ qemuamd64-bullseye \ - qemuamd64-bullseye-tgz \ - qemuamd64-bullseye-cpiogz \ qemuamd64-bookworm \ container-amd64-stretch \ container-amd64-buster \ diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf deleted file mode 100644 index ff491b2c..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES = "cpiogz-img" diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf deleted file mode 100644 index 8eea112e..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES ?= "targz-img" diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf index 1badc889..5c8cfd33 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf @@ -2,3 +2,5 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-bullseye" + +IMAGE_FSTYPES += "cpio.gz tar.gz" 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 675d934a..00000000 --- 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_FSTYPES = "cpio.gz" 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 b48b0a6c..00000000 --- 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_FSTYPES ?= "tar.gz" diff --git a/testsuite/citest.py b/testsuite/citest.py index 8f47338c..f8377f79 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -136,8 +136,6 @@ class NoCrossTest(CIBaseTest): 'mc:qemui386-bullseye:isar-image-base', 'mc:qemuamd64-buster:isar-image-base', 'mc:qemuamd64-bullseye:isar-image-base', - 'mc:qemuamd64-bullseye-tgz:isar-image-base', - 'mc:qemuamd64-bullseye-cpiogz:isar-image-base', 'mc:qemuamd64-bullseye:isar-initramfs', 'mc:qemumipsel-buster:isar-image-base', 'mc:qemumipsel-bullseye:isar-image-base', -- 2.30.2