From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7062963440528130048 X-Received: by 2002:a05:600c:3d12:b0:38c:a561:f622 with SMTP id bh18-20020a05600c3d1200b0038ca561f622mr3079000wmb.139.1649165089640; Tue, 05 Apr 2022 06:24:49 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:15ce:b0:1f1:dc97:d9c4 with SMTP id y14-20020a05600015ce00b001f1dc97d9c4ls4406309wry.3.gmail; Tue, 05 Apr 2022 06:24:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytNb728fc9IZ/tAMcTr/7blZMRqUocb1OZjneMLwVxZSv8sB//rtwwDaiZ2aupt12xnKRV X-Received: by 2002:a5d:6812:0:b0:203:f854:c380 with SMTP id w18-20020a5d6812000000b00203f854c380mr2726560wru.235.1649165088746; Tue, 05 Apr 2022 06:24:48 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649165088; cv=pass; d=google.com; s=arc-20160816; b=UbyJ9fiS/oNsfNcpkVVMGCU4Cg+I0xcGFZuGkdAumu5cUJyUpuwTT+w7tLyTYhnciH D5i6XmvwJcJok/cs8IhG2PaPDpJguak0jGMrYkW5AGxMoG4NGhzHJktyaMXu/B8VW3DP kVRqBB8wtXHgfeObBxTD4mS7/ZEhfZnQA/gR3/fIwsHkznoaipAzPFvh9OqneXyph49h 9YDD4Iw+vSzKoEEgJkK2SOn8Zzabs8z13h4IKClVzpQlmf6Cgrb7Zj+ihto+UWoEJo/x O4lvQcb5O6yjcJ24qXd3U+CszW3kCE54U/w9TP6B2f/yCOMRwemWjey6AYsbx7gTVRCf FT3w== 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=tojhdThj2H1chYE6dtJ/B9vCF7T4fPfyOf6FvlQIPgY=; b=bhKWJHUrPHcKRx9Esfig8v4VW5scEPQXH8iVlTErZ66u8n6zZcuQigw4PisnDt2qT5 VGgSWBh8WIsUPxkDE/kO045hl5V5oLJKHWwvoof/wQ/N6UpNSH0+E82KTtXs5Yt4lVQ7 qPjB0WZ6P9Tyd0NvAav6T0kn3SdalKbYSAHFMrVyxAJKiN/QpvrdIxdm4zW0KfMlMLZG VXYV6cQq5uDNrG1Z+zjfxAkFlP6el7apyxW+gNtYRtLpA9FDjVraQHWyorn+Gy2iiUp3 QcwPY/YSk9PAzZEy3gIbKBaJ24/YWbF3rROoTscxGTLWhnk3IUi7nXhxC0ssRmwaXnft /+/A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=g8RPAm9d; 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:fe0c::60d 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-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on060d.outbound.protection.outlook.com. [2a01:111:f400:fe0c::60d]) by gmr-mx.google.com with ESMTPS id h15-20020a7bc92f000000b0038e564ac2c9si176388wml.2.2022.04.05.06.24.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:24:48 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0c::60d as permitted sender) client-ip=2a01:111:f400:fe0c::60d; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=g8RPAm9d; 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:fe0c::60d 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=Pt9XR/ynRLtNXmRpgvy0vTEx1lFGXMVGf+4wtKeWZFiGB9Y6xN5eNkhNqFIRxFK9vzDnxXiJH0WjeqOvlwzjt2xAWBd4uh6iG0GMA+f0he2zVAEnWB3SHXJmMByZCZdHouVt1OzDNnpLIsCU9iSUxwm5wHpdMu1H9ZdHqhO4P2hZv9uo2bPCosyBny/KLKoEYzf5FCFthnhup/whD/9wA3T6ouiR20kIuaOe801t97QcHwsv0oZ5KPSoY5Yy76+ESuI7WOapXWrJ/VsVX0LprWsUIPKiGj+AFvXFCuFl+IRYLzsmpURPio3wMslsodNChO9z1lpuzLwG3riCnugU2Q== 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=tojhdThj2H1chYE6dtJ/B9vCF7T4fPfyOf6FvlQIPgY=; b=l4kyv5StP87jhh4uYRRKSeuPo1F3aus00igrJd5J+BWYczpp21QwiNsK3i+1uWERIkV8Rp2rpqmAek81fLK6PVF2iP7zXKEFHHg69Gr1ZGlGATJUYAdE5RlJdGx5/2Sp1v/jVlg+JiBGlyo4BrGfE2NA3DJxn25Xj7prHoyermjt277C6+1cFHnSkg+iLCriHCvpdg0QVDLwQtI11Gonzfn+LT46UAcCRrI5ohiwfrWjXF4TiwKbtX7+CHIvLNeCR2PFSmps3Lod4aRr3oBl6SD9ueF0kuHJLU7gVahMMdm2gfe1gJCLtP4WbmGXt/T006XtdqhKGS8XB5tMXiN/8w== 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=tojhdThj2H1chYE6dtJ/B9vCF7T4fPfyOf6FvlQIPgY=; b=g8RPAm9d2c+N7aPCkczThRJosjXNN7Mginl4ThGeJd7gcsvC/qRXK92hh6EPO8f4s1Dint69HEvqqYcwcap6GytVL8ON7CiZnxGq5hOoMpCFNlK5JAqA7CHAxrTtpR9rCcASV94IXM0nhiO2R3k11WnJ/obD4YRcyfzyPHu68PFskmojEYScZ5r8N/FFa6z02wJ8dlxBhw6I3HpgcuKSc2VTolUfz6kdsxu895HM1CaCyaf0qP1DfN3dkvAt/JkGebD9vWhJx/3aKyVHKTSeHfFRUbgne+SSx8SAbtt95EXuHCOGQ4O79M6TuIiRx4xceNIaeDoOT1gmVnTvjhzdzA== Received: from AM6P194CA0083.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::24) by PAXPR10MB4977.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:204::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:47 +0000 Received: from VE1EUR01FT101.eop-EUR01.prod.protection.outlook.com (2603:10a6:209:8f:cafe::e0) by AM6P194CA0083.outlook.office365.com (2603:10a6:209:8f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31 via Frontend Transport; Tue, 5 Apr 2022 13:24:47 +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 VE1EUR01FT101.mail.protection.outlook.com (10.152.3.40) 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:47 +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; Tue, 5 Apr 2022 15:24:46 +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:46 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v2 0/7] imagetypes Date: Tue, 5 Apr 2022 15:24:24 +0200 Message-ID: <20220405132431.2895832-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: 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--13.302800-8.000000 X-TMASE-MatchedRID: jrysr39+s+eSZ2E+VTMa2l7eQlWD/EC8yw7VBksEC0BGjDwRSl8gFPWr 7HvOSElabcPp/oilssgWFZo+2Qlj9KxLyZX3xqXZQoW68yqSN0sbAHxxrI5Cd46cpbnLdja9oh/ WV81PtmIS39b8+3nDx3o6TtPuoiTUSYg23IT4aTFC3UkrkIx+4oQCVVInz+n83nHtGkYl/VpBml BF/IJ0fEoPLn6eZ90+S5cA1dFoLccAQAmhxpbNK8AO5m6H3puUB6Ac3Y+WnPZl/fN/7Gm4uMnlJ e2gk8vIVU2mTxjpC9OK1hDAKXn3uOUZ4LV9ny+d3GdDPVA0xQeNpmmKKDMxRMEvKlG0CjjIj0jX Y9STMgEtorPLNYrwZEtTGRLzVIs22x5LSESTTh9xZp4o+c4yD/XNEkgZOg/OB/XUnmGGOOoGkQL QM3Cf+lSOymiJfTYXZ68p80S8tYY5raJItbvwpxMX15B+duGlqbcNKNUXzPMHzVK1zSqchUyQ5f RSh2650jEnJl4x6DyVIbfpsq9FzF0qMWNOsGgAG6Aor8mgxBIsm617PZ0pZ+LzNWBegCW2wgn7i DBesS3CttcwYNipX8jHchynrO5bX0J4t87ivTP0YZUvpMi6fnQvkGof67KPCVCuCgrR/18= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--13.302800-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 17D5B97A3BBC9BA8A52BCF93013E909517D3FB475192C8DB7F17E6DE455D48DF2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6b8ab87-ff3c-4d56-a793-08da1707a7cb X-MS-TrafficTypeDiagnostic: PAXPR10MB4977: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: ZYf33T1UwAORWAnvbClF5CgDmSxNzTSxj0f2H+NvGRCJ5OOV+BHXEfQmwYKc9eveQ/maefA0qZGdhy098J2CRzapsXN+X5mQNTkF8pbrtxzFBqRnDK/hqU+rEgyH5Lhq4q+6jyx5xNMdAfk3hMYChRswk2oEyYesypcG0NUozS4vrybsMMj6QBGyIP1rX8UaKS3zfqTds40gCYX1P4hnlZjKc2qN3kiTupZyxFrVQvP6Y0TvIV5CWN1EEeDEJCIop7nbA7NKJYSaIBqeuonAC5UonEZMi0GofEdYPiJgp91jBzYieilaQq4eYHwezOESCAIy/4pjhXdRrDqkU8hNYT8ks9u9e8PHna3MAY/zNKkSZOJ2u6BWTYvz0wceFM1UGJurmntJrnvUju71jIO0iZURwGnqCbWCb+AUm5/0HlNKBRhLs3PC32bsr+9C2ePoCUEIkASA2nbGehFwwAx47Rl9S7aRccFYDn5BEcDO2XQnAxYoDbhWaVtmhMl9e1rdrBAkbmGN7nvcEsE9MSN/qDAEDK16EBX9m75ujwlt81dBkmk0s2JWqJoH+sM9c249Do8SuxLJ5uGjhLGReOLGa66pbN934w/In8ijBe7EPKj79tYnEisAON6g5HJkcFun+QtkkNh/lLenNG+4OgDPOy8jaWO2g6UBJCMNNSAM58HdCakLfM6FvDnCRxsx1F1+eEszuLALZFEPFt2bOgJL6A== 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)(36840700001)(40470700004)(46966006)(16526019)(186003)(956004)(4326008)(336012)(6916009)(86362001)(2616005)(316002)(6666004)(508600001)(2906002)(1076003)(107886003)(26005)(40460700003)(81166007)(82310400005)(70586007)(47076005)(36756003)(356005)(82960400001)(8676002)(36860700001)(8936002)(44832011)(83380400001)(5660300002)(70206006)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:47.3179 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6b8ab87-ff3c-4d56-a793-08da1707a7cb 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: VE1EUR01FT101.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR10MB4977 X-TUID: fdWzqQSXjXLw 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. This only has a bare minimum of conversions (gz, xz), 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). - p7 documents changes since v1: - rebase - fixed naming issue in wic.bmap files - more reasonable default settings for xz - add documentation to user manual Adriaan Schmidt (7): 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 docs: add new imagetypes to user manual doc/user_manual.md | 86 +++++--- meta-isar/classes/rpi-sdimg.bbclass | 2 +- 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 | 2 +- meta-isar/conf/machine/rpi.conf | 2 +- 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 | 91 ++++++++ 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/cibase.py | 4 +- testsuite/citest.py | 2 - 54 files changed, 653 insertions(+), 576 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