From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062963440528130048 X-Received: by 2002:a17:906:6a14:b0:6e8:a87d:3f2f with SMTP id qw20-20020a1709066a1400b006e8a87d3f2fmr5315043ejc.300.1650005801875; Thu, 14 Apr 2022 23:56:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:968d:b0:6e8:61b4:abcb with SMTP id hd13-20020a170907968d00b006e861b4abcbls278191ejc.8.gmail; Thu, 14 Apr 2022 23:56:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx7N2Xn9O4c9ECr8C7WoC+e9lme1KESZkF4OKRLukbDL4x7QLB2xCRVABhll9OReaQt6S8w X-Received: by 2002:a17:907:7f1c:b0:6eb:c702:7f4e with SMTP id qf28-20020a1709077f1c00b006ebc7027f4emr4910840ejc.496.1650005800955; Thu, 14 Apr 2022 23:56:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005800; cv=pass; d=google.com; s=arc-20160816; b=jjTG3TKfx3jKavNw6m8e/UBBN3P3bqKgNwq+rP51ScubhNcWtERPOW36oaqmULdNs+ PDgGMnEfICyRdlq0Smm/sKcVpjRvWIGUWqk9aqbiexjCJV9BBueExfe43aZpQlQID1oj rHFffsW9rumE9NHkzHRZqoX7JHVU2scqQrAXRnUv65i+RUNnaIIvRyXZAgmYDVPOtVMl +9EnwgVPIP7gsOAq6b08T6ZOpRjWf+Hm9zlLLetM6Iuy78lc0Znvb8YqRlGpjvA22/oV YkVIPsM9L+zpm9rpRugYXKejeEKH5sX7cn3DLaolYm5ZmUOx79VRN1TgrXyXf/eAwMGX Ex/w== 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=gAz7vjLTmUQLC2UDaEU+E5q8KA+q/OZvEKtKCFFlLPE=; b=SxmNbuUit2fRXSCLB/7zXvbE6awsWB0DkXTK/bZ6ABUSvhZVD0R18xpX3RFLDrTUVw /nSv78FgPtvXht+zEKniaYNLaWn5QcZJ45NhSvLtJOa/59kuFrlib5LYq7Si+Ba7UyD5 v/c9MFNml89LDqqd57EPEi0F+J523E3GF9ozrQ72HQ78zdoINX63nG2f+AieUD1XU98l X8MKdiPDHwXOrPTQQJBHmpcQBGJMaJHjLaS1/fdZhR98iBXEZrUHWf//ispy6K6FXzou mvc4VpjamOQ3M1hVEVIFtaFH/abkodScQxPu6PeUGmAJ4DT6g/4qoZORbixOBAXe2j26 hycg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pbUus66M; 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:fe0e::628 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 EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0628.outbound.protection.outlook.com. [2a01:111:f400:fe0e::628]) by gmr-mx.google.com with ESMTPS id y16-20020a056402271000b00418f6042d64si46504edd.1.2022.04.14.23.56.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:40 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0e::628 as permitted sender) client-ip=2a01:111:f400:fe0e::628; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pbUus66M; 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:fe0e::628 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=BkRF4KDxYxZhCxo2GUcJN/irHL4b4h1TcKMu5X1r/HfGlCPzZOReoYXMW4a7kJPMFeCEtTFNHFgHNpNI6t/dgcIStZTtXMMlQ1wVGgzmOlD7jeCNEKqcD+7CdsHb5uy9jOvXuBKZefeFzDBwJzyw7/XO8g/fXvqQZVb+cbJEWGA9lRLvuma2d1QZlgHpkQAkVgq+FgSjT85zBvg+pX5AyIPjuJVofvFeQhTMUdhwxdKYr34bbPcSdU2bQDwnz/kep3MjRuucJ4bQnumXub+xSHc94rcNOnhxWdL5w8EmQfQw+6JT8azDHpzwzHaiDKFciw5zG1tuczPTt/iDQKAJoA== 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=gAz7vjLTmUQLC2UDaEU+E5q8KA+q/OZvEKtKCFFlLPE=; b=aQY5veJExM9CbdwOEdC+wTNBl8hwiWD5i+6u68YLORWR9h0jCyb1FkL0tcg0tV9tuswycFVRxJokQgT7TVvjaqbf4pIXeJ1wkoaS+MdgPVFzbDAnf8ho2DUDbO4W+SDrW23O7tdthCu3fTwVNnYeAi46U7dQ65MaoxMJQsuJiIQAtMCcRVLhSVXPPnrS7h38G7xFBtW/iTiPswdZ+rwVWl+WK8SA02NkQvKkE8fLQSc3TH13OhtPHPw+HPpK/0gMukhoHRyrEGMpHIwwMx+tPmiY930f23wKk7PJPJdBU6ujtbKP3Cy6P2nBvbHhfcvEBCB3R16VFgA8JQoKqdT24Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) 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=gAz7vjLTmUQLC2UDaEU+E5q8KA+q/OZvEKtKCFFlLPE=; b=pbUus66MqotaKiTlsAPRsHDwtYeM7Zy5BKbveTyDsIK4uUz/hwE4WosBJCpyoe12WLldlyuA8tSPuXhwmR7TzmNYeEh2EH99ta7P1Iigxg6fD/7XjbzwxOlTNM9TAFOonsI/WQW9mM+aDTvfqcV5lFf3qxIYW4SyiQUsmm7DLZhUwl9bxZC+3AuNwGY3mAl9SD9XHo+s9SQtH8xCzKPu7+lNozTIWYtEf+SsBFt3k8Gtc+hzq0GAZP89H3UhhvMT2TZvv1FKfYHSu+BjB3sZvzJqk/rwEQWALHtjlnO16GxDLu0uTaFfSCVFsjMzsKUYHtKWveNTLzf5b1lnHmJrZA== Received: from SV0P279CA0052.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::21) by AS8PR10MB5016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:407::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 15 Apr 2022 06:56:40 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::b6) by SV0P279CA0052.outlook.office365.com (2603:10a6:f10:13::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.18 via Frontend Transport; Fri, 15 Apr 2022 06:56:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) 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.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT069.mail.protection.outlook.com (10.152.1.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:39 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 15 Apr 2022 08:56:36 +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; Fri, 15 Apr 2022 08:56:36 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 6/7] meta-isar: remove IMAGE_FSTYPES from multiconfig definitions Date: Fri, 15 Apr 2022 08:56:16 +0200 Message-ID: <20220415065617.1910954-7-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-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: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) 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: IIyI5q76PIWT5dDfN8TpsQp4UBC3atMiDSsx3Wb5DQk3aW/7bl6SZ2tq QgJyb0BRkshAoFcG3yQZkgLnW4KPXRlrc264S0YI5RTVXdccDuoHKdtUS/l9oT8Ckw9b/GFeo3E y1/GoJqWe87/vN9JpT2LpIIQT+xImcrci5qqtowC18ETvXXRjSsHVNeDWrWSGngIgpj8eDcAZ1C dBJOsoY8RB0bsfrpPIfiAqrjYtFiQPpKhuXLMxyzM3QQRvTs/ojg+EXgaCyOUhuuZPqWf5e37cG d19dSFd 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: D19CDC7782DAA214836FDB10986B7404A0754FF501608416D0F044DB0F90C2592000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 706be52a-a2cc-4f8a-0474-08da1ead176e X-MS-TrafficTypeDiagnostic: AS8PR10MB5016: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: /DTEHTPSy12w8D64VZPsJAJdivB3UZm4jLbDLpqJIuBEl1uLJMTze0N6C2sfXvPTxwqXUfdoJa1myRB0vesnngt9vgxk0p2xdVm7q46HsUcT56Hq50/yi4iH1CVQTxuSItt3fXJo5FRHI00Gxti9IpnsYwA1bhbOvDUQ/FTUHZX1eAxTJLLDbX8MGFgF2L7pFf64tSJNn1Z/Okknzei2bz8+kyvPtjsHf/yMypgqITsimp5cJWdh3NihoP3tD5hFyiRYrCLBuKnDsMclJek7sdHFwIH1qHQx21Sn0tpcP9BgYDSKktCs2dyK26l0Vb+xkUBNrskZeYI1TWzyJAVWMEBmznsKiY9f3epVMcSVXSDY/x7EpXRVCpbdQJSvMhxvlDUJid1fyaLJqbTtX5KAgHyUPJAYePpp/olblPboifKUAbqObTftMeFYJ7JrFhBrCZGbPgeejRNm1nGUVZ2vlikoh+nsugDDJ79xtK9qddY+Lx/mvW7op/hvVsjU77RZ7sk1NhtGu698butzVqV2B5zok1bT54TLb6Lu0pIV2Q7L+sqgZQvHK1ctEGVcyj69dDYDKv4ksFKjkOpfDyVZcuBWl065+mLZs+0Yjrg6SU39DRc2tXT9cSf02Zj3BdIbrQGy4sMnaMLr2iy725o5deDdMIAUqHfjyKUg4pj+EogMVRZ6dSWylC/5XuBhpqxk X-Forefront-Antispam-Report: CIP:194.138.21.70;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(82960400001)(86362001)(6916009)(6666004)(356005)(70586007)(70206006)(8676002)(7636003)(4326008)(82310400005)(36756003)(36860700001)(7596003)(2616005)(336012)(47076005)(83380400001)(26005)(186003)(498600001)(956004)(1076003)(2906002)(16526019)(107886003)(8936002)(40460700003)(44832011)(5660300002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:39.6759 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 706be52a-a2cc-4f8a-0474-08da1ead176e 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.70];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB5016 X-TUID: PJ+JPCW0TMA5 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 994c130a..69c66b1a 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