From patchwork Tue Apr 5 05:24:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1656 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Tue, 05 Apr 2022 15:25:06 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f183.google.com (mail-lj1-f183.google.com [209.85.208.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 235DOwB5023876 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 5 Apr 2022 15:24:58 +0200 Received: by mail-lj1-f183.google.com with SMTP id c12-20020a2ebf0c000000b0024af8f2794bsf3851021ljr.12 for ; Tue, 05 Apr 2022 06:24:58 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1649165092; cv=pass; d=google.com; s=arc-20160816; b=emucn9+A3Vpv8FJZ4tKLeEKUZbJekf2LzhwLaW5rc4MzLdj0QqqbfDARcIMKKlBwb0 K43iNqC7RyMk7a5mHbjb/bLBfTBVcc3JrNJMJqeX/UEKSWNGWOqO2g6p9frK+3bMiWbR JqwGJV1hPSP/oeD1jAOZAnU3aLiwLx+nBWme7uAmI1+7RbG2H/rCuIpHhqpDjZj16Ewx mOGl7/O9CoALJXRzeaZUdOuwykxSlyoxHuCpAUE74OXCVvNTQnJeX2GadXwJYLMtGXku J0WDcoIqekQUj8l7RbJR7pylg5IeTCvY3d6vN7ov7buRCWBD4FlFZI7ZY41+aC5ifMvB OIcQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=e7mIMgxeBv6hUSpF6fY3K/QDNg3klRkgBvA63/p0bxI=; b=ATKtFZJutSaUCoVkK0Ug2K7zMxyrU083auV2Il1y+/xrGdPXSLIoqfd7mTJs+DH+XJ Iyike7YUKtXcyWG3hMi2HVL2SFzhcr7/PGGQ6D4uVDaAWJTGSBAvs9EmFK8CPTUrAful Yf0uloJAp4JrGDHEFaTiwuBsiLMdhp5k+HLSL1k2ZoNtLBycIGNBPrKF64Axs1FW4Mg0 31gv/tBsqapSaovd7gezTPahJ2kgZDS+st/f0BUGHyJCBF0piovn00b1JjzI3xvJWn5/ 4cngALQp0PfBCav6isQrKdIZ2x+A4N2G43AVERyZzsM3woJwNGXmEXAhIi9tFQMllk55 IyKQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YHTabNh8; 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:7e1b::62c as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=e7mIMgxeBv6hUSpF6fY3K/QDNg3klRkgBvA63/p0bxI=; b=BZaDg6wGxK4Mf+EXxAh1pOq5ikVbIuofG+zoGKzNaSdqLpa7/1nyIENAxSdiYLbFP0 uBCW728BASN08uvDJ8AGk/cqn0sJvO3OA9Os9mye2FALDgA5ysOlq6/NGZ8lKGvsG7aD uzTyNHztnhsQvdI10IW+Doj7HIxIcOZPM9QIAs7vdGn4l4GE1NeXomOTFR5wdOWyY/gw IZ4bdyCsT+3ntA3Qsj/tAIhueFfc+K3vbyp0Zargg+rTM2fykQZZS0m4VeuY/9YSd0fh VuXRgM6TBrlM3cv++JQPUKQmpwvpFGPeQbNKZw+zT0nxdg2m90KN0CxIu1N/Mh+0R2Bf QuJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=e7mIMgxeBv6hUSpF6fY3K/QDNg3klRkgBvA63/p0bxI=; b=poVUZo0PZpWjVuSoOYfkfhwSCXM95+BSd9dxTz3gIU2tc+pFdRUfgMaNLzrEi8Z2L/ bBzkReTZbEthqXb721OMtHGChX80Nme8li1zO4f04+j14mxHL8izOrSc7JyjJH1vGsvh Jwxso8LqzHdu3aq7WysaD4tpnV0XRLajU33WMXeziyHLrkHZxyIKqsLzbKfayVUWA5Eg rdZt5T5hr6GsTpYeBzn+UXHUzddmjkKFQBsdcOay6vDXQnjxYFO58ejiV+zOUC4fcSOP q1Tl5D/jpJkBddWkoYmmOhZ/yv5lkQsbqXQ/+Q23lI7sdEycAdeyJsJ5q1CXH38+jy84 Bp2w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530Wy6x3V1CrKofXq5unC3CZTT/KF3+uXUfQpjsF0bybV316m2y1 T9Ehu+Mc+uqfQfgnR7DynJc= X-Google-Smtp-Source: ABdhPJxZBf8gw0r3sltiO/vhq+v5Qq1gQsJ+PZv8/0GGVzbtPtlGGuj/pWoPJVGGzkfVlcnBXzDTvg== X-Received: by 2002:a19:ee09:0:b0:44a:37cd:8295 with SMTP id g9-20020a19ee09000000b0044a37cd8295mr2648155lfb.389.1649165092631; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5285:0:b0:44a:94d2:1d8f with SMTP id q5-20020ac25285000000b0044a94d21d8fls544782lfm.0.gmail; Tue, 05 Apr 2022 06:24:51 -0700 (PDT) X-Received: by 2002:ac2:4e0e:0:b0:44a:2607:86db with SMTP id e14-20020ac24e0e000000b0044a260786dbmr2706601lfr.8.1649165091525; Tue, 05 Apr 2022 06:24:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649165091; cv=pass; d=google.com; s=arc-20160816; b=SLaRiRIhKW9D743l10rM6DatpBEz534qMfOmLcvzdPSA4nxcGvBKJ7X4vm6oooS/wV gl5BNewgz7qxhqmz/l6b6+lQpWIHvzHARWVg9uuSSmAJp0+EFkwmFhAvVbu9UsumYai/ Nr+TA5hdpMo+2Afg7GJg4Lh6g7egrDkRuE6kGse7YE9eB5GRbPeJReJW1G9WpsENHbQH bjqR300MegbIMCXo7MhHTtVdmGnQiPp+D2kW32XUV7Cwjsk/kq/ZKig7kJf2c4kOqQ+j 7d75V7GFuivd5X2vRBS9nNnjE4lY8xfTnZldRFj+HCs71RdCebm9UqgDHo/DOpmDETDo Nksg== 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=N0+5t2Pasy8Vr7BlaKAlo2M6d0tSQkvQOTGYIbmnNSY=; b=cb6JarJcdTG+azcqFf2Tu4nGx+G4VuSK5ilxJhIxKuQRYqUkVwgeD7cSKAwU5Bc+jm HML2G1RZ1d4/P+AQpOSwJzs7WD5HIpAj8Z/HHmaIfiZhyPno2kvLzi848PiUMXHv/GYJ d5l1F56k3f9gPcSD3Im/kD2CAIK7FNKya3bP5ttloCbp5j6BcdAPcf/Wakjq7jRYkULi 5u+HyvBWKDaAIK/NmCjxpFeLDfHj3RQYP+0j6ANnPY3+s7lpOc6JOkXlQmxODtV40vPS /E3KlU8BWytKaZx3Ocsik+plaj8SCBfUq+iE+QBP7pv5cYzu3c4JMx2+MBaDaSJ4BDr6 VkQA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YHTabNh8; 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:7e1b::62c as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2062c.outbound.protection.outlook.com. [2a01:111:f400:7e1b::62c]) by gmr-mx.google.com with ESMTPS id c3-20020a2ea783000000b0024af7c9603fsi689188ljf.4.2022.04.05.06.24.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:24:51 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1b::62c as permitted sender) client-ip=2a01:111:f400:7e1b::62c; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ucrs6DbY0VOuJzhpm/voKP+gFhZlNCZJSpntkGEPUU8kX5bCA1ZhzpD2o7zvsAJF/K4cBznnQmG+YhQLoHxK9nKrvqlGYogKlBAwcTwCTY6CmO+Iyx1BiHJb77bAm65gpa7M5n/gGY+NnMpSKz7CRsKBvzXr2R8nliPCwTd4z6kjmqIauZa78PquXh1XHVs0xUDCpJTLBDh1cWT5f4oFZO23WK6NDxbpYZS6a+eshQw+Qlu05R4N7eRQpja7CSxC92gu2gNi9WQNkJLSurzYj9eW2I7D5F8iYU/jtnebK4uSF38AQ2bz2ucpLUs9z2RVWYNM/+rWZZP99aaiE06KgA== 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=N0+5t2Pasy8Vr7BlaKAlo2M6d0tSQkvQOTGYIbmnNSY=; b=ebnIQWav1SEAcRaj4I+gxTABQb3IWLQ7ixjcck2Cl9wbkgMv9eShyLKM2Xt3TG0er8Irr259i1WPX4goMpx6+/jwvLsxHUN++2QG+K/mdinm/90/3Grh313piQTkcfhGK6ZO2py6Zc0QTgdq0td9N++c12BLe3fc6ehNhLaJ1gm+0aFUULmDvL2QUTafHk2ZEVkaTv4UUxa5ruUCB9paZJ1P/oIQut5Z6/IY19Kr7I/sOhuBWplppxgRFzwZqe8RQUwI7bcWlym0D3VhLNbZQWUR0IPUBOTrpvLkDNl8ISoUKX5EntXcZptub0nDPBbiJWmaH3axiSVFM3Tmtmvb6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) 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 Received: from SV0P279CA0052.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::21) by PRAPR10MB5348.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:29b::11) 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:50 +0000 Received: from HE1EUR01FT098.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::2e) 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.5123.13 via Frontend Transport; Tue, 5 Apr 2022 13:24:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) 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.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by HE1EUR01FT098.mail.protection.outlook.com (10.152.1.36) 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:49 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) 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:47 +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:47 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v2 4/7] imagetypes: restructure files Date: Tue, 5 Apr 2022 15:24:28 +0200 Message-ID: <20220405132431.2895832-5-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220405132431.2895832-1-adriaan.schmidt@siemens.com> References: <20220405132431.2895832-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 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--9.243800-8.000000 X-TMASE-MatchedRID: glDbLq0IecnZY+nnK3IwnMGnCHwCMuTJElH6l1EPRNgItCy6ZX/lLxqD rPipLA7BoxCLfriDzziVIbfpsq9FzF0qMWNOsGgAG6Aor8mgxBIDI91I0N0Y7w97mDMXdNW3ELb qrOgWzyev/7fHaEp6ExqGc7het5hmUtTgmoNQjI1r7b8CsPPtQe+90yVxudOIEVuC0eNRYvKW31 x27U9QYi99T+uJIleR5wnn9PXAc/dMqWhw3u66AuHPYUUXef6kyu0fpXITlDQTwfDtZ0TwrOC1p 3r9o3NF33Nl3elSfsqygaZY7yrHzn0bwqPJDrnjcVA5tVNQEnRNWtycvYsXAPSG/+sPtZVkRiPT MMc/MmncbHvEdOZOM0GzU7CKX1sdZfimYRvSI6PRV8kT55Za7WFqPXSLpNdALfggThkKF7ZuJXM xOF5JsA75RQuQJ3oKngIgpj8eDcAZ1CdBJOsoY8RB0bsfrpPIXzYxeQR1Dvv6utpZDrpBrBpEyp 4lILEsPS04hDp6EO82BFbSLrsGh/3IFS26TlDt X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.243800-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 038DA878CD099689F2C8ED7614405D85091A5D0D9B13AA31A5A7D470D8757E452000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5365708f-4ce1-4951-84e0-08da1707a938 X-MS-TrafficTypeDiagnostic: PRAPR10MB5348: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: imkOHlLrB0tQnQoDIyFxHLR+EsdzBXTmuMRdj7/HbVRnfwRDF3DgYhwG9xXBqMxRkpwxjfyXLFD5DRhv4HL/UWt+kGKjShZ3UUDjEz87mWa2EMSL+fVyjVSV540FdpIW1pQ324FbKsDfePRjfo/A1zFrmSiuvbrilpkR9Ei9QGftu3lTDWZbKXCDuA0B7E9K+VUmNWXQm7gmq0oLv3ON42ATln10oVV+oIDtVbrMZtPxD1/0MwuJrkTvp4ZPzlnkdtXOrLE44FwfiF30wTBbBXCiaRWgFRomFJKUZZQ206KnlTaU0ekSZi5H971xu4foTVWdrrhG6GdUMXFAP7BQDwsxBRtX/mtIuwtGLnqud1RaeoutTjTn2fBm9GA+F9OaCDwe7QZhvv8+JeBi0PiYP/xJGy2eH1BeiXGs7k8GPeOsR7mQCCs2etFI3j5Sa4+TSMhcx3LC0wVZHeXJaMS5vti1u2Dh5COLWgD/GdPlL6NiFwnMvMLEaG7v/LI2T9oSRrlF5PrpjuwHbRsbjJmUmxFvV8/kYFoy/00KUC/eigZ9gphTBx/Jg7ipFEI+WSjXWGxpeg+3Yrcjm8dH9wmIw1rVki5OUcRJVS6dCxr1CDoe+9IMhTxQFVuy+LcBKFcmesJz+7JQPP5jjFR7Ahw+7nemUF2l4NuvmRIpcm8N/NQnJdhbRVx3+SAit8KnQyPyMJXCWCGERGTxC0bnbEx8VXeVapAQ11i1P4IQupGJ2Mv2n15l5z0vBJDJukVjS2N9nO2+iWUWim9otxJt3qdbjAJppNZWf0+XDLMPW9GN5s1GaLEagS3TnWzbK65TV76F X-Forefront-Antispam-Report: CIP:194.138.21.72; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(82960400001)(8936002)(356005)(5660300002)(44832011)(36860700001)(508600001)(30864003)(186003)(86362001)(83380400001)(956004)(47076005)(81166007)(82310400005)(26005)(6666004)(2616005)(6916009)(316002)(2906002)(107886003)(36756003)(70206006)(336012)(70586007)(40460700003)(966005)(4326008)(8676002)(16526019)(1076003)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:49.6751 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5365708f-4ce1-4951-84e0-08da1707a938 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.72]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT098.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAPR10MB5348 X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YHTabNh8; 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:7e1b::62c as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX Instead of per-type classes *-img.bbclass, we move to - imagetypes.bbclass for the "simple" types and the conversions - dedicated files for the more complex types: - imagetypes_wic.bbclass - imagetypes_vm.bbclass - imagetypes_contaier.bbclass Signed-off-by: Adriaan Schmidt --- meta/classes/cpiogz-img.bbclass | 14 --- meta/classes/ext4-img.bbclass | 15 --- meta/classes/fit-img.bbclass | 22 ----- meta/classes/image.bbclass | 50 +++++----- meta/classes/imagetypes.bbclass | 91 +++++++++++++++++++ ...g.bbclass => imagetypes_container.bbclass} | 0 .../{vm-img.bbclass => imagetypes_vm.bbclass} | 0 ...wic-img.bbclass => imagetypes_wic.bbclass} | 0 meta/classes/targz-img.bbclass | 8 -- meta/classes/ubi-img.bbclass | 20 ---- meta/classes/ubifs-img.bbclass | 21 ----- 11 files changed, 112 insertions(+), 129 deletions(-) delete mode 100644 meta/classes/cpiogz-img.bbclass delete mode 100644 meta/classes/ext4-img.bbclass delete mode 100644 meta/classes/fit-img.bbclass create mode 100644 meta/classes/imagetypes.bbclass rename meta/classes/{container-img.bbclass => imagetypes_container.bbclass} (100%) rename meta/classes/{vm-img.bbclass => imagetypes_vm.bbclass} (100%) rename meta/classes/{wic-img.bbclass => imagetypes_wic.bbclass} (100%) delete mode 100644 meta/classes/targz-img.bbclass delete mode 100644 meta/classes/ubi-img.bbclass delete mode 100644 meta/classes/ubifs-img.bbclass diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass deleted file mode 100644 index f4c33bd9..00000000 --- a/meta/classes/cpiogz-img.bbclass +++ /dev/null @@ -1,14 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2020 Siemens AG -# -# SPDX-License-Identifier: MIT - -IMAGER_INSTALL_cpio += "cpio" -CPIO_IMAGE_FORMAT ?= "newc" - -IMAGE_CMD_cpio() { - ${SUDO_CHROOT} \ - sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ - /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o > \ - ${IMAGE_FILE_CHROOT}" -} diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass deleted file mode 100644 index 73d1bb57..00000000 --- a/meta/classes/ext4-img.bbclass +++ /dev/null @@ -1,15 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH - -IMAGER_INSTALL_ext4 += "e2fsprogs" - -MKE2FS_ARGS ?= "-t ext4" - -# Generate ext4 filesystem image -IMAGE_CMD_ext4() { - truncate -s ${ROOTFS_SIZE}K '${IMAGE_FILE_HOST}' - - ${SUDO_CHROOT} /sbin/mke2fs ${MKE2FS_ARGS} \ - -F -d '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' -} -#IMAGE_CMD_ext4[vardepsexclude] = "ROOTFS_SIZE ROOTFS_EXTRA" diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass deleted file mode 100644 index ef65af88..00000000 --- a/meta/classes/fit-img.bbclass +++ /dev/null @@ -1,22 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -MKIMAGE_ARGS ??= "" - -FIT_IMAGE_SOURCE ??= "fitimage.its" - -IMAGER_INSTALL_fit += "u-boot-tools device-tree-compiler" - -# Generate fit image -IMAGE_CMD_fit() { - if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then - die "FIT_IMAGE_SOURCE does not contain fitimage source file" - fi - - # Create fit image using buildchroot tools - ${SUDO_CHROOT} /usr/bin/mkimage ${MKIMAGE_ARGS} \ - -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${IMAGE_FILE_CHROOT}' -} -IMAGE_CMD_fit[depends] = "${PN}:do_transform_template" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 4413a7d6..dfe7bfa9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -11,7 +11,6 @@ SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH} IMAGE_INSTALL ?= "" IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4"}" -IMAGE_CONVERSIONS = "gz xz" IMAGE_ROOTFS ?= "${WORKDIR}/rootfs" KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}" @@ -85,6 +84,26 @@ inherit image-postproc-extension inherit image-locales-extension inherit image-account-extension +# Extra space for rootfs in MB +ROOTFS_EXTRA ?= "64" + +def get_rootfs_size(d): + import subprocess + rootfs_extra = int(d.getVar("ROOTFS_EXTRA", True)) + + output = subprocess.check_output( + ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS", True)] + ) + base_size = int(output.split()[0]) + + return base_size + rootfs_extra * 1024 + +python set_image_size () { + rootfs_size = get_rootfs_size(d) + d.setVar('ROOTFS_SIZE', str(rootfs_size)) + d.setVarFlag('ROOTFS_SIZE', 'export', '1') +} + def get_base_type(t, d): bt = t for c in d.getVar('IMAGE_CONVERSIONS').split(): @@ -110,18 +129,10 @@ python() { # image types IMAGE_CLASSES ??= "" -IMGCLASSES = "container-img cpiogz-img ext4-img fit-img targz-img ubi-img ubifs-img vm-img wic-img" +IMGCLASSES = "imagetypes imagetypes_wic imagetypes_vm imagetypes_container" IMGCLASSES += "${IMAGE_CLASSES}" inherit ${IMGCLASSES} -# image conversions -CONVERSION_CMD_gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'" -CONVERSION_DEPS_gz = "gzip" - -XZ_OPTIONS ?= "" -CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'cat ${IMAGE_FILE_CHROOT} | xz ${XZ_OPTIONS} > ${IMAGE_FILE_CHROOT}.xz'" -CONVERSION_DEPS_xz = "xz-utils" - # hook up IMAGE_CMD_* python() { image_types = (d.getVar('IMAGE_FSTYPES') or '').split() @@ -262,19 +273,6 @@ python() { d.appendVar('IMAGER_BUILD_DEPS', ' ' + ' '.join(sorted(imager_build_deps))) } -# Extra space for rootfs in MB -ROOTFS_EXTRA ?= "64" - -def get_rootfs_size(d): - import subprocess - rootfs_extra = int(d.getVar("ROOTFS_EXTRA", True)) - - output = subprocess.check_output( - ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS", True)] - ) - base_size = int(output.split()[0]) - - return base_size + rootfs_extra * 1024 # here we call a command that should describe your whole build system, # this could be "git describe" or something similar. @@ -293,12 +291,6 @@ get_build_id() { fi } -python set_image_size () { - rootfs_size = get_rootfs_size(d) - d.setVar('ROOTFS_SIZE', str(rootfs_size)) - d.setVarFlag('ROOTFS_SIZE', 'export', '1') -} - ROOTFS_CONFIGURE_COMMAND += "image_configure_fstab" image_configure_fstab[weight] = "2" image_configure_fstab() { diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass new file mode 100644 index 00000000..a31a1989 --- /dev/null +++ b/meta/classes/imagetypes.bbclass @@ -0,0 +1,91 @@ +# This software is a part of ISAR. +# Copyright (C) 2021 Siemens AG +# +# SPDX-License-Identifier: MIT + +#image type: tar +IMAGER_INSTALL_tar = "tar" +TAR_OPTIIONS ?= "" + +IMAGE_CMD_tar() { + ${SUDO_CHROOT} tar ${TAR_OPTIONS} -cvzf \ + ${IMAGE_FILE_CHROOT} --one-file-system -C ${PP_ROOTFS} . +} + +# image type: ext4 +IMAGER_INSTALL_ext4 += "e2fsprogs" +MKE2FS_ARGS ?= "-t ext4" + +IMAGE_CMD_ext4() { + truncate -s ${ROOTFS_SIZE}K '${IMAGE_FILE_HOST}' + + ${SUDO_CHROOT} /sbin/mke2fs ${MKE2FS_ARGS} \ + -F -d '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' +} + +# image type: cpio +IMAGER_INSTALL_cpio += "cpio" +CPIO_IMAGE_FORMAT ?= "newc" + +IMAGE_CMD_cpio() { + ${SUDO_CHROOT} \ + sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ + /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o > \ + ${IMAGE_FILE_CHROOT}" +} + +# image type: fit +MKIMAGE_ARGS ??= "" +FIT_IMAGE_SOURCE ??= "fitimage.its" +IMAGER_INSTALL_fit += "u-boot-tools device-tree-compiler" + +IMAGE_CMD_fit() { + if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then + die "FIT_IMAGE_SOURCE does not contain fitimage source file" + fi + + ${SUDO_CHROOT} /usr/bin/mkimage ${MKIMAGE_ARGS} \ + -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${IMAGE_FILE_CHROOT}' +} +IMAGE_CMD_fit[depends] = "${PN}:do_transform_template" + +# image type: ubifs +IMAGER_INSTALL_ubifs += "mtd-utils" +IMAGE_CMD_REQUIRED_ARGS_ubifs = "MKUBIFS_ARGS" + +# glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 +# should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 +python() { + if 'ubifs' in (d.getVar('IMAGE_BASETYPES') or '').split(): + d.setVar('ISAR_CROSS_COMPILE_armhf', '1') +} + +IMAGE_CMD_ubifs() { + ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ + -r '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' +} + +# image type: ubi +IMAGER_INSTALL_ubi += "mtd-utils" +IMAGE_CMD_REQUIRED_ARGS_ubi = "UBINIZE_ARGS" +UBINIZE_CFG ??= "ubinize.cfg" + +IMAGE_CMD_ubi() { + if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then + die "UBINIZE_CFG does not contain ubinize config file." + fi + + ${SUDO_CHROOT} /usr/sbin/ubinize ${UBINIZE_ARGS} \ + -o '${IMAGE_FILE_CHROOT}' '${PP_WORK}/${UBINIZE_CFG}' +} +IMAGE_CMD_ubi[depends] = "${PN}:do_transform_template" + +# image conversions +IMAGE_CONVERSIONS = "gz xz" + +CONVERSION_CMD_gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'" +CONVERSION_DEPS_gz = "gzip" + +XZ_OPTIONS ?= "" +CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'cat ${IMAGE_FILE_CHROOT} | xz ${XZ_OPTIONS} > ${IMAGE_FILE_CHROOT}.xz'" +CONVERSION_DEPS_xz = "xz-utils" diff --git a/meta/classes/container-img.bbclass b/meta/classes/imagetypes_container.bbclass similarity index 100% rename from meta/classes/container-img.bbclass rename to meta/classes/imagetypes_container.bbclass diff --git a/meta/classes/vm-img.bbclass b/meta/classes/imagetypes_vm.bbclass similarity index 100% rename from meta/classes/vm-img.bbclass rename to meta/classes/imagetypes_vm.bbclass diff --git a/meta/classes/wic-img.bbclass b/meta/classes/imagetypes_wic.bbclass similarity index 100% rename from meta/classes/wic-img.bbclass rename to meta/classes/imagetypes_wic.bbclass diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass deleted file mode 100644 index 74d34e29..00000000 --- a/meta/classes/targz-img.bbclass +++ /dev/null @@ -1,8 +0,0 @@ -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 -# -# SPDX-License-Identifier: MIT - -IMAGE_CMD_tar() { - sudo tar -cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz --one-file-system -C ${IMAGE_ROOTFS} . -} diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass deleted file mode 100644 index 92acb6f8..00000000 --- a/meta/classes/ubi-img.bbclass +++ /dev/null @@ -1,20 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -UBINIZE_CFG ??= "ubinize.cfg" - -IMAGER_INSTALL_ubi += "mtd-utils" - -# Generate ubi filesystem image -IMAGE_CMD_ubi() { - if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then - die "UBINIZE_CFG does not contain ubinize config file." - fi - - ${SUDO_CHROOT} /usr/sbin/ubinize ${UBINIZE_ARGS} \ - -o '${IMAGE_FILE_CHROOT}' '${PP_WORK}/${UBINIZE_CFG}' -} -IMAGE_CMD_ubi[depends] = "${PN}:do_transform_template" -IMAGE_CMD_REQUIRED_ARGS_ubi = "UBINIZE_ARGS" diff --git a/meta/classes/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass deleted file mode 100644 index 60c3bf14..00000000 --- a/meta/classes/ubifs-img.bbclass +++ /dev/null @@ -1,21 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -IMAGER_INSTALL_ubifs += "mtd-utils" - -# glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 -# should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 -python() { - if 'ubifs' in (d.getVar('IMAGE_BASETYPES') or '').split(): - d.setVar('ISAR_CROSS_COMPILE_armhf', '1') -} - -# Generate ubifs filesystem image -IMAGE_CMD_ubifs() { - # Create ubifs image using buildchroot tools - ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ - -r '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' -} -IMAGE_CMD_REQUIRED_ARGS_ubifs = "MKUBIFS_ARGS"