From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062963440528130048 X-Received: by 2002:a05:6000:2a6:: with SMTP id l6mr5252497wry.601.1644474323803; Wed, 09 Feb 2022 22:25:23 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a45e:: with SMTP id e30ls1038272wra.2.gmail; Wed, 09 Feb 2022 22:25:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzJogP8FOFY91R9jEDM/c4QxpEozsR18kiaKrDaq95MssItFyObmvYFtJWzzdzTu/5Tf/hR X-Received: by 2002:a5d:64a9:: with SMTP id m9mr4871584wrp.661.1644474322901; Wed, 09 Feb 2022 22:25:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1644474322; cv=pass; d=google.com; s=arc-20160816; b=X/ilSArQ0FjShAOc3JpDPtY0SHFxKUplywQJvTFLQZMTO31zkZjOwJH+78D6WXuJI6 iNK1fVx6Zp3ox+QDEvId0Yaas+k6cFKprvOuGMbBg4GJq2ceJJmSrEptavB5nMTVfKMQ PLF2CR/CxO+a0Yeims9gKNZFPjYBk/Hl1620qrBejuff7Mcz0DsU9ZsdQNZfHunt7Xz3 Ba14RfwALvzrhu8szLbc/JDQE32ypjR5OqXsvHWaNSvtfmcNyi9o1LYanopKaV8+v1Bh da3kvVhtO1a1hvWlD425XclfJ87rjgX8f2+ZUhivbllZAGBiVo6EjGS2/fCFOv/z4jcq Xh0w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=sOjHi6fbrb/N9KAEk4Pgo6DJTHB1KVcnj6Iabe9BJJI=; b=I6m+7Ps899pVdQsQu6t5pE0BUHPr9zPRVdXLKm/fMLrjE1ONlY9Ehztyie6skPNutk MCxtSpa/k6gKHQt/Rz6HN8gEjSHWAsjxIWkRFi0xwebq9ecm2e1c0+NfNCbsDV0Ibyy2 oHi3zKKN/ZA2S4DGyJeL0pTOmjH6p9DoTGyXNF14/pWZ0p2ZzbQrFe8IVqre2fg2tcEg U2vAmu+JwrZxXBMC7huV75D6zBxtPvZZVv1UqcpXE6XnYrNE5M/MnfhskyXJgdjZgXt7 aC2X6t4FuWuWg6TVz/V41kg39tGPrNnT4xYzrD7KNgU08YYzKBniPxDzTLR3h/GKLqkk PYaA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=JUSG11JM; 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:7e1a::608 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-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20608.outbound.protection.outlook.com. [2a01:111:f400:7e1a::608]) by gmr-mx.google.com with ESMTPS id v5si54895wme.4.2022.02.09.22.25.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 22:25:22 -0800 (PST) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1a::608 as permitted sender) client-ip=2a01:111:f400:7e1a::608; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=JUSG11JM; 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:7e1a::608 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=ObiODA87xpH5l7jvV2Ondp2E5BX6d2K9SyNBVtTmtFzeprRmrJOmAXbxNyWa06UzPRL5rme0QaIB+D1jPH5fZiDfNutg4enTo+0A3nEUjTOjSKl4/KWp3cgjIIGIc4RpAhxv1LG3alSqZFtrUOMMAJvfSsIxpIaP3TVduhSt+SpqlsU/seVwQScHRZVKcOQTkMfgj5cqHHX3PP4IBu+Gb0wLomoX908tCFrXnbno2j5DH9mEmKFwDunPbbs5KqDSoOvcgbcuTQqZvBdbxwKAm+7h8M5rSubssQXizOjxO88pyycGJmwhy3gznwdgsbfM3vbIbHrEdRtDSn1uytQBXA== 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=sOjHi6fbrb/N9KAEk4Pgo6DJTHB1KVcnj6Iabe9BJJI=; b=Fl0yKMADXfrQV4SW/O6f+Cf5BK4kH9T0M6NwZj2p+sjIpI97nitjczWRlL5qtYPHNQ4c78QOlGDF1/dtOsSp+1JqkgSslR8XCd4Y9HrVinN4EbKR3EHmHYRkJFDQD5p3MFdctBLMMfMOBWsZapULORZepBC9H5yF1Sd6Eccy9PYkLnQZC3fZZ4xNlqUGlyYP4SaU2lPKVdEZsOmYE1FBXHilrgZlVpShonHBV25Mb6noQyC4oGPE3xkT3f+jZXZomJ4YeSwrGY9dYKk7Cp2R7V+4zo6iCU/3kjDL8rdIBD+INk+uYMc/H0MVfQBcsJ+L4LDgsRrKWgacHCVtOnOT1A== 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=sOjHi6fbrb/N9KAEk4Pgo6DJTHB1KVcnj6Iabe9BJJI=; b=JUSG11JMQ2g1TO6Z9IRPQeHrot+rm0KkgcBA5ME/6MSQm/G07MFC57qFISI2+WqABRoqSvqWnS2QGgZtV2nTlreMdJTOWo5niO8KOniI5dtucdLEdYS4heGzdXvtHmZOUzTMhyjwzA9Huut+1rh2C26Pq8HydkNhZ7ah8FQSZ3n96oGBcIf/RQF81ZkNoSFpQ5f/R2wY4mybneNyp4QR4UjrJUlNhMf5ovn0kdqwdgy1NOgKPgrkBgfw4ZIN6vowjApe8JnV4OhmLZsWp0s0uSTOeTLx9WTUk+PG/bqaOF46UbNKOJlLD2m3a54/b7URr/a6vZ6O+afhv+gJwblN6A== Received: from AS9PR06CA0217.eurprd06.prod.outlook.com (2603:10a6:20b:45e::17) by DU2PR10MB5030.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:2d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Thu, 10 Feb 2022 06:25:22 +0000 Received: from VE1EUR01FT031.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:45e:cafe::6b) by AS9PR06CA0217.outlook.office365.com (2603:10a6:20b:45e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.14 via Frontend Transport; Thu, 10 Feb 2022 06:25:21 +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:21 +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:21 +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:20 +0100 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH 0/6] imagetypes Date: Thu, 10 Feb 2022 07:24:40 +0100 Message-ID: <20220210062446.4145565-1-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 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--11.634300-8.000000 X-TMASE-MatchedRID: Ul2mSy8JTEySZ2E+VTMa2l7eQlWD/EC8yw7VBksEC0BGjDwRSl8gFPWr 7HvOSElabcPp/oilssgWFZo+2Qlj9KxLyZX3xqXZQoW68yqSN0sbAHxxrI5Cd46cpbnLdja9oh/ WV81PtmIS39b8+3nDx3o6TtPuoiTUSYg23IT4aTFC3UkrkIx+4jEsSv7gLW1vsFkCLeeufNt9m5 tDcb5SYS196sn93sBvMWM94lj32bRxgVpGWeWW8fmzFQuYT9Pahi9FMLqxZlTjSNzHLdpc2mAW2 j9VWc0lbH/6fMLo4YMTBrT5FMhW3VMO/QCmUqVQBrSLlIrz0Cm4cFBF9s6L7gi0LLplf+UvmZiw 53dqSN/L8RQlX4LljjB9ccde3hbUrNBB4jXitwZJxuUhgdCPvqm3DSjVF8zzB81Stc0qnIVMkOX 0UoduudIxJyZeMeg8RZgW/AKCeco1gIHPPGxSe78UytcbOwM0q1CLCG+vvBSrm7DrUlmNkIAy6p 60ZV62fJ5/bZ6npdjKayT/BQTiGqM0mg9xJw+l9toLhpq/MZLOJLZSEZtRnPqDm5IK9Wb+vYmnc Mkisgc= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.634300-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: E0200A08E95028AED9ECF2AFDE2D5C673177F0E9D92BCB3A9850EC921A58DE982000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1dd0da7c-5a7e-4f28-9b00-08d9ec5e1d8a X-MS-TrafficTypeDiagnostic: DU2PR10MB5030:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TQ9Wl7xV3/UwCPonYxIaIjrqZ/hzzCM2mhqSqTZm06U11HFFCrmZ2ccIStd5SzhMsEaiOo2Q5pZR82D3IEymIFvBul/zxAC/mYogLTyBMSLzPqZS7/a6vFj+z+JJASBeW0/oBiEcNWU+TGpN9PXzkHKf8P/P6Ve9IeTHnO+ff0nMMoLzZS6rLU/63fJgZZIsQuxdAp5vCUuFu3Bx3Bin6Z3DWKCgp+f04i/cQQjo0BZJ4X3eWKvpKA49l9NAnZSDFcwcOlakJl6dcjOXrWoo2vVPZKql7bD8ASpZKYT3fmVzcJFfZegOZeC14ISYKot6Sc/9DQISexcVzwFrRJuqWaUEVgxPbrI0nWUs+M9uK9WJlVvfa1HXOTBgKXfvvhCCufEVLGHtOjvj858Kt/cDUsC16SVKu2UBG6lcRSeg10EDP4y/jsmGM1vt/qnLnrZkfiCWTxnv9tgSumvJrd58cnLVqzhnKIHp70MJPeoiybR/rQXxZgy7lHkysR7Z1TUMx7xTCbto0LvSi6OjXGO4grPBtN2EKBGv00CPddHVNItuaTdaiSlZXVvqke1OcDN+w2T+2HAWdUNica9F3rfacdsVCt/vzNAVwA3nGFYr1jm86r+F10NiyznDBmzenPw9V0PlHyZjqGzAksvut917cWu/FQ4f+L3nyc5zdIU3NaG7tdCjiGCxcaymh6mFkYZF 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)(46966006)(40470700004)(1076003)(16526019)(8676002)(86362001)(70206006)(4326008)(70586007)(336012)(6666004)(8936002)(5660300002)(36860700001)(508600001)(82310400004)(26005)(186003)(6916009)(36756003)(47076005)(83380400001)(2616005)(82960400001)(40460700003)(356005)(7596003)(107886003)(956004)(7636003)(316002)(44832011)(2906002);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Feb 2022 06:25:21.5870 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1dd0da7c-5a7e-4f28-9b00-08d9ec5e1d8a 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: DU2PR10MB5030 X-TUID: Uu9RT+w39Yuf This series introduces image types and conversions as known from OE. The main motivation is to provide a more flexible way of generating and processing images, without the need to insert custom tasks (e.g., currently we have custom classes adding tasks for things like bz2 or xz compression of images in several downstream layers). These patches have been tested on some of our layers, and also work with some more "challenging" use cases like image-in-image recipes and custom image types brought by layers. It's not perfect (e.g., documentation is still missing). Also I added just the bare minimum of conversions, so there should probably be follow-ups for additional compressions, or things like checksums, which can also be nicely done with this. - p1 prepares by removing image-type-suffix from image build directories, which enables sharing of the completed rootfs across image types - p2 refactors the SDK, and makes it an image feature instead of a separate recipe (has been discussed here a while ago) - p3 does the actual work, but keeps all original files - p4 moves code to different files - p5 adapts meta-isar - p6 removes IMAGE_FSTYPES as a dimension in multiconfig. Now that we can build multiple types from one rootfs, multconfig is just the wrong way of doing this (also been discussed here). Adriaan Schmidt (6): image: remove IMAGE_SUFFIX image: refactor SDK meta: introduce IMAGE_CMD_* imagetypes: restructure files imagetypes: switch meta-isar to the new scheme meta-isar: remove IMAGE_FSTYPES from multiconfig definitions meta-isar/classes/rpi-sdimg.bbclass | 10 +- meta-isar/classes/ubi-ubifs-img.bbclass | 11 +- meta-isar/conf/local.conf.sample | 4 - meta-isar/conf/machine/bananapi.conf | 2 +- meta-isar/conf/machine/container-amd64.conf | 2 +- meta-isar/conf/machine/de0-nano-soc.conf | 2 +- meta-isar/conf/machine/hikey.conf | 2 +- meta-isar/conf/machine/imx6-sabrelite.conf | 3 +- meta-isar/conf/machine/nanopi-neo.conf | 2 +- meta-isar/conf/machine/phyboard-mira.conf | 3 +- meta-isar/conf/machine/qemuamd64.conf | 2 +- meta-isar/conf/machine/qemuarm.conf | 2 +- meta-isar/conf/machine/qemuarm64.conf | 2 +- meta-isar/conf/machine/qemui386.conf | 2 +- meta-isar/conf/machine/qemumipsel.conf | 2 +- meta-isar/conf/machine/qemuriscv64.conf | 2 +- meta-isar/conf/machine/rpi-common.conf | 1 + meta-isar/conf/machine/rpi.conf | 1 + meta-isar/conf/machine/sifive-fu540.conf | 2 +- meta-isar/conf/machine/stm32mp15x.conf | 2 +- meta-isar/conf/machine/virtualbox.conf | 2 +- meta-isar/conf/machine/vmware.conf | 2 +- .../qemuamd64-bullseye-cpiogz.conf | 7 - .../multiconfig/qemuamd64-bullseye-tgz.conf | 7 - .../conf/multiconfig/qemuamd64-bullseye.conf | 2 + .../multiconfig/qemuamd64-buster-cpiogz.conf | 9 - .../multiconfig/qemuamd64-buster-tgz.conf | 9 - .../conf/multiconfig/qemuamd64-buster.conf | 2 +- .../recipes-core/images/isar-image-ubi.bb | 4 +- meta/classes/container-img.bbclass | 17 -- meta/classes/cpiogz-img.bbclass | 22 -- meta/classes/ext4-img.bbclass | 24 --- meta/classes/fit-img.bbclass | 29 --- .../classes/image-container-extension.bbclass | 83 ------- meta/classes/image-sdk-extension.bbclass | 87 -------- meta/classes/image.bbclass | 202 ++++++++++++++++-- meta/classes/imagetypes.bbclass | 89 ++++++++ meta/classes/imagetypes_container.bbclass | 95 ++++++++ .../{vm-img.bbclass => imagetypes_vm.bbclass} | 24 +-- ...wic-img.bbclass => imagetypes_wic.bbclass} | 45 ++-- meta/classes/rootfs.bbclass | 1 + meta/classes/sdk.bbclass | 137 ++++++++++++ meta/classes/targz-img.bbclass | 15 -- meta/classes/ubi-img.bbclass | 32 --- meta/classes/ubifs-img.bbclass | 32 --- .../{sdkchroot => sdk-files}/files/README.sdk | 0 .../files/configscript.sh | 0 .../files/gcc-sysroot-wrapper.sh | 0 .../files/relocate-sdk.sh | 0 meta/recipes-devtools/sdk-files/sdk-files.bb | 26 +++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 78 ------- testsuite/build_test/build_test.py | 2 - 52 files changed, 599 insertions(+), 544 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 delete mode 100644 meta/classes/container-img.bbclass delete mode 100644 meta/classes/cpiogz-img.bbclass delete mode 100644 meta/classes/ext4-img.bbclass delete mode 100644 meta/classes/fit-img.bbclass delete mode 100644 meta/classes/image-container-extension.bbclass delete mode 100644 meta/classes/image-sdk-extension.bbclass create mode 100644 meta/classes/imagetypes.bbclass create mode 100644 meta/classes/imagetypes_container.bbclass rename meta/classes/{vm-img.bbclass => imagetypes_vm.bbclass} (89%) rename meta/classes/{wic-img.bbclass => imagetypes_wic.bbclass} (86%) create mode 100644 meta/classes/sdk.bbclass delete mode 100644 meta/classes/targz-img.bbclass delete mode 100644 meta/classes/ubi-img.bbclass delete mode 100644 meta/classes/ubifs-img.bbclass rename meta/recipes-devtools/{sdkchroot => sdk-files}/files/README.sdk (100%) rename meta/recipes-devtools/{sdkchroot => sdk-files}/files/configscript.sh (100%) rename meta/recipes-devtools/{sdkchroot => sdk-files}/files/gcc-sysroot-wrapper.sh (100%) rename meta/recipes-devtools/{sdkchroot => sdk-files}/files/relocate-sdk.sh (100%) create mode 100644 meta/recipes-devtools/sdk-files/sdk-files.bb delete mode 100644 meta/recipes-devtools/sdkchroot/sdkchroot.bb -- 2.30.2