From patchwork Tue Apr 5 05:24:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1655 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-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 235DOwsa023881 (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-wm1-f63.google.com with SMTP id v62-20020a1cac41000000b0038cfe6edf3fsf1342265wme.5 for ; Tue, 05 Apr 2022 06:24:58 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1649165093; cv=pass; d=google.com; s=arc-20160816; b=cJo8BsJUlxjucKIoZ50N3PiUibVMNUgxjcezPYaXg0g17MaLKfk0SDiCuVzSyDu1/O PHYs2w3UkXoPdog9CmXNGz+6qoXA3056yT/BPAdUI9a7STRr+7MGGZJAmCH5YjffU6sK io2dNCVbnncv4aPVumA5uzfCra2cN1w08lbnjEofWjYoxxlnNI7o9ZkrPOOfnH2kL1Cz 0cp8MDww0/9AIKaswbNtXYf698qf2Ts/UEIgSFFeJ8E0W33O1UW2MaYyYwPCKq40BVrj 1C9FIKTJav2h8ksv/xtdEyOxAlboNYNIUzeP4HduRQnyaCEXWPvUPgYv6+v5SkYfC1uh qojQ== 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=JtdrBNc7yqxgKE25tj+b2XNNnFruTm6mMRRTD48ZPQY=; b=Y5kyFqoKhK0wZz0wXqe6UKiBqMTvge1VT6V2OMnDGPUa+qtMDOZ5Lu2yuPFSvUI+IO +of5nVHUO46YFAExLSnLA1reZseOiq7FYWXUMJOvUhk0YLw0q8iqYdxVwzjEVpxjQknP /zWt5y4ETqZR39sZnI1bofMKMd57g6nQvqvPJxmwPgZWgsLOrdfiapoT7GkTyBNTBbk+ a3jqKaNfbUQd5Isbi7RvKjLd2JK4jEoluHUXt9o6EOKJWx95//GDrDL7Fc5hijPxBgrJ 2XUfCl77o97FWOABsTcIQ2VNmAC0V30d4E2+OXvrO5NPlF0JoWc81B6ZS2KAMReYQjLk 9mOw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=zuQygCjR; 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:fe06::60e 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=JtdrBNc7yqxgKE25tj+b2XNNnFruTm6mMRRTD48ZPQY=; b=HcaKdFyAABBpJjBXKeMRnRKoKz+NQ4rZ8KqxSv+bg/GuamitC4jlGg9XbdNLD1U5re KMJiAdSRBYAGzTFZYQ+h9UAY8Sy1CaE3wFOlgT/lnXthgVsjuhcwi9NcAlMObna3BFJP NteL7Ry8EgBYdkH66hcvchNiZRcrJR6fSWBjkshnnZcskhclJ8thqrf4ug4cCovKoIUi C8xXFgAt8fdh3KslGN4Vedp85hYbup0IUIdgSuXSdJFWtWVcCT3TsEdjyutdLzHQKjFP DzLHlBMd28YIF7txa5dANNV9leR3GLO0rbZKs8FIyRNRDPJEBYA+e68tlyda1rZH9grO Fp7w== 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=JtdrBNc7yqxgKE25tj+b2XNNnFruTm6mMRRTD48ZPQY=; b=g/1hND8j0n42Z0bKr2MF/+fOLDNYvSJcB+wjAC7yV9GgBl7C3nosDDDcYJFNMndK0W suMIeORcuWKoKymvDDaDQR7FKS1WoQ1mkJmA4zForrQ+2xjhlsXi3YSsWXJZZ9HrnSLb CQ7p47nLMQdwx8/L3Z3eQTzXcML42ayerbd10oRLRSQnCyaiq4kHwfWWeAzgYY+LQrEr geU+W47ofx1WxZSc2B252wgStmrKkaLTzah6ak/apsxglZfX+OZnWepaqUUzy7H3BVAR WvviwxihUlSP1+rKTeXGN09BNfmurt4PvOHH+xL3cdzUteeUQa/6b88J6bPJ3clDs+4N pqvw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533C01H5QThC8aZoLPZyU2uVgKaZKkXOcNzxDy4fpdsJ4WQtIUTw 9mGemzE0069vwoSrUQm20Cg= X-Google-Smtp-Source: ABdhPJzn5FjjNe1NzDUMXYAaiArM9q5YvNhaKVjAAS4RmY5JRxXuWIVRA79NNy0vMOaoZNJ2nd0N1Q== X-Received: by 2002:a05:6000:184a:b0:203:f8f0:3407 with SMTP id c10-20020a056000184a00b00203f8f03407mr2916462wri.190.1649165093149; Tue, 05 Apr 2022 06:24:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1da0:b0:38c:aa6a:36fb with SMTP id p32-20020a05600c1da000b0038caa6a36fbls1362012wms.2.canary-gmail; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) X-Received: by 2002:a05:600c:1990:b0:38c:c0a2:c0ab with SMTP id t16-20020a05600c199000b0038cc0a2c0abmr3171300wmq.72.1649165092386; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649165092; cv=pass; d=google.com; s=arc-20160816; b=vp6hvtgFS9/8ZVgZHtolfgbXcz1433ZA3W5NkiivRIlxT94vXlM8mltqF7St1JKQrx 5NGhDsQBaCWbk6q+Bqtc1Bvu/IPPwTHXZVp6zHMfdfRzYn9ki4xy/8Z2HeE+D3JuAZDk Qkl1xM3a7WbJIjQ8M34uvdKTJLKBhROxMoBkGOonBf5qOzPU6l6ufiYBH6DNtOXdJIpO 6p3ZR31o8xPOAF5BlXHpW9bEoh+H1pv/JGuKxJJjoao/NowcpIV1sGkBu1MExjT8U2Om cP3B7BkHe04eFG59Ur748KiXEdPYPnBjS/I9iJYRrI3TsDUwCCeW4VPYjZc3HowjOerD zfmw== 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=xM8vppQyBmmoJm8XBR7YLiZc6HF8PHfMh3rjJKp8YaE=; b=EZXXualAAMtdnDDIFkTY8Gcg2PxtnPKhjHBy8CgaleIvkFqg3RA9fA0WtLTuhqPVRK IEv5BGusJ//EUv+EPvfvXlufFVqNDwafFpwkDIy/gMz1ra7kUJIAnI4Jl+5JEsbgtSt3 Y1nocL/G/4IQPlzHLEpqBZLiUiuJe+q24Oj4dFzhgbpFPgHBB+N4fuW1u2qBKkX4FgMs bI/snAgO3ugpdULET7pM+PRflrkzAcWQk3R9psOQhb6ixtNHOIn6xYieueZVFl6dPtFU iCX4mQ1Kc3WcPEzNmhNM1Dy0gDiLqxxXfCrfMElrh3MlqQTJwgHP1T3L6v3mYmRT7w30 Z2Jg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=zuQygCjR; 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:fe06::60e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on060e.outbound.protection.outlook.com. [2a01:111:f400:fe06::60e]) by gmr-mx.google.com with ESMTPS id n14-20020a5d588e000000b0020614342564si339216wrf.7.2022.04.05.06.24.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:24:52 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe06::60e as permitted sender) client-ip=2a01:111:f400:fe06::60e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jIqNtJ5pc3SVOdW08m++WUtbhWONB60TSgqARmkW6I99HVUKSL9Y+sEacz5FfXUwrSoBiYAyyDY5IO8kE3RoCID7Qxg6Go64AsPpytLNg3ZNkkFOAwJQHRxODft32VxS00/2ZcINJbd85DB3RIXPCAcWA0gva0/odQbLGPSur7mYQf5byHZQaXkhrm7DslouswRP8jY+r/gwuwsqMmGTMDJfB6VCka0bgxB4ccB/XkoJ37CMje8MVnbbO3b/7eoQ9kO1lLehROT7kSr1CJbhsc55YaQdJLEB5vSeMCwOXwYQYZR939c+x+Qk8H+znUypLhSuKpr6yty3A2M//YEjZQ== 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=xM8vppQyBmmoJm8XBR7YLiZc6HF8PHfMh3rjJKp8YaE=; b=nFVgbB1D8VZz6umeZZ/nmLkacxKjY9nXUzf2uaTiDwBIfSsDQAXz80qH4yjJcq02HoQQehSk9BFH/zX4ZuGHyZTO/Buv14NEjOVpSJABmDn46Tq4yjI5sTAYPi64pWxnyt/FDtuI27jT/L4ILdTlQkmfrHiFShGaCESkJhLvqqdQ0SPAZu9cJKJ2sAhSzxBtjBBXw8klOqK7jV4dRaI8xH36fjcK3K1+M4fHrFsp+OHKPmzx8mo9BcBvqoemvC8gEgowiAqW9HymwIEFy6z95X7iUPxWeiVCKEtG/nAWJcAOb6CYS4GkyWS605OBwqEMAhIraKDQKlrphjuS2vnJNg== 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 SV0P279CA0054.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::23) by AM0PR10MB3521.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:159::24) 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::d5) by SV0P279CA0054.outlook.office365.com (2603:10a6:f10:13::23) 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:50 +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:50 +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 5/7] imagetypes: switch meta-isar to the new scheme Date: Tue, 5 Apr 2022 15:24:29 +0200 Message-ID: <20220405132431.2895832-6-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--3.924100-8.000000 X-TMASE-MatchedRID: l8z1v95dwTUQwVtkLIfLLRmYnxcmyg73NtWTJI2Df5JrIu4+N99FEdoK fgOoKJc2TJDyHMXec/aDnmxD/gIAeHb9uKwttSVV1klR/VbdVY2plEyHVtAnRZxVZzZr7+O769x ONVZSrH2pTkI0HK8zpV/uFVcjJsvfGTLPAS0gWUveL+dGDLE1Stg0S4KWRIlGp7rgqkxHgFTsfG +/NIT6/u/AZTBTiDOZ1qPBHSGmMaLxbqg/pB9kFVh9hewKITDKy5+wSPwnsbtIcJTn2HkqsZc/1 2f+pozP+ODxCIeY8xv3MMlWBma+yKwglxty6Z/EaD5n048aELUsm617PZ0pZ+LzNWBegCW2wgn7 iDBesS3CttcwYNipX4VH0dq7wY7up8Odl1VwpCRwCBRodBcYHCHQCqkVz50X+LUtacHaoflfyV6 y5XuMCHJ40FdQMHaUaq+e/sBF3y9T6Dd5lBb4ANbAQGc1VcCQKBMOq0HygoO3ShAi6P5JV4URV9 DGzc3pkOCa3xB6S8HmZoJ42/8sjBC3+SyrzOGxlExlQIQeRG0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--3.924100-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 2C6EF931A30810D1809521F729B98EEE82273367E07B65FDD5844743C5B05D2F2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07f7a2e7-8d9d-4d90-7d88-08da1707a997 X-MS-TrafficTypeDiagnostic: AM0PR10MB3521: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: /2JeJi2svByI/IWK5StTjxIg4ppecmzmh3L65oIqq1cnqPVwfMnVYfGA+ha9bQUFOeBePX7g1MSctZNHJz0L5OMnRb1rTRDcJmcWpNJHqjG9j+8eBr4lgkm1MBL4jFxBacVqkwpZ3N7k92H/lVAW34L/XDn/hmgdNkLjmfOHAch8OTNuBDWOPRTRMGvCVY4lwnGl6sayCLllLKc/vx7+LAzuwetEWPoI3idaOfpu3F+ytiLaZT1hFu/wIQ2QGoL6T9vRjUmyFSaL8TDly1mTWoBCBD8eWFuh19Y9izggjho2Dpco4bukXjXKmjdJxdn0hEaUdQhUOcSoZnNioSCM4r8tNEimH88/x2D+KckZckZ/02qF8dYQzUY9ZtP86ldEksXOGzLW4dOJZbRqbYzBwpj5xTR2tFTTT6Zd8+wKjebOnMI9eVTL/+ZrJla3lwFNxtBpTbYUtD28ktEHxQNRklXameZEzB6l+mYEenXWawqe1OdbvjDzhqAN4YCcvRkEeEtnBoyTqNbBOoEs9tuAoDFXCAxjY1AJiB693A+bQiwmqxU7bwVnGagD4skOgRBKwU1nhxxNdNVyFHU73nDyJS9GAmIpxmqgeGcwcdhjzUls/OzaKZQmWSmsb+vZ3HMJEsfUbck+SmMvO3UVyu27wgGO5Gzcpc5k/WjObPAsWJodGD6F9ZjMadcOls18aWd9pK3blRqERr7JqHl0CENd/Ce6L6vruVM1bpfQYRv+QJbUg9hmBYJFN4xPY5PRN2Da 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)(36840700001)(46966006)(40470700004)(70206006)(81166007)(356005)(82960400001)(70586007)(508600001)(6666004)(86362001)(4326008)(316002)(8676002)(83380400001)(40460700003)(6916009)(47076005)(16526019)(36860700001)(82310400005)(1076003)(36756003)(336012)(2616005)(26005)(956004)(186003)(44832011)(8936002)(5660300002)(30864003)(107886003)(2906002)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:50.2960 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 07f7a2e7-8d9d-4d90-7d88-08da1707a997 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: AM0PR10MB3521 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=zuQygCjR; 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:fe06::60e 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 - new image type names, basically replacing wic-img with wic, etc. - adapt custom image type rpi-sdimg to the new scheme Signed-off-by: Adriaan Schmidt --- meta-isar/classes/rpi-sdimg.bbclass | 2 +- meta-isar/classes/ubi-ubifs-img.bbclass | 11 ++++++++--- 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 +- .../conf/multiconfig/qemuamd64-buster-cpiogz.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 +- meta-isar/recipes-core/images/isar-image-ubi.bb | 4 ++-- testsuite/cibase.py | 4 ++-- 26 files changed, 37 insertions(+), 30 deletions(-) diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass index 010c573c..508c4bc4 100644 --- a/meta-isar/classes/rpi-sdimg.bbclass +++ b/meta-isar/classes/rpi-sdimg.bbclass @@ -3,7 +3,7 @@ # # Based on SD class from meta-raspberrypi -inherit wic-img +IMAGE_TYPEDEP_rpi_sdimg = "wic" WKS_FILE ?= "rpi-sdimg" diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass index 095719aa..7a917b47 100644 --- a/meta-isar/classes/ubi-ubifs-img.bbclass +++ b/meta-isar/classes/ubi-ubifs-img.bbclass @@ -5,6 +5,11 @@ # # SPDX-License-Identifier: MIT -inherit ubi-img ubifs-img fit-img -addtask do_ubi_image after do_ubifs_image -addtask do_ubi_image after do_fit_image +IMAGE_TYPEDEP_ubi_ubifs = "ubi" +IMAGE_TYPEDEP_ubi += "ubifs fit" + +IMAGE_CMD_ubi_ubifs() { + # we need to produce output (with extension .ubi-ubifs), + # so just create a symlink + ln -sf ${IMAGE_FULLNAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ubi-ubifs +} diff --git a/meta-isar/conf/machine/bananapi.conf b/meta-isar/conf/machine/bananapi.conf index dd3a0667..36cda28a 100644 --- a/meta-isar/conf/machine/bananapi.conf +++ b/meta-isar/conf/machine/bananapi.conf @@ -9,6 +9,6 @@ KERNEL_NAME ?= "armmp" IMAGE_INSTALL += "u-boot-script" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "bananapi" IMAGER_INSTALL += "u-boot-sunxi" diff --git a/meta-isar/conf/machine/container-amd64.conf b/meta-isar/conf/machine/container-amd64.conf index 1f7669ad..e24729ff 100644 --- a/meta-isar/conf/machine/container-amd64.conf +++ b/meta-isar/conf/machine/container-amd64.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: MIT DISTRO_ARCH ?= "amd64" -IMAGE_FSTYPES ?= "container-img" +IMAGE_FSTYPES ?= "docker-archive.gz" diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf index f822e24b..55343e9f 100644 --- a/meta-isar/conf/machine/de0-nano-soc.conf +++ b/meta-isar/conf/machine/de0-nano-soc.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-de0-nano-soc = "u-boot-de0-nano-soc" U_BOOT_CONFIG_de0-nano-soc = "socfpga_de0_nano_soc_defconfig" U_BOOT_BIN_de0-nano-soc = "u-boot-with-spl.sfp" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "de0-nano-soc.wks.in" IMAGER_INSTALL += "u-boot-de0-nano-soc" IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc" diff --git a/meta-isar/conf/machine/hikey.conf b/meta-isar/conf/machine/hikey.conf index 615d6749..7f9cccb2 100644 --- a/meta-isar/conf/machine/hikey.conf +++ b/meta-isar/conf/machine/hikey.conf @@ -7,7 +7,7 @@ DISTRO_ARCH = "arm64" KERNEL_NAME ?= "mainline" -IMAGE_FSTYPES = "wic-img" +IMAGE_FSTYPES = "wic" WKS_FILE ?= "hikey" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/imx6-sabrelite.conf b/meta-isar/conf/machine/imx6-sabrelite.conf index 5be337f9..bbc2b505 100644 --- a/meta-isar/conf/machine/imx6-sabrelite.conf +++ b/meta-isar/conf/machine/imx6-sabrelite.conf @@ -6,8 +6,9 @@ MACHINE_SERIAL ?= "ttymxc0" BAUDRATE_TTY ?= "115200" +INHERIT += "ubi-ubifs-img" MKUBIFS_ARGS := "-m 0x1000 -e 0x3e000 -c 1500" UBINIZE_ARGS = "-vv -m 0x1000 -p 0x40000" -IMAGE_FSTYPES ?= "ubi-ubifs-img" +IMAGE_FSTYPES ?= "ubi-ubifs" DTB_FILES = "imx6q-sabrelite.dtb" diff --git a/meta-isar/conf/machine/nanopi-neo.conf b/meta-isar/conf/machine/nanopi-neo.conf index 2475ce9d..5aa717e5 100644 --- a/meta-isar/conf/machine/nanopi-neo.conf +++ b/meta-isar/conf/machine/nanopi-neo.conf @@ -7,7 +7,7 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "nanopi-neo.wks.in" IMAGE_INSTALL += "u-boot-script" diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf index 2d052d0c..65382630 100644 --- a/meta-isar/conf/machine/phyboard-mira.conf +++ b/meta-isar/conf/machine/phyboard-mira.conf @@ -6,8 +6,9 @@ MACHINE_SERIAL ?= "ttymxc0" BAUDRATE_TTY ?= "115200" +INHERIT += "ubi-ubifs-img" MKUBIFS_ARGS := "-m 0x1000 -e 0x7e000 -c 8083" UBINIZE_ARGS = "-vv -m 0x1000 -p 0x80000" -IMAGE_FSTYPES ?= "ubi-ubifs-img" +IMAGE_FSTYPES ?= "ubi-ubifs" DTB_FILES = "imx6q-phytec-mira-rdk-nand.dtb" diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index ccfde391..eca2628c 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -6,7 +6,7 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" KERNEL_NAME_ubuntu-focal ?= "generic" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/qemuarm.conf b/meta-isar/conf/machine/qemuarm.conf index 20a71ea4..06d4b34d 100644 --- a/meta-isar/conf/machine/qemuarm.conf +++ b/meta-isar/conf/machine/qemuarm.conf @@ -5,7 +5,7 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index ca23cef5..b30fad47 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -6,7 +6,7 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" KERNEL_NAME_ubuntu-focal ?= "generic" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf index 17cff1eb..ddfc077b 100644 --- a/meta-isar/conf/machine/qemui386.conf +++ b/meta-isar/conf/machine/qemui386.conf @@ -4,7 +4,7 @@ DISTRO_ARCH ?= "i386" KERNEL_NAME ?= "686-pae" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "directdisk-isar" IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf index b34e46de..40f5e744 100644 --- a/meta-isar/conf/machine/qemumipsel.conf +++ b/meta-isar/conf/machine/qemumipsel.conf @@ -5,7 +5,7 @@ DISTRO_ARCH ?= "mipsel" KERNEL_NAME ?= "4kc-malta" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "sda" diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf index 5c687a03..cd04d873 100644 --- a/meta-isar/conf/machine/qemuriscv64.conf +++ b/meta-isar/conf/machine/qemuriscv64.conf @@ -8,7 +8,7 @@ DISTRO_ARCH ?= "riscv64" KERNEL_NAME ?= "riscv64" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf index 8d6dff9e..327ac91b 100644 --- a/meta-isar/conf/machine/rpi-common.conf +++ b/meta-isar/conf/machine/rpi-common.conf @@ -5,7 +5,7 @@ BOOT_SPACE ?= "81920" MACHINE_SERIAL ?= "serial0" BAUDRATE_TTY ?= "115200" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "rpi-sdimg" KERNEL_TYPE = "raspios" diff --git a/meta-isar/conf/machine/rpi.conf b/meta-isar/conf/machine/rpi.conf index 0ab701c9..917527f0 100644 --- a/meta-isar/conf/machine/rpi.conf +++ b/meta-isar/conf/machine/rpi.conf @@ -4,5 +4,5 @@ MACHINE_SERIAL ?= "ttyAMA0" BAUDRATE_TTY ?= "9600" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "rpi-sdimg" diff --git a/meta-isar/conf/machine/sifive-fu540.conf b/meta-isar/conf/machine/sifive-fu540.conf index d73f0475..1eb58db1 100644 --- a/meta-isar/conf/machine/sifive-fu540.conf +++ b/meta-isar/conf/machine/sifive-fu540.conf @@ -7,7 +7,7 @@ DISTRO_ARCH = "riscv64" KERNEL_NAME ?= "mainline" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sifive-fu540" IMAGER_INSTALL += "opensbi-sifive-fu540" IMAGER_BUILD_DEPS += "opensbi-sifive-fu540" diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf index 22e88ea9..62de7dd1 100644 --- a/meta-isar/conf/machine/stm32mp15x.conf +++ b/meta-isar/conf/machine/stm32mp15x.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-stm32mp15x = "u-boot-stm32mp15x" U_BOOT_CONFIG_stm32mp15x = "stm32mp15_trusted_defconfig" U_BOOT_BIN_stm32mp15x = "u-boot.stm32" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "stm32mp15x.wks.in" IMAGER_INSTALL += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" IMAGER_BUILD_DEPS += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf index c0f65842..de3d04c3 100644 --- a/meta-isar/conf/machine/virtualbox.conf +++ b/meta-isar/conf/machine/virtualbox.conf @@ -12,4 +12,4 @@ WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" VMDK_SUBFORMAT = "monolithicSparse" -IMAGE_FSTYPES ?= "vm-img" +IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf index 9bf1fd96..fba639b1 100644 --- a/meta-isar/conf/machine/vmware.conf +++ b/meta-isar/conf/machine/vmware.conf @@ -14,4 +14,4 @@ IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl" VMDK_SUBFORMAT = "streamOptimized" -IMAGE_FSTYPES ?= "vm-img" +IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf index 37f89581..675d934a 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf @@ -6,4 +6,4 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -IMAGE_FSTYPES = "cpiogz-img" +IMAGE_FSTYPES = "cpio.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf index e3992e60..b48b0a6c 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf @@ -6,4 +6,4 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -IMAGE_FSTYPES ?= "targz-img" +IMAGE_FSTYPES ?= "tar.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index 5615198d..1765d602 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -3,4 +3,4 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -IMAGE_FSTYPES ?= "wic-img ext4-img" +IMAGE_FSTYPES ?= "wic ext4" diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb index ef2cf1c3..8c70c1f7 100644 --- a/meta-isar/recipes-core/images/isar-image-ubi.bb +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb @@ -23,5 +23,5 @@ INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}" # only one dtb file supported, pick the first DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" -UBIFS_IMG = "${PP_DEPLOY}/${UBIFS_IMAGE_FILE}" -FIT_IMG = "${PP_DEPLOY}/${FIT_IMAGE_FILE}" +UBIFS_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" +FIT_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.fit" diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 0281be41..1dd7c7a0 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -120,7 +120,7 @@ class CIBaseTest(CIBuilder): ['do_bootstrap_setscene', '!do_bootstrap']), check_executed_tasks('buildchroot-target', ['do_rootfs_install_setscene', '!do_rootfs_install']), - check_executed_tasks('isar-image-base-*-wic-img', + check_executed_tasks('isar-image-base-*', ['do_rootfs_install_setscene', '!do_rootfs_install']) ]): self.fail("Failed rebuild image") @@ -163,7 +163,7 @@ class CIBaseTest(CIBuilder): # TODO: if we actually make a change to hello, then we could test # that do_rootfs is executed. currently, hello is rebuilt, # but its sstate sig/hash does not change. - check_executed_tasks('isar-image-base-*-wic-img', + check_executed_tasks('isar-image-base-*', ['do_rootfs_install_setscene', '!do_rootfs_install']) ]): self.fail("Failed rebuild package and image")