From patchwork Thu Apr 14 22:56:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1692 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 15 Apr 2022 08:56:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23F6ujud010368 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Apr 2022 08:56:46 +0200 Received: by mail-wm1-f59.google.com with SMTP id y11-20020a7bc18b000000b0038eac019fc0sf3320995wmi.9 for ; Thu, 14 Apr 2022 23:56:46 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650005800; cv=pass; d=google.com; s=arc-20160816; b=Hsr1MvDjv7iJNHsOmudMsH7kVTSefCHCeJYKWYzPM05U7wrwCm/j4ZI+ziaZ71r+oU lWnpqCg6HYkjn+cs8gSI0qcmU5q/qZDvqWD70muToymA4sJBmwkuOJqzgpUENQPH+36g dv5VPq0wXtE18sJTaEFsuZ+X68rWiZ0eCqVvPGU7QaUUaYh8IDIT304iJeF6vrPhrEdi rvap+Wt0WCApgzWU/UcscqAD7oO+bBOgmK6/WdvWRAngo3jIh229Nnxt/s0Q0DCQgTgI h8nFnVU7KgPjxql2nabfkMa3lSBZtXn2fW3YPcWWQbaDspvIh2vH4kxBcJX73Yw2JL+T IIuQ== 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=sixdbOna2lvypGiwHRGCir0SxFQmGiFyJVE+Cyfe7jM=; b=bardJwq4T13h1qev/GkLUp6zExmdhGDXWKaNs8duNd84nNlzSuMIk12BX+hhHwVokG /+mBovjQeLIOx+KOCfokLiWynArmhoWUtrIIaFv36sNb3Cy+gF3Zamu9j+O83OxNkL2Y nGc5YZEFzxxe14H2bPS2WWAsNt7loVIqn96a1cQPPtMM6jf3OTIp5dE0YQAZPPgCrAUm KCUxJEiSgMsMBqYSz1YuqDsFZ3Sq7u8EcjhUsu9ymy2urhMxOVzuWxYNIMv35KoIprHj MsboMuiYFzi9+2odeiy3bgHQ3XtJRln5ObNxrPQ4zcOy1pCk2yf6yL0W7YcvmqdhLRlY 7rFw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=uNI6t7aR; 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:fe0e::627 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=sixdbOna2lvypGiwHRGCir0SxFQmGiFyJVE+Cyfe7jM=; b=pbiLkjq4yB2HuvVQ76h0xSTfzicmAlxVcEP7YTGrHxYMGqrI0TAgZsuoq+aNjGa7EH sShI22Toh3PdmFFzwlO0UereFOfTG+23xUx9vaOJMGD8I7yjK7k0lcPniOCBPc27B112 pWCdLU5QpymfPYnifDLWGPwLW9nvKKlOyK08E2DhSaedxZ4nfXt/Y1EaauCijmvwa/aC n7HPmYrpOL4qlYaQ4jxy/JuAxmKy3v0B+1xYLvY1+9ZixX44Cf0CbHPykOKjzAuUdUPH 5HUD6ZJkf8Mii+m8srv5LYkxN9aYXsJ+zHUHqCrIJOm0aGoWYfCWGxzloi2NBiJ4L1m3 TzkA== 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=sixdbOna2lvypGiwHRGCir0SxFQmGiFyJVE+Cyfe7jM=; b=NlGZx3B+M+ga+aZ//imvQ8sbywZJc+rWvBtsQLgzZ5N0qPNhAWCIt9Z1VwJndKWbCF dPkqDQHW53wErs8Ff3DUOVZ5KnDfTU8hKYPkIN4t2hwAOlfvy/ul9TSS8nGIsoLpU+ns 8w9J50O/iQPAMkNAC8bqSW0lkPsMsucXQtZJs/1P3qsgaOdK4vRnEaX6hbJUbpGgf2VM GkPdyw2ARIGLszwe+OIiRJkCvKHrIm1wdOtQfQkmja4DXEAaM+ZiS6pL9gcrM4F6wrPb OBzr8jFh3OUS3jpGLkJ6kjN5XcVrAlMQGLPIUND7orNuJANPtR92k1yPPQRCVHywW+K3 oNew== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5315B14WWb6b9a8yP5TktEo8W+//qSiFGL8lodvlPY2RaFcj3vah ADmgzU8s9YAiUPwY4LKNh7w= X-Google-Smtp-Source: ABdhPJyAnxeQ1XgDmk1+knY1IlkMeTAT/rYp3cmGWik5xJDDKvS9R6DJxa/faGABzTd43Z6KHzGbtA== X-Received: by 2002:a05:600c:3505:b0:38c:db5e:a51f with SMTP id h5-20020a05600c350500b0038cdb5ea51fmr2018422wmq.62.1650005800718; Thu, 14 Apr 2022 23:56:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f950:0:b0:205:dbf5:72d8 with SMTP id q16-20020adff950000000b00205dbf572d8ls395632wrr.0.gmail; Thu, 14 Apr 2022 23:56:39 -0700 (PDT) X-Received: by 2002:a05:6000:178f:b0:20a:8009:7cd3 with SMTP id e15-20020a056000178f00b0020a80097cd3mr531280wrg.532.1650005799787; Thu, 14 Apr 2022 23:56:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005799; cv=pass; d=google.com; s=arc-20160816; b=uAQW9gey2oos+imRnIkGjqqBRnBnDHgbv2UCSgV/Ias4TrsXaqkaAem8HqgQ3t6ZPh 0MBFoTNQYdmjsb/sda7+6yksqnHwp3pX51gaAt+O2+d8rZgPdFttt/bb0Jsb3CW2875B lCtkjjOAoc1pVJLDD1UX4Oar95OYQ+H7fmF8bhlYSADTlKpQoU4vFjkas8IH2lTyqNul +jW76ydeSO1jxFQ/Nvz5F5TsWTz5fZuaG7JUMcAAy1KDEeTA3pqPPlEwckz5pAJ195d6 0QGTJiqabGZ6KqCqzd8aweYxMa/mQ4Csyxcf+JvjgCHJZxgiWsJo7XsFk2FvVlR9U9kA 60Sg== 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=m9v3N4LO0+XsFp7uHWGecrfHSgB82yeBSId+69RZA3A=; b=GhwJdIJz7yFf8a0cPjrXUiBoAwdxL/9i1LbZ1IYFYv+WhmlH6wboAqTC685vw9HYZQ LJjHHjs8JKVZxwB4lwZmXe59+FRqnruyUG1swUhqMnNhQ/cCzHqRnEtVip5KE8MetfS1 lBGXSxZcdPEDEigWq2S8tzi7DkkNrIpy64VGoaYLc8WOV8N8wrHrTcihDH2eH6Cn9p3E S0zawInbY0NfSC0Ofax2liWZ1effA1kKdXprSMyfPbJDmS6t45SUFdDyBjASC0OMvYZZ mMdiyMWfVQziv34Whts3fU2EPh+/W6HasWIwqYLFmtqllemxKugyWeFm78G8BMJTPLY/ AsHw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=uNI6t7aR; 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:fe0e::627 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0627.outbound.protection.outlook.com. [2a01:111:f400:fe0e::627]) by gmr-mx.google.com with ESMTPS id t8-20020adfe448000000b00203d9be074dsi31097wrm.0.2022.04.14.23.56.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0e::627 as permitted sender) client-ip=2a01:111:f400:fe0e::627; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dFCzM4GcLQaYSrmakrTjDL0oeItPpkenNnntyVTklqYEB35DySCL8Ac279vJTT1zWDjLnA0daM6iABe9Ak9gVfynzTlU5nc8QlNkvJGhL9HrQ1YlyAuSREoOTGBRXVOnHEqFt/2VWtogzP9cs7XygbusgFxlwZ6EpNuokwVr+FgM0r5+Ff558oT7e2d9rXv9W1X3eVF+d+qhS81sB6K+SKsz/pNrikotgfXuYBiQTuKl39ONjyKzXjE1AiQgOrnQIYElfuMqWkKQvpsemuQ/3sOrXcM8IECyNBmdEI3Z/tMfKd0BZ0VrqFpU/hLGLaapaC84J/j9TSImrGGVr3b+1A== 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=m9v3N4LO0+XsFp7uHWGecrfHSgB82yeBSId+69RZA3A=; b=BF2JjKvERxziT54ZXNLoT+EZHwnwgLFDtUHRCf0mFyiwZepDHTETA/yERKphcA9JfddHb1kjHbE+X2wZqnAuSppiJ8q89uHuBuCunBHJr+sicacyZ35TkKV2oCYbNWmWbLceUQRmqSABQ8691Yr30+MjBNNHNSpQEz8Pe0aXTl6fW988W7A+YE7gUPS9nASjraDwlsdnn9x2BlC/lTwC6HSgdQQTeQqDb9zYHTu8Rw1leEBiezMfoeXcUnTt8YWqAG170cPNmtjRg3rdE+O7F2QHFatcLS3C5I6uPHP5XelYGGu2vXNfxy+/bUpc3NlRb4OfU8GLIiP93qRxgLjKoQ== 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 Received: from SV0P279CA0047.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::16) by DB7PR10MB2252.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:4a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.30; Fri, 15 Apr 2022 06:56:38 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::4f) by SV0P279CA0047.outlook.office365.com (2603:10a6:f10:13::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20 via Frontend Transport; Fri, 15 Apr 2022 06:56:37 +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 HE1EUR01FT069.mail.protection.outlook.com (10.152.1.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:37 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) 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.24; Fri, 15 Apr 2022 08:56:36 +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; Fri, 15 Apr 2022 08:56:36 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 4/7] imagetypes: restructure files Date: Fri, 15 Apr 2022 08:56:14 +0200 Message-ID: <20220415065617.1910954-5-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 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--9.243800-8.000000 X-TMASE-MatchedRID: 7yIlCyfE1+bZY+nnK3IwnMGnCHwCMuTJElH6l1EPRNgItCy6ZX/lLxqD rPipLA7BoxCLfriDzziVIbfpsq9FzF0qMWNOsGgAG6Aor8mgxBIDI91I0N0Y7w97mDMXdNW3ELb qrOgWzyev/7fHaEp6ExqGc7het5hmUtTgmoNQjI1r7b8CsPPtQe+90yVxudOIEVuC0eNRYvKW31 x27U9QYi99T+uJIleR5wnn9PXAc/dMqWhw3u66AuHPYUUXef6kyu0fpXITlDQTwfDtZ0TwrOC1p 3r9o3NF33Nl3elSfsqygaZY7yrHzn0bwqPJDrnjcVA5tVNQEnRNWtycvYsXAPSG/+sPtZVkRiPT MMc/MmncbHvEdOZOM0GzU7CKX1sdZfimYRvSI6PRV8kT55Za7WFqPXSLpNdALfggThkKF7ZuJXM xOF5JsHVwUnE5fcdlo8WMkQWv6iXBcIE78YqRWo6HM5rqDwqtQxitkXat1SEQYPYSM52gtrcxCb xUPwvG2cUapTXbgRa1yHnm6Tw+oQ== 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: EEDCC5CC296AE0E494E1E9CBB2E654F123537E8039C5B12D00DDAB411E0E54592000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4359dae3-ff4e-4253-ccd7-08da1ead1641 X-MS-TrafficTypeDiagnostic: DB7PR10MB2252: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: X82Rma05qadHWMDwBq+7yDKHFj8WUI+FUQ8Fv+0zVXTvC5strxyVd3ibfv7VXhUHMVnMxzD4Z1X9Ly7J5I6XYBRS2G+JxRwjxbaekqQ9VQw0qc5Y0G2fZGav/FmJ71PgK1dH7FkaucNjF+p1vKPqcUqlCQ9DBaHzjmhwqPHm6HHjHQcFFojrOLvW7/AjSQzcHJSQf3HYwLzbDnfwZ2yKQH2rzcn5WGuvCLUzc0TLOeaXT9HBOiJ4DuSjNK8heAn6vNP1LhcxvDknZJaH6ncKvGaf+nZx1ySmjDg1M6Gv6C9pYATU13gAcf0ycoBeapltQm5gusk68YebJqWA0Oiv7Rr9DFxGreHUy4S1KiW70ZzwbbrA3Q30KQz6XRNWfm5J+o6xiqSEH4xrWb4OGo0YSBvgoMo+sxrsZrSiMire1IMAmIglINLFfDZt9jRLs4IS10V83u5cRoOmpJLsnvUNxSh/MOX1kzH2Dg0U1vBwbMHit8qBziW1glJtTK8jqFlBIEdI8dR3EN+YWApRSzCDAMthBzStPM00PWIxbiuVY0wMMLDr04MHCSX0+0PPafARtgP1Ba55AqiawKhP+yonS6cpPs148FeIa8bVG3r+49YppIgfVriU/twXshC3eQRCygZbqsfpf+/sJlhuWx+E2/3wyWnFS9YTXXZvb4lCDxjxuaL41luCYD0Am3Sa9z6yPG8qx0ddXOsjAUSl3WjS4ttxKIh1qlqq74dVxuY8kL8pA+YWF7o9cTxPQ2zntXzlX79jt38pXy7xOvxa8xkPi0G+5AB4lrILpGgN0W+PtIso+AGKiyLXjTGv3+Y6b5+8LnRkSuO74tmJiXgmhKRwwQ== 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)(40470700004)(36840700001)(46966006)(26005)(16526019)(36860700001)(7596003)(82310400005)(966005)(498600001)(6916009)(40460700003)(83380400001)(36756003)(70206006)(70586007)(107886003)(47076005)(86362001)(82960400001)(5660300002)(7636003)(4326008)(8676002)(44832011)(30864003)(1076003)(336012)(6666004)(2616005)(956004)(186003)(2906002)(8936002)(356005)(403724002); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:37.7114 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4359dae3-ff4e-4253-ccd7-08da1ead1641 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: HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR10MB2252 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=uNI6t7aR; 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:fe0e::627 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 | 89 +++++++++++++++++++ ...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 | 19 ---- 11 files changed, 110 insertions(+), 127 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 fa24a5e8..26b1b0df 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(): @@ -120,18 +139,10 @@ IMAGE_BASETYPES = "${@get_image_basetypes(d)}" # 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() @@ -272,19 +283,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. @@ -303,12 +301,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..5f9b5df3 --- /dev/null +++ b/meta/classes/imagetypes.bbclass @@ -0,0 +1,89 @@ +# 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 +THIS_ISAR_CROSS_COMPILE := "${ISAR_CROSS_COMPILE}" +ISAR_CROSS_COMPILE_armhf = "${@bb.utils.contains('IMAGE_BASETYPES', 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" + +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 5f1be89e..00000000 --- a/meta/classes/ubifs-img.bbclass +++ /dev/null @@ -1,19 +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 -THIS_ISAR_CROSS_COMPILE := "${ISAR_CROSS_COMPILE}" -ISAR_CROSS_COMPILE_armhf = "${@bb.utils.contains('IMAGE_BASETYPES', 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" - -# 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"