From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062963440528130048 X-Received: by 2002:a05:6512:3b1f:: with SMTP id f31mr1136838lfv.277.1644474329698; Wed, 09 Feb 2022 22:25:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:556:: with SMTP id q22ls745818ljp.1.gmail; Wed, 09 Feb 2022 22:25:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJw07wKXICWP2GLKj+IYH2mKxvBm0TGc2rPnuRlXBZV4sTp94duuVyaAshlcWctJFJ0Pc6XF X-Received: by 2002:a2e:8415:: with SMTP id z21mr4115424ljg.134.1644474328768; Wed, 09 Feb 2022 22:25:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1644474328; cv=pass; d=google.com; s=arc-20160816; b=kb+nZJwQeWe925WJHQPYhioUJdo6FsvU8GiKjPk/zkMDvnfTc2fkrzjVoXLHMU7HAj rw213pFtZktyYuvq35QxuE29gN3Vt5+cpWwNQGHAOSQBXFJtSDgOcem9VXJDFYXV+LkR O9nfkgOv2IvD5IjDT7Z+JcauMi/ibGiYiaD2uyL5c/dV3YqagzNvGupUBgXAPgxy8j7U R1L1JQrcXmtejiv5oDzjuz/wHKZsobXhpit2XlI/0XiV+ruOU8eVzRzcHAVyIefIcum+ Po4N+hSG0AWTObh8170hjGIiSyILIGrc/GNxQrZ1Gue+MRD0ahjR7QQUstBbfqqEhD3/ fj0A== 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=WUqsLtDhrPTcBiQfkYESCr/iIu4KsfW6auiJ/403dps=; b=k0z/SoUP78cFAkYOPecfSMISfg2reDvsj7up79LVpkQbn7OO/bvQczNEobtlI7F1rM VePpwlvjmVONtSs3kN32X55BCtO3kqBtY++v2HcKNSoF8sdo2qx9+Mq98z874uuP8MuJ 8IqaECFOvhR7zFGX7rnURRgfRKeehA6q21abc5JmPQt1rQABFK/jVJp3Iv9rt7EaQL4w AqYtfRkPzQwlMamJ1dyeGCaAHDpstcdL3IP9J/cdyoLRCW09PSaoP6jfjnHKt6/J4FEK KC0vD5VP38tYkYeF/iGxIn5XSozZxlhqlrlaNEW+UmvAFfPJGDB++XM89Agip8RShmzp ND/g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=apuZYzj0; 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:7d00::619 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 EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20619.outbound.protection.outlook.com. [2a01:111:f400:7d00::619]) by gmr-mx.google.com with ESMTPS id i2si814655lfb.3.2022.02.09.22.25.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:25:28 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::619 as permitted sender) client-ip=2a01:111:f400:7d00::619; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=apuZYzj0; 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:7d00::619 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=U8uufdBckuFi/98h07E6ZBKgNBaPRHxIdp/Js4MPshxoKSVxJ8YR+89/c+pZU0ruOKSkhPu3a56czc43//UZ82UAbClCZCNnaiPUG43qFLa/1df7HwDrF5+M96/aT3Ih65liLjtNNSuxzUq7TO+/foYIWvW76soQCJlznhYincm5faDZXQouXCMLahT4oNOVR0jb+mOxgGEvATppn6LDCyLwFEEsGKfwL4nEhF4y1ygH1/2aG2MjgF7Oefejx4bbR+QNlltcVLdWuazw81tL2CcI/809QemeOnKGB5SpsK2QRzplLAIr9gN0uKyzekECXUPZ4OMHdzi9ubO2Jo+veg== 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=WUqsLtDhrPTcBiQfkYESCr/iIu4KsfW6auiJ/403dps=; b=ebZrSK4iUmuDR0mPg/fnDA3Jj936LMb9wo8EueHkDPy0o9TKndRcVwOcCTDFTot8yQPuDwXhjiq2TQONkb2tug57LnHfnv7KZIOYlD3sjgO44vzE1+tEVM/o+5SwWnpDcWdXLJ5wjDWBKGzu0XzTO5y3mjmWPWmFxP8w4vOEJqSF2teWuNMhYMwSuXBBFvrKSL8zQdLKYwLOrPwK3OMNZEdr6TIfDrCiVdQr5RqE0+b5Uic2X8vMKgiy68xslpQHwK1TF0IQ0GOouMLr41WTkaOAi4HKS4dy0l41r3NATKa83HwKh4O2fzCmhLwhkUhEaq4D5fkPh0JEdFmNkx/EFQ== 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=WUqsLtDhrPTcBiQfkYESCr/iIu4KsfW6auiJ/403dps=; b=apuZYzj0CCztf3R5YNa6QZPLNhEQ1HoB3KydKDkq52Pz6ljoGDzf1bgHYtcz5xgSwHJ+it09RCDEX/VOHLABUeN8mTRlPNp6HUeripyT3VxOoIRlmLyRYF1PGzGq1nqdfEUh8gT3FYBqmmf3+NLn+2/YvPhFub5za9AxIcEEmmSS5AD/UEGEaaVdvQ3z8sR9Epg50qhTfIDMsX8ZzwaDnN1O6BGUGGXb1+V8xbS/kJ+uyB/C9yMIO6uhsRNSafJAs/S1reL7brVlqjwDV7aCPBZk2e8ilmaN+EEHka1wS+sDTDAmqv7eK0yPdFbhrXIaJ15QVTLEkQbTgHNg6KCfCA== Received: from AS9PR06CA0222.eurprd06.prod.outlook.com (2603:10a6:20b:45e::32) by VI1PR10MB3598.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:139::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Thu, 10 Feb 2022 06:25:26 +0000 Received: from VE1EUR01FT031.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:45e:cafe::fd) by AS9PR06CA0222.outlook.office365.com (2603:10a6:20b:45e::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Thu, 10 Feb 2022 06:25:26 +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 VE1EUR01FT031.mail.protection.outlook.com (10.152.2.225) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4975.11 via Frontend Transport; Thu, 10 Feb 2022 06:25:26 +0000 Received: from DEMCHDC89YA.ad011.siemens.net (139.25.226.104) 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.18; Thu, 10 Feb 2022 07:25:22 +0100 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89YA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.18; Thu, 10 Feb 2022 07:25:21 +0100 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH 6/6] meta-isar: remove IMAGE_FSTYPES from multiconfig definitions Date: Thu, 10 Feb 2022 07:24:46 +0100 Message-ID: <20220210062446.4145565-7-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220210062446.4145565-1-adriaan.schmidt@siemens.com> References: <20220210062446.4145565-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 DEMCHDC89YA.ad011.siemens.net (139.25.226.104) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--12.214000-8.000000 X-TMASE-MatchedRID: 4fotL6tHAt2T5dDfN8TpsQp4UBC3atMiDSsx3Wb5DQk3aW/7bl6SZ2tq QgJyb0BRkshAoFcG3yQZkgLnW4KPXeCvRZnq77KlzHR5txO5BcCZegieAeKYr0+zv2ByYSDQ69x ONVZSrH35L8Bg16S75Kyaw9ZbX5wGdDtyrAUAFQPGV6m6A8ZyM319XH94Jsw6bBMSu4v05tPrix WWWJYrHx8TzIzimOwPC24oEZ6SpSk6XEE7Yhw4FgkwWO+zqVtXTzgZMyefRrpyZW5EYNu3PL+gF p4RmMDwgRILvhm4ftI= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.214000-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 2D4EDA5D08F17EA48F84C2FB44805E5D6EAB0EF34FDF290C43A59720551EDD912000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 45a55e6e-64d0-4d7d-478a-08d9ec5e206b X-MS-TrafficTypeDiagnostic: VI1PR10MB3598:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: faS/JNNb2SqtbsCaAokWKgfM4g8cJOJ5PlhmKLYSm3NPeqDLji2dDwSJT9IfqqQ6RkyJ7e8+bD68L35qQ1qdwGNpv4nElPnt66Xg9c1kuHzrZkz62EKGQkFUitORR9f/Db1kQa1bbXJN4ntRRdPC9/XsM1v1xvqoMg0dFdUJ/M4EwGO82QZGaEACpNXcIzINJE+Orcnj1ZtuRNehgAh0dls/3/kTLG1BrwXK41ItsNuKv2KEtmOQywybnJk0DG/qauc3Tuz85nBFYT2r92H6jNwPF4rpBMLECgxkOLLeMcWR6kaQGNhTkdNRN7CGBycOvfCcxNE7/fLUpTL+Ml26AMzpXbhMX4YfV0+DtBebRIzWiQbwMPYV+jsDuRz+Q7ntPttUus2WyFW6d5hdopm+0DXJCL6AokEKof0jq5Bn7vEk8Qbs5lQSDhQdW7iHUg00un+XU6UOa4PekzcbSSQy08z1Qxr3SVo+gIbSihdyb9DL40AMLU7AoRpb5ptP0PEzgCgDwi/IsNBF2papFvbh8+DdsNLaqf5FFbCq9L4s7BZM906IZYwAkaKJN6Cv1U6Ogrmj4ukeBn/S3siL8uOshX8mcRIRVSd3XO0KWzageb5SItSRTg3i15DyUM1Sffe3gqI+M+F4AY2GAAHnTy4TT8SxCD5lLGHLhEJAXFSM9C1fvJgOKBd7wls5D8WSMbYm 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)(83380400001)(6916009)(316002)(82310400004)(36860700001)(44832011)(2906002)(86362001)(70586007)(336012)(40460700003)(47076005)(6666004)(356005)(4326008)(26005)(2616005)(8676002)(7596003)(107886003)(8936002)(16526019)(82960400001)(7636003)(956004)(1076003)(508600001)(36756003)(186003)(5660300002)(70206006);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:25:26.4149 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 45a55e6e-64d0-4d7d-478a-08d9ec5e206b 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: VE1EUR01FT031.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3598 X-TUID: qQWTRdox6W18 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/build_test/build_test.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/build_test/build_test.py b/testsuite/build_test/build_test.py index 16f6d0a3..2651ceba 100644 --- a/testsuite/build_test/build_test.py +++ b/testsuite/build_test/build_test.py @@ -119,8 +119,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