From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7091532167862288384 X-Received: by 2002:a2e:90c1:0:b0:24f:eca:3eb2 with SMTP id o1-20020a2e90c1000000b0024f0eca3eb2mr13899142ljg.158.1651126003513; Wed, 27 Apr 2022 23:06:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a54f:0:b0:24f:18c1:d26c with SMTP id e15-20020a2ea54f000000b0024f18c1d26cls1812873ljn.5.gmail; Wed, 27 Apr 2022 23:06:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxxufsFcE7rIJGEcUtTz7hufR+LPviTEx1pPMsOxEbE2pCgK98nDRpTNKjZg7r4WWcgfPh X-Received: by 2002:a2e:92c9:0:b0:24d:b719:23bd with SMTP id k9-20020a2e92c9000000b0024db71923bdmr20197324ljh.304.1651126002398; Wed, 27 Apr 2022 23:06:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651126002; cv=pass; d=google.com; s=arc-20160816; b=eE08VmiGFBYHFHkA3zD2QUbD1H2CTjVf/4wAuvfSo3AGdLfGwRUh/YJ7DPQyDeH2Gq 95kXkUUkNnrVb7Un1fluJRF4I8mLGDx+o4qk9Mtl2qB9OTnaF3KzHrcsFZKIXCrV5vQI +GgoAqVklr5wnoaP0P4WzCnKTGpZDn+DZvMbbN4+olWam+gRpU8Mq8vrefp0S1r5ic4q DK8+B2ZVgz6Kyqfm7H5O35fCkBDncQBepm+DK1And+wHiQ0CwGVLGCePvg1pBNhhCeWa gUScEk2Cj1Kd0gHpEjsal2zkMF98RSSrzS7yCL8c2xdVUCQNwNrZZE9rwuBZD9NXV86U Zafw== 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=TUh/lBGK6t03KxOTQbtE/WFHjVF5l0lo+8TLNwdsFK0=; b=NDOMf/D4E22i3NtE9tZjwZEj6aOmWFAX1mfmg0ZbT/583WwkfA4uPS1uTJm0Ad+TGC FuetkAKVKFYfamIAtKEQ2N8a/S+ZxJvARh7TtVJwK+GFrMorahOAHf3mN3YbMT2jNXz1 J9RetsvGH021q0DZ+/N8Xw3D8nb4g7+5j/3Vdp7+rk226j0xCjobXaQdf0edQG7yjRta uaGZt6SATkjlm0dRXBLfoz+ZNEpq5WbNgHrgcXg8RrVwCFwoqiDd8Pgp1JJc6giCHgSS vHme9NHtnte4/hHBjq563gr43X5rDxWGLGjVRNL0WNLSNT/r17SZx+87n/R0hTJj8KEo 4g5Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WVqzazG3; 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:fe0d::624 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-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0624.outbound.protection.outlook.com. [2a01:111:f400:fe0d::624]) by gmr-mx.google.com with ESMTPS id d22-20020a0565123d1600b0047223e9d7c6si157102lfv.4.2022.04.27.23.06.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:42 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0d::624 as permitted sender) client-ip=2a01:111:f400:fe0d::624; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WVqzazG3; 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:fe0d::624 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=LSExy2tvYFk3SkiK2KSDcE/aMgK9pBPzcgv/TNE/RNqrGlBbB7UB5m0f74rYXUReGhfzIufOcaAIEtTqzDCiro9VrF1m81lmHqSTrKbwY51olMu+HFY6cc9cFYE2ldeweUW1wYgwl9Of/iHuRZSWnthEkWoonCgwwi5BnGqjBfzYtIxJ14duGshhKWSLBxcqI2TyBnn7qZfRuXjTHpwVSjiZE2ESuuBvq9LGcvYMEOwu7YdMRrtNqWHkNiK/2jiR7hhOqld7R+WViKKLhwRuB8mESCJYQu6RuDseVwLWYj9tqZFrnLYIBUgg2/gtklbB8ZLKtPzUK9IVgAjSjpTbZQ== 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=TUh/lBGK6t03KxOTQbtE/WFHjVF5l0lo+8TLNwdsFK0=; b=QPRvj6N35P3ED4bJOesoGFitV+qbJAlrlKF19F7bJthx7zvlTcUmy4nHnTlKtktTjlWGG+NxdhUYCdAXbl3L1hIqJIQ6Q6xk0rIVEW3jCDMM//fLnLHeRQJK6Y85G8g1fR8+9mr+6PpcGCO6QFAcg7KxjmScwOoUFS7cAqJD5pTFNZJVNe2GCy/Eb0BaUJclXr75LislRN3ZvlQjOWcUcrCjrGuCNo8WlGyl3LVG/Y3yaYBx1C2A7r8n/jdUqF4NTCtnV0PxtA2cxPzpWDTzJEMEZBALfipkqauCpQVO6+V4/1JkLVaV1V9yG56pfBughUqdfvr6x2nKDAVbLKzMkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) 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=TUh/lBGK6t03KxOTQbtE/WFHjVF5l0lo+8TLNwdsFK0=; b=WVqzazG3rMbRtd3u3Ts0mM3ici1DbNRM3oAyUP25fAnJWOtYDYzfB5MxhaYczq7/rhf/ySty1NthEQ8dsPRnXulJhq5M7ZGWPIVMGUvUALroPeVM4w/FV8pIuTHI0YaoUVzZ3q95YYBYI2WOIqLjG45L0BVvcKXY3vd1cBenwZz/61iGQ6yjVLIYCbVkHlBuNECLJ3CWivmnJ/Mj/p4ztX5KjSwHAuzRCbq3ysqADWEkVOxwUx7X9URIs90R5CzupO5NVBkF2txmGBQsVYvUSfoc/Bfv+AclVoVLVfC2JRV8JisXqN5qQOSU5uQdlEqg54LgRC2//qxppludOhuGIQ== Received: from SV0P279CA0049.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::18) by AS8PR10MB5927.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:529::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 06:06:40 +0000 Received: from HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::8c) by SV0P279CA0049.outlook.office365.com (2603:10a6:f10:13::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) 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.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by HE1EUR01FT107.mail.protection.outlook.com (10.152.0.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:40 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +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; Thu, 28 Apr 2022 08:06:34 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v4 6/8] meta-isar: remove IMAGE_FSTYPES from multiconfig definitions Date: Thu, 28 Apr 2022 08:06:13 +0200 Message-ID: <20220428060615.986332-7-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-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 dBJOsoY8RB0bsfrpPIfiAqrjYtFiQdVH/by8xG12bd6oRVk09Xjmd6OKQfWtXHTpsBm4OHaH7cG 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: F5E55B4ECBD81337B879795E7A084F5ECBBBA2C9B7C6615BC930CC1EF7D729352000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2591ecfc-28ac-41fb-8979-08da28dd4301 X-MS-TrafficTypeDiagnostic: AS8PR10MB5927: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: /YnxzSRHTl1tWkcYPzmF9DXtzrRaZy9a5ThuQHu8rC1fZW/SWkxQvRT2/yB/YY/1FUxhUeB+46hClGpDlw4XjEtgfXHWSSkmQc+1j5M0Xr3iMpKdC+CpMjPsHD7WVO1/RGfJknHSNee3xS96S7WQZpza6XtZG8/pvBTQJgE1NpvSu95xBXvx6je/BCleTF8TXcEq5LZ9Iya46Wbnl5e0nUjMKyF7m888d1rLg174MY2FX/RmWkHtyKEz5eVnulwumpMXrKtxkRbYJRknwiNeYAKPJJ06tuxlQS9UfP/fFD2gPdbTyYg/idyfihVqHuLHSO0v4ZTngLafG6yT054hRGZxupNLRm/CLb2cWRtvccc1q5IAl4GTJg0q92PXDXlPHKEisxu3y95i+Ftf0K8POMwe0iUMUhqBKkK+Duj92C2pIjLMEfJuIum95PXPDJUYEAWZ40RjrttdhllKpcYfB1osWSjWuSuIuBZAoEBKbAQDjil+e2Ys2zDFdklfzRoyTHZukVFZF2hnb7ePIPhsWCjEqZiTqSBvh0GBtX+mvp/T5ewCTDdiyPgRcpH2uTYdqJN81Ogj68TCZS6ZCSYpmVD7prbYadbIZg2TNURYOL1RkSV1RXohaY6IHniM64M/bEr2J5WHmlRye9hUvoZIYk0JOv50335BFni3M7488vIG/jTuhxQoVnsYRO4WrZHZJDXnYP+5EzlOHqxpp7DIrA== X-Forefront-Antispam-Report: CIP:194.138.21.73;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(6666004)(36756003)(81166007)(47076005)(336012)(82960400001)(40460700003)(8676002)(70586007)(83380400001)(82310400005)(16526019)(356005)(2906002)(70206006)(186003)(26005)(2616005)(86362001)(1076003)(44832011)(36860700001)(316002)(956004)(8936002)(107886003)(6916009)(5660300002)(4326008)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:40.2466 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2591ecfc-28ac-41fb-8979-08da28dd4301 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.73];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB5927 X-TUID: 8C/TPFMitQu+ 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..13d870df 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_append = " 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