From patchwork Wed Apr 27 22:06:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1723 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-lj1-f188.google.com (mail-lj1-f188.google.com [209.85.208.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23S66msD005808 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:48 +0200 Received: by mail-lj1-f188.google.com with SMTP id q7-20020a2e8747000000b0024f2d363986sf877686ljj.5 for ; Wed, 27 Apr 2022 23:06:48 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651126003; cv=pass; d=google.com; s=arc-20160816; b=B5AXZDF3WlsBHoFMXBSw+HvqZA9NRDIiI6cqf057xVd4rwcgtUVPP1oeM5VqFA60cd ltw22I+iRJPA11XEUyETF8y1xBJ0/X3u0HjzjXUj2eSjxdaE2tx/ogv4Bmu83pcSB9du qvF7cTn4KOWrLZywZziAwJkLuvBpUXnpf/o8qCRpJd1xcgBHojxvjOFEvbV3kr1KS7gD l1KcqwHKPpbxiy0V2qoiVzhsBJoH72UhdeDZFMKCr5361HU4UuDlImJ5ffXG7y0/Idmh F0xbGExq2fZqpSsK9xU4mi2Kn5bjBggChLzyJqAyzWfJae6gzIg4DhXR/CMXP8VEYmjJ rlVQ== 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=BzDyB76Lgv7WhHCStwk/5qmVwIDYs5MxcKvYLcjPLq0=; b=koXQPaup1LFu43o5Xu1FTRmGGBpICopeNJXyF0LDKTEfc6iS1qGDdB7SOkX8/fRrgv DZR4v51SKQXXbhj2QLpy4YL1SeBdcOLMF3kkZxHrOpkBMwSQ/McCZFwLGDiYM8F+VVcQ XVNazUERNbX9eEW5NQM3w+VV40R/FbLF+9RCAb45QgR8PF5aRf+3jQsnKVUubm47rdsO CTtpZD4QsStvjR9i9VZwp81X0ydtdWDewXvrxLg+orSD8kpmvM+WCmN1gwHJTsO+4qIV XO3Z08H9lJIlELIJbWXbxk6/qUVWm+MGvYiDdusXIhBLzvyr1kZ5CE6uzVgefanDhCrJ eWFg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dwF0a8Gt; 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:fe1a::61e 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=BzDyB76Lgv7WhHCStwk/5qmVwIDYs5MxcKvYLcjPLq0=; b=najw41MVzpyx1Yljxn2J3bRNkNdPD9l6xHd16gbjhtZVUsCwYCHCMnMVzNZ56APixJ LNkxV/GZYYEjBfXBWC3GMAthZRALrh9S1F+Edxfqn9DYyr5YejSz32QYSvmP6ZETb9lV qFd+BchBPbSjsL1z7h/7zmzwkSQqregB4sNR6ZIh/f8aDn37iklLm+UUCHpH5C8YWG3o eO478KJZfinCScq8wCFLs3zErBziJNPGmzSe0AeMKdnRCgm+NT33YObX58XxltcEdWJy PdntaQQH5CbRbr1RUBVgNlOL/vrmorTWxA9KGiurDMQ7I3PLz3nzeiNjXYOLtWB4Rjbp Dtew== 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=BzDyB76Lgv7WhHCStwk/5qmVwIDYs5MxcKvYLcjPLq0=; b=rwqc8RGYc+rjEKMLMVy/3CT6oDXdwYJn7DmPzhCLO+W2He6vjCyrhycz2r+8QutMzg omb19oissfH1B9anCoAcuw4w0UM8yj+M+PmhMlPrGlqnyqQH6ARdaZri1ROj/9P0CHIO ZWbVV31HePuZhRhrCjF14KLgcx4/5ih2I574CO8TPiDchiMgsVDy0slI5EoDEYg8U6C7 iYBT7zlGy6pC8OrPFWX+KNu3tsgvIs7h3EYEuLHmCeYtJUdbIshR7yoqtYvCqVKXix9f 4qo1/9A0deHKDwhTHhx+ri46JJPztfrZc204KBIl+zrEX9WQ+ejGn4vh8VF3MxbwOp3I SYUQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530b7lQuLQ3XH41h22jKRLPViQQ3Y42DMGnmdjFWcq/gGrNmTYwc OfjSRi8VEf8dG3766+sbDHI= X-Google-Smtp-Source: ABdhPJzKxjO35bL8B90Z2HlCUQgbraxwM9iS7yj9+bddTF5vNSmtv26mPK1BJIWHI4Qn+Ajj3FI5FA== X-Received: by 2002:a05:6512:3986:b0:472:4f5:33a0 with SMTP id j6-20020a056512398600b0047204f533a0mr14233043lfu.341.1651126002814; Wed, 27 Apr 2022 23:06:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls3753644lfb.1.gmail; Wed, 27 Apr 2022 23:06:41 -0700 (PDT) X-Received: by 2002:ac2:4204:0:b0:464:f034:77a7 with SMTP id y4-20020ac24204000000b00464f03477a7mr22539375lfh.328.1651126001639; 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=OYK0sYqJrUQZpeLF7XedViF1TKMwdcjZbpCBkgu8nt4DpnIbwBP+RraB3QXDktDqqE +wbJyqAKBdOmnQudIcAI0v6FoPy5gwM72ka+RyHBQ+YBDVcWQfacAY4Ml28x2TLamOgK FY++5lNtpuPXMwkNd2AFpcrl0M38kbI6MYr20uc8gicNvGF01t20SEXEUTpRilqarSML Vi9f1zFNM2TkIG1paLn099I5Z9h5ndy5zGHR5oTkis+yh2fINNZKTkKFV6wDwaVTdloK 2mMxA46rGyW1nYX0xLUPSuYS4AG7RiUlH6QsykCf62GghhSazfdGRvsWEAC0cmAmMU2h JFxw== 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=XWFGthK709YdwYJMtVBiatY7Q3WH73mFZZ7XcJnUfDQ=; b=L5LGIkL04K4DODjrOC7F3i3/wyvgp+fqa/k8/90psdh5RI0M7t0nmW3p1i7PAkzNVh sOaCPkIcpbwuoslx/mZzgtCfjjC7EN4vJEZpq63NTuB0Ar4iYuVpztg9rSNM/zbwqNQn uEIA8NxAX8OCrdYneAWm1rPm95akVXE/lHDuoPYUc0kCqNxmPbKDV60i0Z6B7anUX219 qTtWjTdRqRVpjg7ydeK16PP7wCu6TTAQJY30iGlAqgRgZ8lTt7EnKXFDZOxgtnayovrt z6GMxMg3jRs+SHHrQEc7yM4iEvz5r503rAjhmVNY4omAuzpYlNsqMItPiXkJub3KE4Ix g/JQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dwF0a8Gt; 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:fe1a::61e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2061e.outbound.protection.outlook.com. [2a01:111:f400:fe1a::61e]) by gmr-mx.google.com with ESMTPS id d10-20020a05651233ca00b0046fede34ee5si166595lfg.5.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:fe1a::61e as permitted sender) client-ip=2a01:111:f400:fe1a::61e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dMp45jNmfcyHuAM/w80Fo2y6krH89PCJhF2a8+x2knkacAxXOrvEqMqQRjcdlrz8G9korv0Qw5dlqFnwqScgKme+VApBkW7h4VASbHiQ5u+ShAGvTRhzlZzMc9d1NKkjuTh5n9sUDh3JeDLmSD2tO/gALyW/T5bD5OxX5LcxpJ9nb8t5X5jsJzH+60fcVqH1u7SItU6SyzK8Yc50wuEzJTlawPl2Jdg/N3aEG/cmBAXd7DjPgGmqJOwbJ300Yu2oCfdM+OVhLvjVm+SRa7rKXxzyyDEKKkmQMSyS5ZMPXPTL1T4ppvIS0LU2kWfZpw4A1JTNhzuYKn4U9mORFSQNlQ== 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=XWFGthK709YdwYJMtVBiatY7Q3WH73mFZZ7XcJnUfDQ=; b=RvAsnV2AAqEFdyzgLOoEQTHcgi3ydAyCtO//k2WM/4yFHSJr6EpSzI63L7kP7crUnuC98EdA3RtBdLm7MODtWkV/LJ4L3GVCeDpxjBFtiaFaBztiAYyd9BVOQWS16I7HDkGyXgYw5fy89ZfF943G/fv6rkjFmAITydvtoTQAPzdpLlBgJpUBMzzUiM2VN0t5j30WcCG9CYo1sDLOwtQHWIO9SioGKdzCNdEB+SxE9FvB8vgnnSs58HfFIPRqfsYtTQwIxtMNYBFgWKHWigP67BJt/jG1Izd2HzCsbC7cR3JzWREAQaGakAP7gRv6TO4sUUUBr9X2zdEyIY7Kaoxpbg== 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 SV0P279CA0052.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::21) by AM8PR10MB4145.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 06:06:40 +0000 Received: from HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::a) 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.5206.13 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 5/8] imagetypes: switch meta-isar to the new scheme Date: Thu, 28 Apr 2022 08:06:12 +0200 Message-ID: <20220428060615.986332-6-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--4.345200-8.000000 X-TMASE-MatchedRID: FLdX6EDRuFgQwVtkLIfLLRmYnxcmyg73NtWTJI2Df5JrIu4+N99FEdoK fgOoKJc2TJDyHMXec/aDnmxD/gIAeHb9uKwttSVV1klR/VbdVY2plEyHVtAnRZxVZzZr7+O769x ONVZSrH2pTkI0HK8zpV/uFVcjJsvfGTLPAS0gWUveL+dGDLE1Stg0S4KWRIlGp7rgqkxHgFTsfG +/NIT6/u/AZTBTiDOZ1qPBHSGmMaLxbqg/pB9kFVh9hewKITDKy5+wSPwnsbvuykw7cfAoIARry DXHx6oXe5EXi6Tp2n/bTyGgZTKDvlLFNpfGeNniiZD11v4eij4B2AjU9cY3854CIKY/Hg3AGdQn QSTrKGPEQdG7H66TyKsQd9qPXhnJ/4rWvpj9Ucg+NxsoL2fwHmEU36k9kJ3Gy3CJgzDSbWK0294 T0sJuYiNS3NI49OOLgImcnb4lDuNaQVxB9HMolPSRmFtyHPJc8PA5e+2DmDZMGInq510f4Xhb+t XQ0Z2H9HOalI4Kiyr2JUHlN8ax9FL0bdz5ADdFQwymtxuJ6y0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--4.345200-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 89BB8F340923F3CEA08E8CC59A16DC1970CE20426FD8FBACE67B95BCEC2C4C352000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7da282d0-d3c1-4555-b658-08da28dd42ab X-MS-TrafficTypeDiagnostic: AM8PR10MB4145: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: 81iJ9VfaOqKdGEBagPOUDXWmsPjuZKV2iSrnqs03o2uBizCC+ga4cOAQ3I8h6EBaa1xCg4FL4sSxRyKbnGt0tZYlu/pItI87B7kx1WmJKABHEnBKpv3G/rOY/Q8lBPaXVwcd5EV0mZ7b+BTwNOmHb2JmnyPycXHp7Gf0b/5ehmvIbM5lkSDFgT3LjdAUaprOyqiLy2+c4FE/saTwGXWhnpONXj/IgASbEJEmDfxcJF+daBAU3bCDumk0lmsNMiVtahLjHd63hridNZ6xsF6ypdZsSnK33zGM1aGJDCehLe4yav1hEiTLspjkyLXQ4RIbULmY95WCk5ZRYBOrcKWjUoX/thzjef4H1o2l1bW2jGh9Zbgf2Znn3Jx+4EiQy9120yuQGKV5awQTNLq/fKKXenYidcg2AcnXKXTNUPfBIuiZ0MX4Dr71oxnwq3QloKPxQ+/sVd/2aU3GF06RF+gC8nV0E+oiuf/4PqiXljsqJGxq2O24VxcL7It99U7BAQ9qN9pX5SNZLmZSOyjinibulIWkS4YV/EOvVgRw54JWYz2zPUo1OHP/qMuqhrOcuo/wFKkz9Nl4mGwR2Q87aP0CVOeY/yUnrg/mCHLnf/E3WHA75PMQ1YL8QqvSBmPC7vDVA5bGVtFap8ByDhfhuBz8aAq0g2lLI3HGm0/Djn2VpbPhUBxItG1AA6iL72pgRKlqWkrCIHQLn+mER1U1IRIYDr4XW37JI9ThcrzherIDck/h/MIkM1PQgWI5l356/2Uk 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)(46966006)(36840700001)(40470700004)(186003)(2616005)(956004)(107886003)(83380400001)(47076005)(1076003)(336012)(16526019)(8936002)(2906002)(70586007)(70206006)(44832011)(30864003)(356005)(40460700003)(86362001)(5660300002)(8676002)(82310400005)(4326008)(6666004)(81166007)(26005)(508600001)(36860700001)(82960400001)(36756003)(6916009)(316002)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:39.6842 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7da282d0-d3c1-4555-b658-08da28dd42ab 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: AM8PR10MB4145 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=dwF0a8Gt; 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:fe1a::61e 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, 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..d8cb93ad 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" +IMAGE_CLASSES += "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..0c6d29aa 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" +IMAGE_CLASSES += "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 44fe8af9..79d0aa63 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -5,4 +5,4 @@ DISTRO ?= "debian-buster" WKS_FILE ?= "efi-plus-pcbios.wks" IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" -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")