From patchwork Wed Apr 27 22:06:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1724 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:49 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23S66lTT005802 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:47 +0200 Received: by mail-wm1-f56.google.com with SMTP id l33-20020a05600c1d2100b00394059572d6sf1063449wms.8 for ; Wed, 27 Apr 2022 23:06:47 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651126002; cv=pass; d=google.com; s=arc-20160816; b=yL73A2Z4vxLR4WnqpB4jUuefLnyZGilcBTSboGdcwEgheBaxKCkElcTC3u5bhc3JuI jhZ+X7x121MaKYJHhIIZx061YhE73z7+MYUapIwcCR6DRuj9fPVdv5aAYsGs7KV0XXqE /xKbMj57/HeEsddgOKnkT5VRjjYH8JQcBmPZ8/deAeQIuGdP8QtT7va7ubHOEEi61mfK 0v8FiqxjJ0W4LVQIf2IroRYmiub7cQA/SDADcXvVP/lqMXwOqY6+I/yIhOY1qnsvhdFc oW2cPYrw9mhala7VobLMmu+/uKIRlK4tCreSXgWbdlpNvjkuHqumAtm/OIHdptmzcjOn DSDQ== 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=NbwSEnfCDijLxlOOVwcYqH++SDx1zWDPRp/KR2qnBQc=; b=gHrtjUAT3Sca8vz09HAk4X2w2rMOG6wN9KivuRKBGIqnxun1hPlkK7Z9FoHMv3mk3w goINnRbLJ3Wv+juiICgNFu1PCzRllZr6wLxZgJ9wlmH9AC06zaSBhISEZZoPFIq74biO +sN9V+NKVmhpdCy1inflR18AOd9Z5UdhIbUep5MFHid8MCCJ4WoFG2is2IRxRtbmOE/I qvqc5Ay2CoyWkB8vRoQsGq1w0f1AzOD2WnkDjIH7pz5sKqoTqEtqHQduENZtIBuy3B1n sP5PwYbh1gc3UN8ubl9/7sflfAOyEaDBI7NzineNTi9tDOwK7xeqcNVHYTGq4/FTemgN uCVw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=VBNW+D8N; 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:fe1e::623 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=NbwSEnfCDijLxlOOVwcYqH++SDx1zWDPRp/KR2qnBQc=; b=Yp54GR1QhzhFB3Vee8kUJKbdU1OerxCJ4n/sHr65BsxrQkV7jHOd+kfMuWUfs1bbgT r5qB/o2CGTCvEzekKHOHI2vCV+vRG/kqzi0FJb7sHrdkk2fYc2wDM5TJMITwI0ZzwRz3 qRaGvobigS6i6W9p9l/oIYX5+ygP+g9LbH/Mp7D4zxhkNA5uRE0fX5CdlIYgPGqT7h2c XsJs6p+xUMETk8BqckMPTTDGHxMe32Pt0D0F40Vfk10fK1UAYlvmcl361rLIAyy8/0e1 bUW6v7ws6oQMRrgXXt3nYZnT0p5OqBB+VX9J6hxrbvYET9sy3kYgeVmu4ikz9L6N39c1 A68A== 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=NbwSEnfCDijLxlOOVwcYqH++SDx1zWDPRp/KR2qnBQc=; b=XvUss7SQz6ACEof8WHZJ4aHzWgRCc/FCcl5hT/3QGNHOVBBlWwyVc+ftFGY7xYZkkF 7FECyEN9lz8vAlil5paSdm/2hRIYAxUUg5hraPABtctlL++U31A0cV3EAGGAkqFDYU7D yBEq4vk6SaF3ucz+hYCbTkp5sQ/w2bpM5gpeKajVSiFXzO8sUv0hwzhnzJqsbcEkhb1W ugsuqTuZJfPl2axqVjMgfC6GiqwdF0SSic+/KD2ao6ot6fFUnp1U40HE67vvRuR7bsm+ n8jGst+fGYt7RLVaWSh63MeLekn1Mc77zpvIX73vxB2ISxVYSVZpFjf6HQDD5yeyi9Qt pELg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5320KB1PtyIJ4kh5g/i4IEBywgZruE+cjgA2vc5tGBnDQu03fRCj 1vnEVN8NOei14b57WMVutUg= X-Google-Smtp-Source: ABdhPJwrwate7Wci834kWdLN6yW7mrxBm80Gd/hpKEE5ysS/wwHcsAWG0ixgGkkOUZsUsplV588Lqg== X-Received: by 2002:a05:600c:2108:b0:38e:b7b0:79bc with SMTP id u8-20020a05600c210800b0038eb7b079bcmr29491047wml.33.1651126002296; Wed, 27 Apr 2022 23:06:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:34ce:b0:393:e84e:a015 with SMTP id d14-20020a05600c34ce00b00393e84ea015ls2022148wmq.0.canary-gmail; Wed, 27 Apr 2022 23:06:41 -0700 (PDT) X-Received: by 2002:a05:600c:19c6:b0:392:926e:5023 with SMTP id u6-20020a05600c19c600b00392926e5023mr38501243wmq.110.1651126001317; Wed, 27 Apr 2022 23:06:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651126001; cv=pass; d=google.com; s=arc-20160816; b=VIZLNb+waZWtFbQAZEP1PEcY9gSV1ufDugxyeyOuR+GR4VP/B/IWjjEV8Q/gg+Q0Ma QjQu5Mukf8jJFkKy11hYTWzQ6KdX6r/d155k7g+L0nt4sHDKLJlvAx8RR67x/YUenlCJ Cs6BdWrJ5WAEchJpHwjteZkx5YOZPW0qEEyof1JQEXUSSdi9ZiNfsBunjknqX7rUhlZx sITPiFNbCOqW8QfoWHz+q259AJdfOGv0hxNJTN8XANe/tfmbNI2o53oqCnQF6LrtZVrr JCdGUOdh4PgdcqBSbbjbBDZ/1lovjGC+i3kT0jJs1TZ9PwtzqVjgIgmQ5LqaaVsLDWeH hR7g== 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=t1AkY7sljT5Y2gpYjRlwXbqLIoCOZDR/cXtV/jzJnaQ=; b=uXmdkPjJApLynCCRzm4F5zL7P3hAoGWPdalQUnv4K1bZSRy8kFHpkcuR2zGBcMYnPx HjBqgIwchbN9/mhpWt1hgSm2EHsJJ9i5rRtC+etOVSWNTiREOdraMsNcYhYc6qiRpd2H wG48actcJPXfjGaEzK+YaYkjhv++kiUno5V2LBsRu3G0QMvtu9P4MRArn7VS4Gz0WK/6 +n4Wpr6he3oAXrusQxWyGEcPR7l3VsMQpkNGhHPBVV3VbDaW6GI7kpuZwVYo/GtjxtOl sni3oi/F21tfIhdie5gqOrcJHFsMU1E7EJeOrbxvPGBGzJY9umpqtokhFsjil082WB+v q+lg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=VBNW+D8N; 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:fe1e::623 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0623.outbound.protection.outlook.com. [2a01:111:f400:fe1e::623]) by gmr-mx.google.com with ESMTPS id p21-20020a05600c1d9500b00393e98f67a1si193108wms.1.2022.04.27.23.06.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:41 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1e::623 as permitted sender) client-ip=2a01:111:f400:fe1e::623; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m7A482dnmdD7UFKz1avfUXRxJp3IZOb3imYVWe/6bH2j9E9yKnf0q7Wc8iW7vh6SniInfXyS34slw9Z/3GN0Y7jd2gvBgRbMBOyAgkh1jMm1RjwUNlVvLurX9PqxbvfCrA2eGU31Y3lDfd1FjX/3yiN+Ol2TyfHM3mHwa27P66fv54gT8QVwxdKB5W9fPRGQIw0mov1r1fMnwAynWj6ElAhBR3x5f406rqFHdw4OZ6S90mIVdtEqxsCkGO4HZc3hXn5Baz5QIe4JMxwtFs77e4yv+xXQkueHOp+hBcR0abQMEm3wLY38qszaO0n9tlvT6BFSsfABeNPniC8qg0hcZg== 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=t1AkY7sljT5Y2gpYjRlwXbqLIoCOZDR/cXtV/jzJnaQ=; b=YqOHKkBv48ABBFcRqBPN4agPbNsHsOTF6AHK8xxM6moYPjpeR3c7cS4M1MRomTmDrLot/m1nH/nkNO7CX6eHZik3NWhuhHTKgNnEwkLMA+fvAyMX0Q215GsXHkErKLQHQUx3E6fi1Y8/vmVSvvNhkPBTTVwpeQ1hH0VPjeq4432oS1ikTXrBxH8PDkT1v2dUbcflrvJngHrLKTE/j4Cke8msDoGdu8/cvchledKikSJG3Vdz1T8NfkDKdqu3AyA14kSnACVWTBi/IUywnRr/7YS+pUw1KI02HWXJ1gm/n9Z4SlhJUNYgSp40rRmwUSDpVnaW7657x2ullSTF0zgG5w== 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 Received: from SV0P279CA0049.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::18) by DB8PR10MB3417.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:e3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.18; Thu, 28 Apr 2022 06:06:39 +0000 Received: from HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::5d) 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:39 +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:39 +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 4/8] imagetypes: restructure files Date: Thu, 28 Apr 2022 08:06:11 +0200 Message-ID: <20220428060615.986332-5-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 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--8.309600-8.000000 X-TMASE-MatchedRID: nMK7vCEp7YfZY+nnK3IwnMGnCHwCMuTJElH6l1EPRNgItCy6ZX/lLxqD rPipLA7BoxCLfriDzziVIbfpsq9FzF0qMWNOsGgAG6Aor8mgxBIDI91I0N0Y7w97mDMXdNW3ELb qrOgWzyev/7fHaEp6ExqGc7het5hmUtTgmoNQjI1r7b8CsPPtQe+90yVxudOIEVuC0eNRYvKW31 x27U9QYi99T+uJIleR5wnn9PXAc/dMqWhw3u66AuHPYUUXef6kyu0fpXITlDQTwfDtZ0TwrOC1p 3r9o3NF33Nl3elSfsqygaZY7yrHzqIaM+CEC29x7GlLKb+3caKOIGWE92dOkM1+HYKUTcWQyeUl 7aCTy8j5LkL/TyFZzYhwHj/iDNtw7hkjCJvdG+FrCXi+CAenHLtj8w9EqUz1nVTWWiNp+v/v5Je olM8iu9JO+sYlhfSoE6ogJvBVT03i8zVgXoAltsIJ+4gwXrEtIAcCikR3vq9rXQNzq0ar0UU8cj +hUWuWCAVttK5Hnp21aYLL2EFDAhlKv3mGlzN/ X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--8.309600-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 11658981CACB2D65B52DC6646495948B2CF3B3A07264ABBE2AEB40DE642027432000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 790e4aaa-9eb2-4aa0-331e-08da28dd4245 X-MS-TrafficTypeDiagnostic: DB8PR10MB3417: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: D3gIdXQnXR4Ejt5k/rS/NBAXzyqIy/QmCjCk59TBl1jLRGa9M7mEn4kbugiq6NwHH0tavKwkn1ph5Fps2jeW3dMP+nj9SunzSl/Ww5jB6o7O7fVzGPp3DfsaS1RLCDeJiPpumjmBFMqqc1sX+BHHT6MHePIHtuXWTkm/Q+3fcITW/o9lcefEZb9E1mMC4iek5j//Xudp4bsTIoNsZvmZXwj+JhsgHHgyPDfEwV/dmayXU8a2HbdW2E34GHZFWfBrI9lpDxnGq6g3RPJTYiuEtvBgyUnCj+9/gR6aJjau8UJAr1zkeIMS2BEHUjm5k0SL1Xl0lJRJx2ddtLOVQo+sp7z3dXBrSsQx1mKmGRBGGk4da61FOH2B0bugb03Nse3kTuYDcI591DHv9TBemYPD5ktga+qB35oeKFMbsdMQnATTWA8RWNyQTtnmtUjWmnMLpekQKnh1y9viXJ/GkQ2mSl63vLG11MXH7zRkgz4c86zZ//xxuURzF0k+/+P/evznPJGRIYefZzYBflwsaPLuSStmSetq/5N2Q6wYEG9MVWF9Lb34RKWFZJg+FHTI3MaXEvyUHfPkfsMbt9dGcD1UpLrQ7/3CEh8QJLjKxG7VVSm66bYEzr030CUtEPbHqTQoLIFPn5W2O4JaQ83/DbMsLfTNksJOqvjWPmPlIHpvzpNG8j2WFwgEESSbXZJlGdlClOWd53gTq48HmGNOfqyih+l/PsOSciHAxxKYkLHJ3SmmE1M05xvHszxF2qPVSSY+PY+ZvhmJn3xQi4MkjnG567FcMDsF0ic9RWZRn7rkAVLHNib+IF3ncuKY8cjwo9Bg 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)(46966006)(40470700004)(1076003)(47076005)(336012)(36860700001)(6666004)(70206006)(2616005)(107886003)(82310400005)(8676002)(70586007)(4326008)(956004)(36756003)(16526019)(186003)(6916009)(316002)(44832011)(2906002)(26005)(81166007)(86362001)(30864003)(8936002)(966005)(508600001)(82960400001)(356005)(83380400001)(5660300002)(40460700003)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:39.0123 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 790e4aaa-9eb2-4aa0-331e-08da28dd4245 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: DB8PR10MB3417 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=VBNW+D8N; 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:fe1e::623 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 | 54 +++++------ meta/classes/imagetypes.bbclass | 93 +++++++++++++++++++ ...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, 114 insertions(+), 131 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 91c7aaaa..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,22 +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_MEMLIMIT ?= "50%" -XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" -XZ_THREADS[vardepvalue] = "1" -XZ_OPTIONS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" -XZ_OPTIONS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" -CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS} ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'" -CONVERSION_DEPS_xz = "xz-utils" - # hook up IMAGE_CMD_* python() { image_types = (d.getVar('IMAGE_FSTYPES') or '').split() @@ -276,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. @@ -307,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..07ad0cdb --- /dev/null +++ b/meta/classes/imagetypes.bbclass @@ -0,0 +1,93 @@ +# 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_MEMLIMIT ?= "50%" +XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" +XZ_THREADS[vardepvalue] = "1" +XZ_OPTIONS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" +XZ_OPTIONS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" +CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS} ${IMAGE_FILE_CHROOT} > ${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"