From patchwork Tue Apr 5 05:24:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1654 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:03 +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 235DOtrK023868 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 5 Apr 2022 15:24:55 +0200 Received: by mail-wm1-f63.google.com with SMTP id r64-20020a1c2b43000000b0038b59eb1940sf1162852wmr.0 for ; Tue, 05 Apr 2022 06:24:55 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1649165090; cv=pass; d=google.com; s=arc-20160816; b=afo+tif1HB4mjzZSBaKb5hebD3IoYzSFeId4PnwE7pAqLK/jUwZK79fPXy/DEIP0dE fb7gkdqKfZkBHvchfuP3KLyJyOimvJdDpkQSQYZKxF6kKKttHxthnoDzPjYk5P9tHIFT oTMNz6kYe11WKtiM/mXNhA7S2FLKEKxQyckj9ImueEOgK2peR+sCCehmGmhPjM5PlkZY n7tWfnhcUHRic6d1XDasr296Px2xy/LQlF4DvlEHIck7pleuUTjpIg7Bw1K/lLrt5yE1 TFbxP4nafGoVx76PUM8uKiJaFFKyObwMQ8CM4yZI0FF99Y91tc0YI2S+2K14kRtvvDrr 6eNQ== 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=ELwkx5WX/J1GW7wHnkrrMBNBjdhmqUMgMMfGL6YrcBQ=; b=UkgJc3IOdy8CDgdrg28vsjo33cw6EDiEuHDZFTD0MhAFk2534hEASLT/rn8bVSqfAD +zume/1X1c6U5IpYA6b1uQqIcI81XPCjgsfcfF5aEXAgI1pm1o7Cj9wY2AUOHLnUbnt2 Uu0TIKRC9faHuD3SkQaiCr2MuY55CKhuzvSfjjHKZaCJkweXnptVv9dljgVnhWDwS7lT 9m+bUwwdKHVsoaIWz609zch7h+pOKRd18ZeXgjtB7PCvvJ0/yxAUmjR3xu7fd54FRD23 walVfhlq4drTvSuqCRurXs+Q3AErWpSApmr6+xuRqaaYY8gPLhWlkLQTHIdKpVDoEMQy vQsg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ILO8Wwl1; 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:fe0d::616 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=ELwkx5WX/J1GW7wHnkrrMBNBjdhmqUMgMMfGL6YrcBQ=; b=iktnWxepkn+hP7D37e1DasR72fHROG84V/BCEzXLtlDZ9aUL8J7EXnyBL+OC2tmNn3 ahxcn4ou7Hx23DzCv3bYdjdGcpmo/lkI+AIlDHG7AruisPC9VwjV4SCFsmr5JUy6uezr tT07UfS44tfM9nJSPcqiDzE75zbSmdHK09MnbPAVWpejN4gV7s7UBAc9JuBFghb/jJKm IU3zPfq2v50Exf0OAluok5Dg2bPk/5LM0xeFEhKqeVijh3+NANMocO+haAYju8LHE9qq PMPtxrPCcgeka1DKaoEnognmuoqOmdGXYSibD0NZUCsBJ73DPXVF3lrkSAqexxaleWmj 579g== 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=ELwkx5WX/J1GW7wHnkrrMBNBjdhmqUMgMMfGL6YrcBQ=; b=4yhJc8gXvtVTG+fOUxe2YWTT1WTR643hmN5cHqRikgEr/ictjYrNbBUGMuhGDIQAb6 0m++OPnG/pIS20Jf55y0KSIBCpUcuBIg3qWO3iaZAGNNmWaW7KF0xu1ZqQ+J/oO/Ic3A Mp4f6KAp8inu9pkdKk0ZmLBPf8FzHTPZN4loWq6SIuBfLLElLkN/APhKEXeTixV8HWku hgC/WWWxnMqD6xvSxu9A2y4HXEjH+Oc1Q1gWZXxE2i30DMw2pYy+Sa6qr2jXbj9yWF6K qj/A9/9OsXglqzjihdS23pN+52cfdGR5icPFz6lNodReGsQSClGBEK1GGCiMHCBy9h9i Wtww== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533wiJ2e+OPYKsyWIsgXScQOEiSiv6s03/EfdIRe+evvRVvH+lOV qY9bvYUAdL71hLTT4ZHg9zI= X-Google-Smtp-Source: ABdhPJz9hQEaGhIX50zAeghCrWf8l/clkbXKK9SJhBTF9qdf76dyEOtxq0xFBVP0YI07leA4uglcRA== X-Received: by 2002:a05:600c:3511:b0:38c:d035:cddb with SMTP id h17-20020a05600c351100b0038cd035cddbmr3155590wmq.74.1649165090380; Tue, 05 Apr 2022 06:24:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:4e01:b0:38c:9f99:b05 with SMTP id b1-20020a05600c4e0100b0038c9f990b05ls1362986wmq.1.canary-gmail; Tue, 05 Apr 2022 06:24:49 -0700 (PDT) X-Received: by 2002:a7b:c5d1:0:b0:37f:a8a3:9e17 with SMTP id n17-20020a7bc5d1000000b0037fa8a39e17mr3093080wmk.109.1649165089556; Tue, 05 Apr 2022 06:24:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649165089; cv=pass; d=google.com; s=arc-20160816; b=EU8v6nGPblN1Fsq7CQpIFu4qiCvN9zJXObJrtHpG+x3dgvBcpHVU/WRHnS+rkb1IyF kVVvxcrWmmB/R9CKu+uAZhS5XiQBKjwxo1bNTtUUiQ5VV0sNJuks25zCR+i+m034Ueqp Sim7kL1xEg2Y/G3pzDlwkLjwSO15VTI7LcJHv6xmxwuKCpVTL8qVq1CngskBYSTy/+89 ZBIEGeYmnO0JpWCUgc6JEHBa0CEEqWnuS7lyq4UtOfr1XLa7VKQxtRJ8C33EIDzr+/iG PY2flZUEpVtnlhmjS2ha1IEDqAgCgXgbOv8s7Zn063thmsdWedl06qSwIMOUMDstd1+3 Q2NA== 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=lHIplNhv8qWtlvk26nKUEJeYn/eyjq7hYZi/ZPRUhZ4=; b=VQn2LYMaq8ScRD5je8VnaBNnNhDS9f9/5rHbPDfv27c1gpu0Ua6UBdwp0zJBkm1zdC 5MG3WHv2mihCgb4JKaL7q40WpW77gEbshxuBS0zTDkVQCrgZPBa3YU75o6pD39jgFJVE neB82dDj6l12I/Wkny9Lg3VJnUAnFEcF8siLZilf0wSgrSUolIAsqHH74TfZobwrQtW8 sx0pNUeNsKKTZSprHtax93fXOXFlLQ7BSM4Phn406f5g2GXlycN5vZ6aHuEOkeW6xzPG CSb8e0raxHVtS6ZsBHCHdVl3EETtYMjb8BODxINhDiEi3gJ+dzcQcqdbir4FZNzUNvgw s2Pw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ILO8Wwl1; 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:fe0d::616 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0616.outbound.protection.outlook.com. [2a01:111:f400:fe0d::616]) by gmr-mx.google.com with ESMTPS id o6-20020a5d6486000000b00203d9be074dsi720255wri.0.2022.04.05.06.24.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:24:49 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0d::616 as permitted sender) client-ip=2a01:111:f400:fe0d::616; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BkcUKi0MOheyKgucq2c6j+ScCw1g9HPlb+ThHUObfVDYNRCKkS+hhbV95kRGiAbUW3VJ23vfyCTHXnlHPgxng5/DwdlecA279cLISqa1q4ERfGa/HP22m49jCffoVJHOhs3kKIaIfPDdT0eUw5GwYlBhpp+Z++K03HdvlWKMMNznTXJ8qp8bfm+1JbJIFBcGWklN0/SxEbyy0ZICLutxhLkNoaN0mS3pW/bDXIuQDwjnv4aZpc6h5/2WyOLvm7z29ijc3WlzPDPCmC02FfHowOUlgZPJIUhBIIzmqTGP3Qrju/FW5WH+vahJsTDyeMsOXHzI0El3a4QizyyX9uuoUw== 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=lHIplNhv8qWtlvk26nKUEJeYn/eyjq7hYZi/ZPRUhZ4=; b=nl6uE3ICcM2PfAiH+wA1u7wLxUlJkYN8oIPQV1RYfXxFt6kqeat3MD8cHQTDWwpKxi7XH4uEhD8b+vKBWlZ1sgKn7a6jkGaNIo+YoQAa5X4A/upoHlJN8VDcirEn///aSn71l1SK3uWOzMjbuZvfgmdSRF7Msmnv/nk0UqpygEImpnQ9MKuZkcWuPGFqwvf2wKu328++cunK6kvxnEyQp6Sjm0FFJXJ0AdJpK+DgM32Kr8UhjPxQsfEnYMoNgZ7ol2MkCzK8NpXEpjvwFqlJshlQopB5iEHr711JUGg/rMfjscbTMZfW68HDux+cQ0tEr7ZYNzZEAhh+3oF47frycQ== 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 AM6P194CA0104.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::45) by AM0PR10MB2580.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:125::20) 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:48 +0000 Received: from VE1EUR01FT101.eop-EUR01.prod.protection.outlook.com (2603:10a6:209:8f:cafe::7d) by AM6P194CA0104.outlook.office365.com (2603:10a6:209:8f::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31 via Frontend Transport; Tue, 5 Apr 2022 13:24:48 +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 VE1EUR01FT101.mail.protection.outlook.com (10.152.3.40) 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:47 +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; 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:46 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v2 1/7] image: remove IMAGE_SUFFIX Date: Tue, 5 Apr 2022 15:24:25 +0200 Message-ID: <20220405132431.2895832-2-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--10.336100-8.000000 X-TMASE-MatchedRID: U8xOoY+QaPkQwVtkLIfLLXr9azWb8PX1hi9FMLqxZlReu6aRt5rYyff6 ZSoNZQrICwWRLqiC/Uoz1brXqR2bWa3aC25avUuaOUMH3UOqTuB4lxq7pFBUUY1GwXh+kBzqmTM khNp6sQUvfU/riSJXkQXkFZhSLf2GCBG3yFdIPKTE1vMT2mVskU9h1xunNeYiq5uw61JZjZCAMu qetGVetnyef22ep6XYymsk/wUE4hpjsiBcbMhSNJrZnYj+vHC7IiAZUM9BuJohYe1qMYNxlzw4f ZjFWN0O X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--10.336100-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: B5E830EAF820447301BE2D146F49BBBF2E0C9C7257FA46173CE1E1321AEA39A52000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d94666a8-53d8-4701-c162-08da1707a825 X-MS-TrafficTypeDiagnostic: AM0PR10MB2580: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: HP7iIjnJl7daI2IceAFgn5pOetvD3JpCM0mK8Sb7RpNNo5HgRqFA7drD/7aigE4fsavPhKLsyBTuxdK+yDQSn+gwaw681gVv9ojHICwxoU6guyDz8NRD5nF1M3waZeSfYFmBclLp3TWbgYKbzlxJoU2r/3MhX4b+ogo21rebq15Ho5kONPLwgw/Lm7pkTNrfv7MqsAvlUhSBWSx0ehikvj73te2OwXNG2atM8Q7QdTGxklK3vxkLQhK6jTxsmKpTx0n9XjYNXYzCQuOHCAtQB19k9w5kozVnSGtHkTgcCyP4ExOFmv1cMyl2gLT9X2lZ/5vFQ9lbaQJQ/Vkb2q/HTWqoqREHH4mo14Ozb31amY3sySMmjTpuIU5ntTpMdaZ8MfWulCecqV7wRYeU57YNP1CSIASnfZHFSFECqwBPDFjwVsiz2vG7quRSRmudm4vT40UFqUZ5Sk9Vff+cwvstUQa2JDtWPrnfJfbw5W2M3xpRtYWZnpUZ+7gSC7vSrGqOdVgQ01213nVCOmSCN9gi29N44JFIX4YP7bZNGbKgQWGTcq6DqY8euJ/ef+vdn38Vd+HG+S6sEg3BRQOTgE+DKKaY/nW5gfg2eyHAfl/Iypq/0tXkfmWcubBUYe16jrTsiMilkN/YjJGEwbF2UikSuJTPaBb/SE/3FRj0zSEev1Ou1hRMRW/3zyTY9kTt3q/+VftHplvgqchxdemJ1mLakoPN6fusZoIO/yEcpwZfrUjK52VZRbZyuhpjCmAUW6+7 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)(4326008)(8676002)(316002)(6666004)(70206006)(16526019)(508600001)(70586007)(186003)(26005)(8936002)(336012)(2906002)(1076003)(107886003)(36756003)(83380400001)(2616005)(956004)(6916009)(86362001)(82310400005)(36860700001)(44832011)(5660300002)(40460700003)(82960400001)(81166007)(356005)(47076005)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:47.9093 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d94666a8-53d8-4701-c162-08da1707a825 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: VE1EUR01FT101.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB2580 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=ILO8Wwl1; 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:fe0d::616 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 It is no longer required, and removing it enables sharing of rootfs data between image types. Signed-off-by: Adriaan Schmidt --- meta/classes/image.bbclass | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index eb879ffe..8899d1e9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -1,15 +1,13 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH -# Replace possible multiple spaces with single underscores -IMAGE_SUFFIX = "${@'_'.join(d.getVar("IMAGE_FSTYPES", True).split())}" # Make workdir and stamps machine-specific without changing common PN target -WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/${PV}-${PR}" -STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/${PV}-${PR}" -STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}-${IMAGE_SUFFIX}/*-*" +WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" +STAMP = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/${PV}-${PR}" +STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" # Sstate also needs to be machine-specific -SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH}-${IMAGE_SUFFIX}" +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-img"}" @@ -29,7 +27,7 @@ INITRD_IMAGE ?= "${IMAGE_FULLNAME}-initrd.img" DTB_FILES ?= "" # Useful variables for imager implementations: -PP = "/home/builder/${PN}-${MACHINE}-${IMAGE_SUFFIX}" +PP = "/home/builder/${PN}-${MACHINE}" PP_DEPLOY = "${PP}/deploy" PP_ROOTFS = "${PP}/rootfs" PP_WORK = "${PP}/work" From patchwork Tue Apr 5 05:24:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1657 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:14 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f57.google.com (mail-ej1-f57.google.com [209.85.218.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 235DOwg0023888 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 5 Apr 2022 15:24:59 +0200 Received: by mail-ej1-f57.google.com with SMTP id jg2-20020a170907970200b006e7eebce76csf3074299ejc.0 for ; Tue, 05 Apr 2022 06:24:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1649165093; cv=pass; d=google.com; s=arc-20160816; b=ridsXhPk5ImK47/7r/K9AtfiQaFNrHmCLhjxqEZegShOxfTFTagw0hEPx0lWeyshbp 9z8y29FfmJbgaLyAT21Ci/3NeB/TuuVCJG6agso1Km354I0mB4DpE4ILUXza5PCcQxhO xzFoCCzrGGWCuwGOeKD16ydwibOnvVsKAB/6AXjhJto9iu2ZKdNDa6LAr+TkImLUN7Dq q284SDrBxfZwcWenVW9LBw04fymGD9i8owTxp6OylFQhekELUMSPDzf3ivgLkO+sMjLg IoG6ANHsUB2qnO8iEX9fC7otnFAO5R5pgoRtgbDWfB8ezOgUZgfFsTOiNDMjjSA2lUnz ubdA== 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=9joYmTpQPUFb5DLINjbr1jlC4+NZwbHMmCFaAw2T0jc=; b=jgPfUKP0/WoMmtDGlT7RKYxhk72+CX/Eqsej08IPzZ8tenQa11Xf0RDtVeQhnsfzGc wepchORlEJTiCN0QO6PRedRN/QkLfaBC4KezX3J7cGFIhnp+P7db1mddlPnSTqg+caHk 6YEO89VdyY9cFvKG2eRZ2TSyq8B7Zu/zTj6x3PLPx/SBi2NsUmXiyT1ZsYRKOj6bHaEG j3JX2/WHGHiaJJkcrup5YCglBXhcCwdf72HGtIS8w/M+EojMch+1fdu3yadmDgEnrGXS gOmMgURuxmYMMP8LqtN2IaiGq5N1MxIWrf7rbmi3W0r/ID4Sbm9mel9eVRVCCp48FFEv Mdjw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=fmE4xyug; 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:fe07::62c as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=9joYmTpQPUFb5DLINjbr1jlC4+NZwbHMmCFaAw2T0jc=; b=AFaJAVWAFj03JlLDVYFtsqbvmYBfe5bvnWhyqX0WiNKukdFtuD6c7xEQy4fQkplgLX gCN9D7H0tacmO2207jt8LDwuAhqvSU3xhtFLaq0V94nEed0pse/SYUPKk8x8JBoi7qtW lyEF7t09bVib3s7G9fN6In0NI/JlsGTTULaWqRnc6wFXe9psAfsiHfYBfupPsgjRPo9C qw4jSU+E2GqfavYgedpqeq4PQIH8tlyEumI9bFK/dgiJm/Ql96Jdw8GR0okPsiYRIQvu 8yvMuGUOiWLX+srUzm5IwrNsNM5+l5xIc0gxOu1jGOeF5gXYm/vKaJrpyCdADNmVISSK mbKw== 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=9joYmTpQPUFb5DLINjbr1jlC4+NZwbHMmCFaAw2T0jc=; b=5ALJctrZD/x3tMxg5MJAsQ6RcSMTTk1AiyoRivmtONcpy/CqJi4zqAl2AevlBL21eg 4ylu2U4mCy3CmJNGPeEgi7xGKM+0vk62Ir5pfHYUIpEky+yQywyEVgag1zFWTcFWUKSk FSOjMZdSIY2BwS/0JAQadDfpDafWEr7rheX33jwl8U9r8CmTHzDhW/4o4r42QSy/egim 0fV51fEMF3lWqX2iIBq0cqZWlHH+AgbkqxBLP+wYXb5MNKurQ/ubyneLd2qrD+076JKh Adm4sznwK/w/4FLWguT9EimSJI8kaQbzhsTeXZnICEOBcnz9azQi+iWaLOgYF5qxho4f rhkw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531WfbKetBdUHySYRTFZ9jiHvV5uAG+nTSTXXVuOeO9Z04Duwnt5 szjlJohPstwLL4DLfXsyO5c= X-Google-Smtp-Source: ABdhPJzfE59GEJOyCpWpwr9nmo0xGVL94NCQwboMWMjvwFsbf82GaUvxhibzBIecQbNwIDsZSFBijQ== X-Received: by 2002:a50:c00a:0:b0:418:f10f:b27c with SMTP id r10-20020a50c00a000000b00418f10fb27cmr3552011edb.204.1649165093624; Tue, 05 Apr 2022 06:24:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:9622:b0:6e4:ed01:20cd with SMTP id gb34-20020a170907962200b006e4ed0120cdls995515ejc.10.gmail; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) X-Received: by 2002:a17:907:c16:b0:6db:1dfc:ca73 with SMTP id ga22-20020a1709070c1600b006db1dfcca73mr3616512ejc.192.1649165089925; Tue, 05 Apr 2022 06:24:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649165089; cv=pass; d=google.com; s=arc-20160816; b=rhIS34uNcZBWMD11ytS/vFDDcAcGGSxQrmnmwdPJE+ZxOzUv/Ockhsr2Fh9CHiLCy0 m9mBwPhA4idpgzoOPBuepbmr7OijCvS+JNLHLuA9cIPAW7Yqr5g9v9Epz6btz75NHVOo IdqdsHwaq3DXFUcNte7NsNSlVcWSgjJo90wIa3VQvjPhpQomuK3aV8Hqd3fz2k8t0azC uVUv5TNNdxy0etm5WxHjZGSgAoSmxLAZgdffivQezaONelJ0OXf8sBtCQELTM8zMm2Vl S9MnNDzXPBPTPnIerWmXfgm5XGmoJYPFGG5/o6wWCfvuDA4S1EmQYG0KwqxeL4PA44UI nw1g== 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=YomxRyA9UsNvI+vDY5eZpPX9e0PnJ57IqJe8284t1zY=; b=aXLsW8YU7kvm+hajHssKYJlBqGSSmf/PuYKh2cNpWwJ3toyM57FQq4WzylOG+Ysnwb 5Zl/B5bfqDBKTuqfjV/7lCHhNSoxgh23N+POREgTbW/cAqwtcnz0sWGF9JnQqK8YcJQ8 XEww5xFMqSSNWQDcL/CCofEer6vVAH3L38iMJYMsZAH2v+V7S6DvTiclMWMfsL3nEfq5 KLCRD594TbJcifu6LOwhTNYyNmfbm2HWBKDEaeomlaEJVGxcq/lyfMVpelfWqlDxYr3y wn7juPLMlZ/7lnecVxK5fuNlePN2NK/VzfxzDeTO3WHRKoEkkeaJ/5l8eNkrUUgzYB8O 83yw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=fmE4xyug; 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:fe07::62c as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-am5eur02on062c.outbound.protection.outlook.com. [2a01:111:f400:fe07::62c]) by gmr-mx.google.com with ESMTPS id i7-20020a056402054700b0041b5ea40609si697823edx.4.2022.04.05.06.24.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:24:49 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe07::62c as permitted sender) client-ip=2a01:111:f400:fe07::62c; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eg30yuVKE0nJc2qFYHHN0Be0f3Ob/uKp8cmbO7ra8nzEVcg/qaiC9+x2Uf6m+/LUmiuhxG6/nzibVOX53aRunFPId6AzXWMkSwPmV/5EUd/iuxSn63/1200QSWLRCDXawOkou5U/uEa76bTy8YLr1ATcf2Myqs/WsQYsYG9y5VRQpU5ARK2lxhcVgGxig7CMls4Xjgd9O5P2/7URmr/DHSZxvK9VXq+5lPzcrOjgyUr2f+AGoYTChgLaTgiPPGC9AkVBIi1+cN7pHTKlym0cWxtKsSznQQdCixk9NL6YJqqo8dkp0UBl0Yw+PfgXMR9TfRwL/OKdc+bUMZgBcI2k6w== 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=YomxRyA9UsNvI+vDY5eZpPX9e0PnJ57IqJe8284t1zY=; b=nOx4IziOWRyITiHFNa2JD9Oy5tkzbbUaKcLo6A7CUOVf2ENKb3uaP7RMKWYpwIHm0Yhyrlc9cbtp4L7WWnu65o4yo0ZDsUU9CcbxBtOvmrE7WGwatTfBwlVoi00It9nUILTfm075tqsWU7AQym7tj8g2OiRWz12226L6oiTq5iQ3PN9lpurWX/Ce/3HwouSNA2tEU0mQl1ujzcEM407A7Jr6cf/s46s6XrJGO9xHJhgnSHiUPyzDHkiGZHwyxqQFRIEOdPDmJHpxDNL0K9zIzqodqgdSzXu+fK4ZUjRWlgSEUar0L/S1sqUrE6mvBsKa3G95bO9DyTl06x31cFUFgg== 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 AM6P194CA0080.EURP194.PROD.OUTLOOK.COM (2603:10a6:209:8f::21) by AS8PR10MB4646.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:337::7) 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:48 +0000 Received: from VE1EUR01FT101.eop-EUR01.prod.protection.outlook.com (2603:10a6:209:8f:cafe::40) by AM6P194CA0080.outlook.office365.com (2603:10a6:209:8f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31 via Frontend Transport; Tue, 5 Apr 2022 13:24:48 +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 VE1EUR01FT101.mail.protection.outlook.com (10.152.3.40) 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:48 +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; 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:46 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v2 2/7] image: refactor SDK Date: Tue, 5 Apr 2022 15:24:26 +0200 Message-ID: <20220405132431.2895832-3-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--11.446700-8.000000 X-TMASE-MatchedRID: f6Rj31JPTe6T5dDfN8TpsRjGdv/OQelyLFD07/Dk8EbDJ+l7OPOolSUn Lzk1+IxzzwO4AjhpI8hyKMxmuvaJnZ/pqLrD52g7aQCt577mlyTzeC+Is7Gv5OcFyNaDjVbg6qG 5M9QNAO2H4I6QZJ07kYdYwzPgNbi6vDxegIKDqbqaF7+MAnd7vAFPyo0NTF0myl2yL95kDWNMkO X0UoduuaShvRjfn4cUXsmnlayA9wlRQk2usXqRT1Tc4Z0AZzK6qj01FlWBadqTeuX4xo2DEHHv4 qNcyiZVHeN0FoxUAvrwr0hp4ZyVdSVHmJGtieUtwQzLZR+1m08rHEi7S0KU+W12v13Qb606UXlp 1FHYSPWQc9WQFO7fU+yA7WWewtfEE3RVIIrNFYDA2ZaU3Vq+6gIjBs/56eDrhLMcPZH93bxF5qV UCGhwT8j0QMA/92m2KUD+tLTtC+F08SF1pHAaTiiduIFM7gsu7DLY2FGw/JtyMswwR1sr68tDHw 9RrCNbIFBEE5CFomI0fAEAYiHbyxLg/KpeJ9kUHqmH5intJM5GPOixR/euoUOTmmhJhc2XMsovp /h9OdFirg8tJChsdMZE1hoM4QIsDIaK37rz7stMFByGxeT+yOfjMrfHxUqlqhcdnP91eXF+CWCc HScOEwrcqCL3+emlPVGDVAzeGHwtZpudd3exsVQFP6X4GAcenPekcWtexz3o5fsYXP0fUIQu+Xf LPysKeI05t861ylGAvBJAefUltNnALnxpVDIzMNGhuzepJ+g7BOj1lchJLKubsOtSWY2QgDLqnr RlXrZ8nn9tnqel2MprJP8FBOIaHyQ+JiGcJ0xbpNyG/Logpxtp6S3/1ZGBt5sNC9xcpR7Q4Q3Ht vvQiw== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.446700-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 03AEC43A661B5DAB49AA20A0571197581F048A19183B85770F2FA9E5A6111A372000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 87cc8066-025d-4f7c-5a38-08da1707a87c X-MS-TrafficTypeDiagnostic: AS8PR10MB4646: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: XHxHYtaocwPQ9IhrB0+is8cm8nPdtNUm9S5aICAFqzKQKxZ/bkNdmOL4oR/Q6P911EKdmrb/wOYXCCM4JGTdUG8gno4ZBUjrHnR8+k/29bVE4dxFQcaxZWOgKbigaAxrOTngCsWz0tBmJH4LNFnFwyGf2i1wYnLukcaP1UeZKEaJZVuM65oUyiWm6CceTmur8tyBBpWjXuVZguTRJMklG5f1bUAyC4t9PgA0UY5Neqvrl4+epNsQDetMmiwX7RXE1NQIPKRqTSCfZeG6dRzioMnv2uM6+SJU+LEbKKhIzZCBQpc0GDhdoo4qyY8qKNncx3wr+CFb2vRxHqEyfNDer5vGMSJTYPAELIykGomphPyaS9/2oKIZLKrSi2aMOgG/gNamca2R0/ml8xZVnQ8XOpMi2nbISYfvKtBHC5uY9Jb810nhmLU5uzIJdg03PkemUfBysO6dV/4h9tN/R0Tx7wnzuL7bxme8rzt8X3/XjUyP6WxQ/Xg9oNvXoae+//dLtTdqgxHC3fYwft8NSX9iV6dHxqh6D8iea4Rq6l3L+XBR4rVt2cM8ty1r0JbkxpjF48zNKiI7o/p2cAstkXZ9kQcY3o87TwjU81lmLfmrAdcoObBHpxZJxIHwnRYyVmKFCF28jPSiPcuoEwqvfM256jL5D1QPGLFWJoEPluInxLxzyI+gXqJXbzznnSg+mm3vlEcgKeXPNl/N79z/UajDaQ== 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)(40470700004)(36840700001)(26005)(336012)(186003)(16526019)(1076003)(47076005)(8676002)(4326008)(6916009)(70586007)(70206006)(36756003)(83380400001)(316002)(86362001)(36860700001)(508600001)(82310400005)(8936002)(5660300002)(2616005)(82960400001)(356005)(81166007)(107886003)(30864003)(6666004)(2906002)(956004)(40460700003)(44832011)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:48.4759 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 87cc8066-025d-4f7c-5a38-08da1707a87c 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: VE1EUR01FT101.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB4646 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=fmE4xyug; 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:fe07::62c as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 - turn the image-sdk-extension into an image recipe variant (requires renaming of the class to `sdk` to use BBCLASSEXTEND). - put the logic from sdkchroot into that variant - turn the remainder of sdkcroot into the package sdk-files that that is then installed into SDKs API change: SDK_FORMATS now has the same semantics (and knows the same formats) as IMAGE_FSTYPES. Because there is no image type to generate tar.xz images, for now the default SDK_FORMAT is `targz-img`. NOTE: this patch does not work stand-alone. It requires changes to the way image types are handled. Signed-off-by: Adriaan Schmidt --- meta/classes/image-sdk-extension.bbclass | 87 ----------- meta/classes/image.bbclass | 2 +- meta/classes/sdk.bbclass | 137 ++++++++++++++++++ .../{sdkchroot => sdk-files}/files/README.sdk | 0 .../files/configscript.sh | 0 .../files/gcc-sysroot-wrapper.sh | 0 .../files/relocate-sdk.sh | 0 meta/recipes-devtools/sdk-files/sdk-files.bb | 26 ++++ meta/recipes-devtools/sdkchroot/sdkchroot.bb | 78 ---------- 9 files changed, 164 insertions(+), 166 deletions(-) delete mode 100644 meta/classes/image-sdk-extension.bbclass create mode 100644 meta/classes/sdk.bbclass rename meta/recipes-devtools/{sdkchroot => sdk-files}/files/README.sdk (100%) rename meta/recipes-devtools/{sdkchroot => sdk-files}/files/configscript.sh (100%) rename meta/recipes-devtools/{sdkchroot => sdk-files}/files/gcc-sysroot-wrapper.sh (100%) rename meta/recipes-devtools/{sdkchroot => sdk-files}/files/relocate-sdk.sh (100%) create mode 100644 meta/recipes-devtools/sdk-files/sdk-files.bb delete mode 100644 meta/recipes-devtools/sdkchroot/sdkchroot.bb diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass deleted file mode 100644 index 052c1b58..00000000 --- a/meta/classes/image-sdk-extension.bbclass +++ /dev/null @@ -1,87 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT -# -# This class extends the image.bbclass to supply the creation of a sdk - -SDK_INCLUDE_ISAR_APT ?= "0" -SDK_FORMATS ?= "tar-xz" - -sdk_tar_xz() { - # Copy mount_chroot.sh for convenience - sudo cp ${SCRIPTSDIR}/mount_chroot.sh ${SDKCHROOT_DIR} - - # Create SDK archive - cd -P ${SDKCHROOT_DIR}/.. - sudo tar --transform="s|^rootfs|sdk-${DISTRO}-${DISTRO_ARCH}|" \ - -c rootfs | xz -T0 > ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz - bbdebug 1 "SDK rootfs available in ${DEPLOY_DIR_IMAGE}/sdk-${DISTRO}-${DISTRO_ARCH}.tar.xz" -} - -do_populate_sdk[stamp-extra-info] = "${DISTRO}-${MACHINE}" -do_populate_sdk[depends] = "sdkchroot:do_build" -do_populate_sdk[vardeps] += "SDK_INCLUDE_ISAR_APT SDK_FORMATS" -do_populate_sdk() { - local sdk_container_formats="" - - if [ "${SDK_INCLUDE_ISAR_APT}" = "1" ]; then - # Copy isar-apt with deployed Isar packages - sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${SDKCHROOT_DIR}/isar-apt - else - # Remove isar-apt repo entry - sudo rm -f ${SDKCHROOT_DIR}/etc/apt/sources.list.d/isar-apt.list - fi - - sudo umount -R ${SDKCHROOT_DIR}/dev || true - sudo umount ${SDKCHROOT_DIR}/proc || true - sudo umount -R ${SDKCHROOT_DIR}/sys || true - - # Remove setup scripts - sudo rm -f ${SDKCHROOT_DIR}/chroot-setup.sh ${SDKCHROOT_DIR}/configscript.sh - - # Make all links relative - for link in $(find ${SDKCHROOT_DIR}/ -type l); do - target=$(readlink $link) - - if [ "${target#/}" != "${target}" ]; then - basedir=$(dirname $link) - new_target=$(realpath --no-symlinks -m --relative-to=$basedir ${SDKCHROOT_DIR}/${target}) - - # remove first to allow rewriting directory links - sudo rm $link - sudo ln -s $new_target $link - fi - done - - # Set up sysroot wrapper - for tool_pattern in "gcc-[0-9]*" "g++-[0-9]*" "cpp-[0-9]*" "ld.bfd" "ld.gold"; do - for tool in $(find ${SDKCHROOT_DIR}/usr/bin -type f -name "*-linux-gnu*-${tool_pattern}"); do - sudo mv "${tool}" "${tool}.bin" - sudo ln -sf gcc-sysroot-wrapper.sh ${tool} - done - done - - # separate SDK formats: TAR and container formats - for sdk_format in ${SDK_FORMATS} ; do - case ${sdk_format} in - "tar-xz") - sdk_tar_xz - ;; - "docker-archive" | "oci" | "oci-archive" | "docker-daemon" | "containers-storage") - sdk_container_formats="${sdk_container_formats} ${sdk_format}" - ;; - *) - die "unsupported SDK format specified: ${sdk_format}" - ;; - esac - done - - # generate the SDK in all the desired container formats - if [ -n "${sdk_container_formats}" ] ; then - bbnote "Generating SDK container in ${sdk_container_formats} format" - containerize_rootfs "${SDKCHROOT_DIR}" "${sdk_container_formats}" "sdk-" - fi -} - -addtask populate_sdk after do_rootfs diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 8899d1e9..f87b76e7 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -78,7 +78,7 @@ ROOTFS_PACKAGE_SUFFIX ?= "${PN}-${DISTRO}-${MACHINE}" ROOTFS_POSTPROCESS_COMMAND_prepend = "${@bb.utils.contains('BASE_REPO_FEATURES', 'cache-deb-src', 'cache_deb_src', '', d)} " inherit rootfs -inherit image-sdk-extension +inherit sdk inherit image-tools-extension inherit image-postproc-extension inherit image-locales-extension diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass new file mode 100644 index 00000000..adf9a1fe --- /dev/null +++ b/meta/classes/sdk.bbclass @@ -0,0 +1,137 @@ +# This software is a part of ISAR. +# Copyright (C) Siemens AG, 2019 +# +# SPDX-License-Identifier: MIT +# +# This class extends the image.bbclass to supply the creation of a sdk + +# hook up the -sdk image variant +BBCLASSEXTEND = "sdk" +BPN = "${PN}" + +python sdk_virtclass_handler() { + pn = e.data.getVar('PN') + if pn.endswith('-sdk'): + e.data.setVar('BPN', pn[:-len('-sdk')]) + e.data.appendVar('OVERRIDES', ':class-sdk') + # sdkchroot deploy only for sdk image + bb.build.addtask('deploy_sdkchroot', 'do_build', 'do_rootfs', d) + else: + # add do_populate_sdk only to the non-sdk variant + # it only exists to preserve the interface... + bb.build.addtask('populate_sdk', '', '', e.data) + e.data.appendVarFlag('do_populate_sdk', 'depends', '${BPN}-sdk:do_build') + e.data.appendVarFlag('do_clean', 'depends', '${BPN}-sdk:do_clean') +} +addhandler sdk_virtclass_handler +sdk_virtclass_handler[eventmask] = "bb.event.RecipePreFinalise" + +# SDK is image-specific: +SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${BPN}-${MACHINE}" + +# SDK settings +SDK_INCLUDE_ISAR_APT ?= "0" +SDK_FORMATS ?= "targz-img" +SDK_INSTALL ?= "" +SDK_PREINSTALL += " \ + debhelper \ + autotools-dev \ + dpkg \ + locales \ + docbook-to-man \ + apt \ + automake \ + devscripts \ + equivs" + +TOOLCHAIN = "crossbuild-essential-${DISTRO_ARCH}" +TOOLCHAIN_${HOST_ARCH} = "build-essential" +TOOLCHAIN_i386 = "build-essential" +TOOLCHAIN_append_compat-arch = " crossbuild-essential-${COMPAT_DISTRO_ARCH}" + +# rootfs/image overrides for the SDK +ROOTFS_ARCH_class-sdk = "${HOST_ARCH}" +ROOTFS_DISTRO_class-sdk = "${HOST_DISTRO}" +ROOTFS_PACKAGES_class-sdk = "sdk-files ${TOOLCHAIN} ${SDK_PREINSTALL} ${SDK_INSTALL}" +ROOTFS_FEATURES_append_class-sdk = " clean-package-cache generate-manifest export-dpkg-status" +ROOTFS_MANIFEST_DEPLOY_DIR_class-sdk = "${DEPLOY_DIR_SDKCHROOT}" +ROOTFS_DPKGSTATUS_DEPLOY_DIR_class-sdk = "${DEPLOY_DIR_SDKCHROOT}" + +IMAGE_FSTYPES_class-sdk = "${SDK_FORMATS}" + +# bitbake dependencies +SDKDEPENDS += "sdk-files ${SDK_INSTALL}" +SDKDEPENDS_append_riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" +DEPENDS_class-sdk = "${SDKDEPENDS}" + +SDKROOTFSDEPENDS = "" +SDKROOTFSDEPENDS_class-sdk = "${BPN}:do_rootfs" +do_rootfs_install[depends] += "${SDKROOTFSDEPENDS}" + +SDKROOTFSVARDEPS = "" +SDKROOTFSVARDEPS_class-sdk = "SDK_INCLUDE_ISAR_APT" +do_rootfs_install[vardeps] += "${SDKROOTFSVARDEPS}" + +# additional SDK steps +ROOTFS_CONFIGURE_COMMAND_append_class-sdk = " ${@'rootfs_configure_isar_apt_dir' if d.getVar('SDK_INCLUDE_ISAR_APT') == '1' else ''}" +rootfs_configure_isar_apt_dir() { + # Copy isar-apt instead of mounting: + sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${ROOTFSDIR}/isar-apt +} + +ROOTFS_POSTPROCESS_COMMAND_prepend_class-sdk = "sdkchroot_configscript " +sdkchroot_configscript () { + sudo chroot ${ROOTFSDIR} /configscript.sh ${DISTRO_ARCH} +} + +ROOTFS_POSTPROCESS_COMMAND_append_class-sdk = " sdkchroot_finalize" +sdkchroot_finalize() { + if [ "${SDK_INCLUDE_ISAR_APT}" = "0" ]; then + # Remove isar-apt repo entry + sudo rm -f ${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list + fi + + sudo umount -R ${ROOTFSDIR}/dev || true + sudo umount ${ROOTFSDIR}/proc || true + sudo umount -R ${ROOTFSDIR}/sys || true + + # Remove setup scripts + sudo rm -f ${ROOTFSDIR}/chroot-setup.sh ${ROOTFSDIR}/configscript.sh + + # Make all links relative + for link in $(find ${ROOTFSDIR}/ -type l); do + target=$(readlink $link) + + if [ "${target#/}" != "${target}" ]; then + basedir=$(dirname $link) + new_target=$(realpath --no-symlinks -m --relative-to=$basedir ${ROOTFSDIR}/${target}) + + # remove first to allow rewriting directory links + sudo rm $link + sudo ln -s $new_target $link + fi + done + + # Set up sysroot wrapper + for tool_pattern in "gcc-[0-9]*" "g++-[0-9]*" "cpp-[0-9]*" "ld.bfd" "ld.gold"; do + for tool in $(find ${ROOTFSDIR}/usr/bin -type f -name "*-linux-gnu*-${tool_pattern}"); do + sudo mv "${tool}" "${tool}.bin" + sudo ln -sf gcc-sysroot-wrapper.sh ${tool} + done + done +} + +do_deploy_sdkchroot[dirs] = "${DEPLOY_DIR_SDKCHROOT}" +do_deploy_sdkchroot() { + ln -Tfsr "${ROOTFSDIR}" "${SDKCHROOT_DIR}" +} + +CLEANFUNCS_class-sdk = "clean_deploy" +clean_deploy() { + rm -f "${SDKCHROOT_DIR}" +} + +do_populate_sdk[noexec] = "1" +do_populate_sdk() { + : +} diff --git a/meta/recipes-devtools/sdkchroot/files/README.sdk b/meta/recipes-devtools/sdk-files/files/README.sdk similarity index 100% rename from meta/recipes-devtools/sdkchroot/files/README.sdk rename to meta/recipes-devtools/sdk-files/files/README.sdk diff --git a/meta/recipes-devtools/sdkchroot/files/configscript.sh b/meta/recipes-devtools/sdk-files/files/configscript.sh similarity index 100% rename from meta/recipes-devtools/sdkchroot/files/configscript.sh rename to meta/recipes-devtools/sdk-files/files/configscript.sh diff --git a/meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh b/meta/recipes-devtools/sdk-files/files/gcc-sysroot-wrapper.sh similarity index 100% rename from meta/recipes-devtools/sdkchroot/files/gcc-sysroot-wrapper.sh rename to meta/recipes-devtools/sdk-files/files/gcc-sysroot-wrapper.sh diff --git a/meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh b/meta/recipes-devtools/sdk-files/files/relocate-sdk.sh similarity index 100% rename from meta/recipes-devtools/sdkchroot/files/relocate-sdk.sh rename to meta/recipes-devtools/sdk-files/files/relocate-sdk.sh diff --git a/meta/recipes-devtools/sdk-files/sdk-files.bb b/meta/recipes-devtools/sdk-files/sdk-files.bb new file mode 100644 index 00000000..36cdb319 --- /dev/null +++ b/meta/recipes-devtools/sdk-files/sdk-files.bb @@ -0,0 +1,26 @@ +# SDK Root filesystem +# +# This software is a part of ISAR. +# Copyright (C) 2015-2018 ilbers GmbH + +DESCRIPTION = "Isar SDK Root filesystem" + +LICENSE = "gpl-2.0" +LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" + +inherit dpkg-raw + +SRC_URI = " \ + file://configscript.sh \ + file://relocate-sdk.sh \ + file://gcc-sysroot-wrapper.sh \ + file://README.sdk" +PV = "0.1" + +do_install() { + install -m 644 ${WORKDIR}/README.sdk ${D} + install -m 755 ${WORKDIR}/relocate-sdk.sh ${D} + install -m 755 -d ${D}/usr/bin + install -m 755 ${WORKDIR}/gcc-sysroot-wrapper.sh ${D}/usr/bin + install -m 755 ${WORKDIR}/configscript.sh ${D} +} diff --git a/meta/recipes-devtools/sdkchroot/sdkchroot.bb b/meta/recipes-devtools/sdkchroot/sdkchroot.bb deleted file mode 100644 index e367eae2..00000000 --- a/meta/recipes-devtools/sdkchroot/sdkchroot.bb +++ /dev/null @@ -1,78 +0,0 @@ -# SDK Root filesystem -# -# This software is a part of ISAR. -# Copyright (C) 2015-2018 ilbers GmbH - -DESCRIPTION = "Isar SDK Root filesystem" - -LICENSE = "gpl-2.0" -LIC_FILES_CHKSUM = "file://${LAYERDIR_core}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = " \ - file://configscript.sh \ - file://relocate-sdk.sh \ - file://gcc-sysroot-wrapper.sh \ - file://README.sdk" -PV = "0.1" - -SDK_INSTALL ?= "" - -DEPENDS += "${SDK_INSTALL}" - -DEPENDS_append_riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_CROSS_COMPILE', True) == '1' and d.getVar('PN') != 'crossbuild-essential-riscv64' else ''}" - -TOOLCHAIN = "crossbuild-essential-${DISTRO_ARCH}" -TOOLCHAIN_${HOST_ARCH} = "build-essential" -TOOLCHAIN_i386 = "build-essential" -TOOLCHAIN_append_compat-arch = " crossbuild-essential-${COMPAT_DISTRO_ARCH}" - -inherit rootfs -ROOTFS_ARCH = "${HOST_ARCH}" -ROOTFS_DISTRO = "${HOST_DISTRO}" -ROOTFSDIR = "${S}" -ROOTFS_PACKAGES = "${SDK_PREINSTALL} ${SDK_INSTALL} ${TOOLCHAIN}" -ROOTFS_FEATURES += "clean-package-cache generate-manifest export-dpkg-status" -ROOTFS_MANIFEST_DEPLOY_DIR = "${DEPLOY_DIR_SDKCHROOT}" -ROOTFS_DPKGSTATUS_DEPLOY_DIR = "${DEPLOY_DIR_SDKCHROOT}" - -SDK_PREINSTALL += " \ - debhelper \ - autotools-dev \ - dpkg \ - locales \ - docbook-to-man \ - apt \ - automake \ - devscripts \ - equivs" - -SDK_INCLUDE_ISAR_APT ?= "0" - -S = "${WORKDIR}/rootfs" - -ROOTFS_CONFIGURE_COMMAND += "${@'rootfs_configure_isar_apt_dir' if d.getVar('SDK_INCLUDE_ISAR_APT') == '1' else ''}" -rootfs_configure_isar_apt_dir() { - # Copy isar-apt instead of mounting: - sudo cp -Trpfx ${REPO_ISAR_DIR}/${DISTRO} ${ROOTFSDIR}/isar-apt -} - -ROOTFS_POSTPROCESS_COMMAND =+ "sdkchroot_install_files" -sdkchroot_install_files() { - # Configure root filesystem - sudo install -m 644 ${WORKDIR}/README.sdk ${S} - sudo install -m 755 ${WORKDIR}/relocate-sdk.sh ${S} - sudo install -m 755 ${WORKDIR}/gcc-sysroot-wrapper.sh ${S}/usr/bin - sudo install -m 755 ${WORKDIR}/configscript.sh ${S} - sudo chroot ${S} /configscript.sh ${DISTRO_ARCH} -} - -do_sdkchroot_deploy[dirs] = "${DEPLOY_DIR_SDKCHROOT}" -do_sdkchroot_deploy() { - ln -Tfsr "${ROOTFSDIR}" "${SDKCHROOT_DIR}" -} -addtask sdkchroot_deploy before do_build after do_rootfs - -CLEANFUNCS = "clean_deploy" -clean_deploy() { - rm -f "${SDKCHROOT_DIR}" -} From patchwork Tue Apr 5 05:24:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1659 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:10 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 235DOwC6023879 (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-lf1-f61.google.com with SMTP id h11-20020a0565123c8b00b0044b05b775cesf2396051lfv.6 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=GU2pAiKc/4c24w0XBePdYX3x39O2yqOD/l6mluev+VQ4HSj8SThNmvrp8lG8lmP4jd OwpEcvRUnaaE+rkKX/B79kld7QbJN32v7E5kOF5YRwr4EWyf+AuttCxKL5N3SlouaJPe noA4s4ROSm+x6pA4g8VY2jwJW6q9PPNVgQVv/KPUEbP4dCGtU9Kyrdxf+l5s7rcgQAcA aXdgeZn/mn+BDbM6+nu52Byh90OmnMYmW7RNeJ+/CZCAQEsP/jyGC7K+mjBe5IwktjX6 jQ2uve4KAaATiMaKchEs5mI+G39m8rvNr6/FaZ1ekD0PO7SUDPf/hY5F9Zhnj/pj00PQ JByw== 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=nA0ATvNGfBHDrO8ODnFOvNyUj45Clz1IdiWmEJXUX4g=; b=QXETuY/J3Sux/LRLIUt0/yLVk7v/Ku0LpLDGTZOeDwKBddcNk/kH7Ns8EvXoECbaQ/ vcNmujJylph5QTj0pzg1N3AvUXGXSSF/rCUJPMIhrgMiuCXhYVUmfTTIIwbj5XbcZPh3 s4iI782yNrNuc1nOjrt8TT7CAihkHPUQE5ccZ5ZtTYmpDZbmzBF9sJe6RsT7sfZhfT8R z8CUQ2e8HEFpJ8d0VcuARBCIXHMp0uLED9cRf12pE+C8fsXbL8NoGe/Bbd42K94oDiXD Hy9NRuwEDzvORcuuKRNv/9r9NUv1BoukgkB4qqJjwVKStwpuAQrfv3lp4HZ8hmEOw5c/ 3eog== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YPtG4wye; 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:fe0a::608 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=nA0ATvNGfBHDrO8ODnFOvNyUj45Clz1IdiWmEJXUX4g=; b=IBfY0VphhniKHGeWtRdR+SeKl3OAXYEAzFQ94xxbQQC/lVCOkvp03a/ct4ErMXbGIR cnZ7zv4jUba2X1FeEbM/T3aD58N0QMghjQbxL6xxDAdg8s6ShW5ScuJZr4eCxO8E+9xQ GQjeaQYfHgJ1I/81Zqw6MbuQ9AbVWaarJcKTHo5su9Cs2jF6fObZPkTJVAjtL6ZYXWjO Nq9FWqGPlrVonv2e2nF0A9zB4xoGp6+xpHqG71e43p8WUzZ0Bez35zToONkQW+P9erPB 3GtDgIPJ9OLgqkojfycMIbAgO1DgKIoidWZJFdNmJoIBMDzflq0WZ42zGRmS4IqursFp Jw6A== 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=nA0ATvNGfBHDrO8ODnFOvNyUj45Clz1IdiWmEJXUX4g=; b=T6vMj67wF3xFrXHpyH52y5NaJhTYc+H0DyY1gxLo9vL9vIoROvAbz9ECfd7vLUz8bH Qbui2J2KWXyX1KlfXkRWy2aY0ubDG/9R4FJbWaYrv40xnQAwxxe9knvRvr7Yb7U9Z1FC c/scd64Cx2dcOnEz86RrvMo2OQoVa0YYHqEdDG0b96SvSe0BN7Ngy2EFAStAi7DavqWl GlkbAyZGha/61rnx18ZrmYSnqUr//zY8hX+j3q6YG7MitbQmb/hZ155IucqJN1NA5cZf Vno+52lHxfuUVKnHZXYuSde5QTfBCHZw3JU0mI6aK2pIj4PVbV37dvHh08ID3dXdDfhg lVwQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5338gN1fUMV7tmbjou21dDsWUXQg2FBTvo56OtCKgxWK6ygfUCJU sTfuwK63E4RhZDEZ1djygz0= X-Google-Smtp-Source: ABdhPJztrgonqqzAwOd0vwICBExd0YWS0P2kNCRWzYHDUxR3R0FyRq0+3KIMxa5lcLrRPDnvt4l3JQ== X-Received: by 2002:a05:6512:2613:b0:448:5164:689d with SMTP id bt19-20020a056512261300b004485164689dmr2647389lfb.526.1649165092962; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:3813:0:b0:44a:9ec7:d611 with SMTP id f19-20020a193813000000b0044a9ec7d611ls545208lfa.3.gmail; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) X-Received: by 2002:a05:6512:1112:b0:44a:4096:39b0 with SMTP id l18-20020a056512111200b0044a409639b0mr2645749lfg.35.1649165091962; Tue, 05 Apr 2022 06:24:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649165091; cv=pass; d=google.com; s=arc-20160816; b=FbVH5X2x39OCOlcStRNoG6rwuyszsw/Olf7QAX8eeZ8mf5G3/QkUcTHj3+urQDULaI 1AZcguCPk/uuxr4Y8aHRwDDOCi4wwqvhTfVxup8yizCJog0AiM6Wc0MGqko9CLtWW9UX SGAMVw6bDcFq6RaAgjwOaU7EdSyFhb2alPMa3nYomLYM/0Kou/M6F6GZcAO4fupEJlrr LtZUq0Nr1rEN6MUfgcI3HTryqlNse5+VPwYYhwrs45rMFjkv+3UXTviluQHle+OklcvG wZZA/6fP7CebkpOBDSHIA/M7pZLQM+Dt/6EQet76/1x0hVdyAGyP+YBVT63Ovx4JGEAr aLgA== 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=zqiw5N9yxJfgDuoafUazNHYmzViXlNgVSnhXy7ce1Os=; b=HtWhrK7yw0/KhRxMeLzk8FGMz2Hey6RM9/YzLWLFPgSxEoulcKtq9UIgsrU+5FuJ9Y inHiYci5Yzlc2xtwjkxYtPiuBWfs25Rb8Rd76caUbTDelqBwPiBeQnOj9b5Ah3I+Chha oTYdDL6cFqhqbocr/Hd3wEvkkaGu24O2BTPYfjACl3sNwWh/cbWca/PVdZK0x++HcQkq UTzmZeJFR6s3VQpIR2GrCpfPz93oZvb/B3OSLEUsfYEZS96KSDbgVXMYkQ0oXQOFUkkR ZBlZfVeTOkvRHEnBqTne3miXs9KjK7/+5LNtOeYX5hngL2i+PHBkCTnQGhcXZso0Fbrq E8cA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YPtG4wye; 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:fe0a::608 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0608.outbound.protection.outlook.com. [2a01:111:f400:fe0a::608]) by gmr-mx.google.com with ESMTPS id i36-20020a0565123e2400b0044ada59207csi553655lfv.10.2022.04.05.06.24.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:24:51 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0a::608 as permitted sender) client-ip=2a01:111:f400:fe0a::608; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QCADgQ7mbOEMsUpksV1DIZtPqZ0XuWDy3R6HlBRzRute0+jq3OzXZPaDSnGYAllnKl22unBO2tfnr0LFEf0C7a1UHOyBCbBSVuYUjjFFuDkW4K5FTyQp3rqp0WCYk4EpUkY3VL1ijSdvJKKgy2p3IVBYjDWlaS2s4gOdQ1vRagxKV4Vc3c4aexzjAsVs6L6su4rU7VPsm1W4XgMU64UPWTaqZh1OCPT5elTwhWWmd0XE5JJtTwa/RBF7A6Hv6tX4aYR9mSZEOBNh3yAzk6kHqQTqufp3L2bmH1aAvt7VCIL4DnBb7/ZCyVd9L4uxUCVUrddsKucwJqVnEZG0OUoGpg== 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=zqiw5N9yxJfgDuoafUazNHYmzViXlNgVSnhXy7ce1Os=; b=V8fziSp/z5wVxWzJumU1gDEA7xSAIX9E3nXG7AJUthPHRYZWU27uguaCTNg9mBBCbxiopk4My7immRWu+HNi/KHV6f4spOTDNldn2bVP4pwU4exqCFUoU0eHMRK9qIAjuoSi+v4t4oRdF5b6Dqp9TP/lWzax+gtXbX/uoEAqJqzlUIAcdzIfOrmg2TOtd9FzIPDUoQOkxU/VGrqpclhNm4tkskZEpwsIprSTI0iKjF1qliLz3PRA5S1birybGJ+6Y2hIM3PYqmFoAGBRBr0j/kTzHIFFn1DmlwZD+JPj6uYdwFGQVwMb9IiTBeuKp8oyqCUIMukOBWtbrjHxwQhYnw== 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 SV0P279CA0045.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::14) by DB7PR10MB2010.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:5:b::32) 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:49 +0000 Received: from HE1EUR01FT098.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::e) by SV0P279CA0045.outlook.office365.com (2603:10a6:f10:13::14) 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:48 +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:47 +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 3/7] meta: introduce IMAGE_CMD_* Date: Tue, 5 Apr 2022 15:24:27 +0200 Message-ID: <20220405132431.2895832-4-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--12.558700-8.000000 X-TMASE-MatchedRID: 04gHLlJC4S2KjhO49WcRvxtMufvbmwz+hrD3pNcSx1aqFx2c/3V5cVjW waUPviNZ/gMNehoKqTuPOugxGvLnIvjJU0Xm/BNSypQ4fHj6rguB/H+OOilxfxwu4QM/6Cpy9/p lKg1lCsgXR19nmRX2XzmxtICXCkUOwpZcTMweUzBMrrG8rDAmaE+K6zmZLkA4p7rgqkxHgFTnSS hdAiVGyk2aZutybpc1V/e2x3csJRf2H36ylfVrrqKCxNEJvTR8TzkB7683LnMD2WXLXdz+AT+k5 IvvZ1N/pKG9GN+fhxSAecOigRAlteuop+u1c/uKWElXx2UUcMxpHPhb7pMEQW/6CCblACLhmTMk hNp6sQVWw5sMt9VCxLH4VzREB3QgXcTaTibhQ6ooX6fjWPUAlhTfVlVWxWRBec1y1wrvN8XKII2 XfSJs2UvEK4FMJdoqsocs4UkLS9JGsDdPt+DAPpbrFFwxb/fFrP6YwNCF5LuRgPzABkqxILqzpQ vjy9EAzVgwP7ZMYf/wcuRC9bbiZHQ7cqwFABUDb/+iW2gmXjw/QMF1B4qVfceuFL5UpINxTFQnI +epPIa8e5jXab0QP8VjEEE40kDNX3rc5KLrywNMlj7xUQx4Xk6L74JlBxByjUbBeH6QHOoBDya2 JbH/+iU2i+a38omfXdjnxOsxOOwqrHKrDVF+8yRyoHwqLShw4xinGtBYZzMrUvpNWR2DO805KBm 2/UMh33Nl3elSfsp68AfW6N1gxLuesy4o/Gk/Ift+vU06BvKinbS6HV1jJ8VUBXy8OM3//4+GQc smc+JefZxsQ0yCHg2KH0LgF2+4pWcHTgKw2rGbKItl61J/yZ+inTK0bC9eKrauXd3MZDWXf5sC3 9gVVHNxBnxGfH/U29agO6dvMsO0hVbub24xD3/eCwkDqXmyH8FerAT0dJY= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.558700-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 6E30751DED29298CEFF3E37824FB2F5CE04C3FD18B3767B5E7F309528009368A2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c2d816f3-5179-4f7b-9bb3-08da1707a82a X-MS-TrafficTypeDiagnostic: DB7PR10MB2010: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: l4aC/Az00lcCLnZD3/lCzwlnr5ZN+mAesP411c9kg+98HeWYYx1vpxV0HFs+EHMP7XRnb4tATRAE6OwKKtTMPR/CYVq/4OsWZgakTKTW7Q3EH9+Rd+ToXRIUzthjCQZlMh+ks1v1CWlYioBuw9q6uqH+zGSj9UwlKKY7jd8CcKQ5yIxAH3cEE3nFj52Kw0kCPlQ8o/M3f1VhwPK/VRTRc04Cc0WOcPrhlu6TZ9LqQI1cqXiCQNB4a4cNfynd9zMM75xRQ8SthNU+FS7bM2P44cY5bEl9ZQQLWve4pgSeJ0LFVyaZOL7OZ/awfNwJku+XcN8Ot4pdkFVeaFCDZcuC/Muoj6x0ORLVvuvxTcZ1QdGxDifvRqo2R6Dg9NhxGkj4JdHAQI4Vs8e/RVAAbSj57sXBJ/iounCvsfuLCb7QPr5p6+F5ldd1Dx4alaoe6u2emRei6VKhyY8D/L6DzNyzSSyQUTkXuMI7VCIzz83XzVYMgXfD4e+K5aw3hwmWauy/t3nm9j4It/oh6t8vqisegAIqM1fZtZYgwc2oPxCy5ux/EOyVeemkrY/HuizeuVt5JNQdco80PrrH6wug+mDeVWz3U1NZoZcfb+3e1xSd4kGK3FUtthdEhfeyt8h/xMVezciOTnopNx2NtnEQVR2rp8CHUEAx7lDa0OHZNfnFkxJxlZULJ1yGnwINDnILhl2tMm9+BsuJFfsgecWsBZH3Gj+aH+1vQmlQjAg+J/ErE17ExfzMXmKjQpv6uwx4mepsLLPoPVrqjQnrPlg9naz3dkG/FYISfYTZ6PCOpl/vjQxrKk3rgYnm0Yr77PfmQUu1 X-Forefront-Antispam-Report: CIP:194.138.21.72; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(498600001)(8936002)(47076005)(40460700003)(5660300002)(44832011)(36756003)(82960400001)(81166007)(2906002)(966005)(30864003)(356005)(8676002)(83380400001)(1076003)(107886003)(82310400005)(186003)(4326008)(70586007)(70206006)(6916009)(336012)(16526019)(956004)(2616005)(26005)(86362001)(36860700001)(6666004)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:47.9077 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c2d816f3-5179-4f7b-9bb3-08da1707a82a 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: DB7PR10MB2010 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=YPtG4wye; 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:fe0a::608 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 This makes a number of changes: - Replace all do_*_image tasks with IMAGE_CMD_* definitions - Remove all implicit conversions (gz, xz) - Add IMAGE_CONVERSION_* commands - Create tasks (do_image_*) on demand in image.bbclass for all requested IMAGE_FSTYPES - When creating the tasks: - image_do_mounts is inserted automatically - a final chown is inserted automatically - variables IMAGE_FILE_HOST and IMAGE_FILE_CHROOT are set to reference the image - variable SUDO_CHROOT contains the chroot command - Create conversions on demand based on IMAGE_FSTYPES. A conversion is defined by CONVERSION_CMD_type, and its dependencies given as CONVERSION_DEPS_type - In conversion commands - the input file is named ${IMAGE_FULLNAME}.${type} - the conversions appends its own type, e.g. the output file would be ${IMAGE_FULLNAME}.${type}.xz - a final chown is appended automatically - Image types now longer have a -img suffix, e.g., ext4 instead of ext4-img, and conversions are appended like tar.gz instead of targz-img - Imager dependencies are set as IMAGER_INSTALL_type - Dependencies between image types are modelled like IMAGE_TYPEDEP_ova = "wic" - Required arguments/variables are modelled by IMAGE_CMD_REQUIRED_ARGUMENTS = "A B C" - Container types (previously CONTAINER_IMAGE_FORMATS) are now first class image types (oci, oci-archive, docker-archive, docker-daemon, containers.storage) - The logic of image-container-extension has moved to container-img - The VM image now has type ova (instead of vm-img) Signed-off-by: Adriaan Schmidt --- meta/classes/container-img.bbclass | 94 ++++++++- meta/classes/cpiogz-img.bbclass | 20 +- meta/classes/ext4-img.bbclass | 21 +- meta/classes/fit-img.bbclass | 17 +- .../classes/image-container-extension.bbclass | 83 -------- meta/classes/image.bbclass | 184 +++++++++++++++++- meta/classes/rootfs.bbclass | 1 + meta/classes/sdk.bbclass | 2 +- meta/classes/targz-img.bbclass | 11 +- meta/classes/ubi-img.bbclass | 24 +-- meta/classes/ubifs-img.bbclass | 29 +-- meta/classes/vm-img.bbclass | 24 +-- meta/classes/wic-img.bbclass | 45 ++--- 13 files changed, 331 insertions(+), 224 deletions(-) delete mode 100644 meta/classes/image-container-extension.bbclass diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass index 322889a9..436a0051 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -3,15 +3,93 @@ # # SPDX-License-Identifier: MIT # -# This class provides the task 'container_image' +# This class provides the task 'containerize' # to create container images containing the target rootfs. -do_container_image[dirs] = "${DEPLOY_DIR_IMAGE}" -do_container_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" -do_container_image[vardeps] += "CONTAINER_IMAGE_FORMATS" -do_container_image(){ - bbdebug 1 "Generate container image in these formats: ${CONTAINER_IMAGE_FORMATS}" - containerize_rootfs "${IMAGE_ROOTFS}" "${CONTAINER_IMAGE_FORMATS}" +CONTAINER_TYPES = "oci oci-archive docker-archive docker-daemon containers-storage" +USING_CONTAINER = "${@bb.utils.contains_any('IMAGE_BASETYPES', d.getVar('CONTAINER_TYPES').split(), '1', '0', d)}" + +CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" +CONTAINER_IMAGE_TAG ?= "${PV}-${PR}" + +python() { + if not d.getVar('USING_CONTAINER') == '1': + return + for t in d.getVar('CONTAINER_TYPES').split(): + t_clean = t.replace('-', '_').replace('.', '_') + d.setVar('IMAGE_CMD_' + t_clean, 'convert_container %s "${CONTAINER_IMAGE_NAME}" "${IMAGE_FILE_HOST}"' % t) + d.setVar('IMAGE_FULLNAME_' + t_clean, '${PN}-${DISTRO}-${DISTRO_ARCH}') + bb.build.addtask('containerize', 'do_image_' + t_clean, 'do_image_tools', d) +} + +do_containerize() { + local cmd="/bin/dash" + local empty_tag="empty" + local tag="${CONTAINER_IMAGE_TAG}" + local oci_img_dir="${WORKDIR}/oci-image" + local rootfs="${IMAGE_ROOTFS}" + + # prepare OCI container image skeleton + bbdebug 1 "prepare OCI container image skeleton" + sudo rm -rf "${oci_img_dir}" "${oci_img_dir}_unpacked" + sudo umoci init --layout "${oci_img_dir}" + sudo umoci new --image "${oci_img_dir}:${empty_tag}" + sudo umoci config --image "${oci_img_dir}:${empty_tag}" \ + --config.cmd="${cmd}" + sudo umoci unpack --image "${oci_img_dir}:${empty_tag}" \ + "${oci_img_dir}_unpacked" + + # add root filesystem as the flesh of the skeleton + sudo cp -a "${rootfs}"/* "${oci_img_dir}_unpacked/rootfs/" + # clean-up temporary files + sudo find "${oci_img_dir}_unpacked/rootfs/tmp" -mindepth 1 -delete + + # pack container image + bbdebug 1 "pack container image" + sudo umoci repack --image "${oci_img_dir}:${tag}" \ + "${oci_img_dir}_unpacked" + sudo umoci remove --image "${oci_img_dir}:${empty_tag}" + sudo rm -rf "${oci_img_dir}_unpacked" + + # no root needed anymore + sudo chown --recursive $(id -u):$(id -g) "${oci_img_dir}" } -addtask container_image before do_image after do_image_tools +convert_container() { + local tag="${CONTAINER_IMAGE_TAG}" + local oci_img_dir="${WORKDIR}/oci-image" + local container_type="$1" + local image_name="$2" + local image_archive="$3" + + # convert the OCI container image to the desired format + bbdebug 1 "Creating container image type: ${container_type}" + case "${container_type}" in + "docker-archive" | "oci-archive") + if [ "${container_type}" = "oci-archive" ] ; then + target="${container_type}:${image_archive}:${tag}" + else + target="${container_type}:${image_archive}:${image_name}:${tag}" + fi + rm -f "${image_archive}" + bbdebug 2 "Converting OCI image to ${container_type}" + skopeo --insecure-policy copy \ + "oci:${oci_img_dir}:${tag}" "${target}" + ;; + "oci") + tar --create --directory "${oci_img_dir}" \ + --file "${image_archive}" . + ;; + "docker-daemon" | "containers-storage") + if [ -f /.dockerenv ] || [ -f /run/.containerenv ] ; then + die "Adding the container image to a container runtime (${container_type}) not supported if running from a container (e.g. 'kas-container')" + fi + skopeo --insecure-policy copy \ + "oci:${oci_img_dir}:${tag}" \ + "${container_type}:${image_name}:${tag}" + ;; + *) + die "Unsupported format for convert_container: ${container_type}" + ;; + esac +} diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass index 2a49456b..f4c33bd9 100644 --- a/meta/classes/cpiogz-img.bbclass +++ b/meta/classes/cpiogz-img.bbclass @@ -3,20 +3,12 @@ # # SPDX-License-Identifier: MIT -CPIOGZ_FNAME ?= "${IMAGE_FULLNAME}.cpio.gz" -CPIOGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${CPIOGZ_FNAME}" -IMAGER_INSTALL += "cpio" +IMAGER_INSTALL_cpio += "cpio" CPIO_IMAGE_FORMAT ?= "newc" -do_cpiogz_image() { - sudo rm -f ${CPIOGZ_IMAGE_FILE} - image_do_mounts - sudo chroot ${BUILDCHROOT_DIR} \ - sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ - /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o | /usr/bin/gzip -9 > \ - ${PP_DEPLOY}/${CPIOGZ_FNAME}" - sudo chown $(id -u):$(id -g) ${CPIOGZ_IMAGE_FILE} +IMAGE_CMD_cpio() { + ${SUDO_CHROOT} \ + sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ + /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o > \ + ${IMAGE_FILE_CHROOT}" } - -addtask cpiogz_image before do_image after do_image_tools -do_cpiogz_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass index 5085afcc..73d1bb57 100644 --- a/meta/classes/ext4-img.bbclass +++ b/meta/classes/ext4-img.bbclass @@ -1,24 +1,15 @@ # This software is a part of ISAR. # Copyright (C) 2015-2017 ilbers GmbH -EXT4_IMAGE_FILE = "${IMAGE_FULLNAME}.ext4.img" - -IMAGER_INSTALL += "e2fsprogs" +IMAGER_INSTALL_ext4 += "e2fsprogs" MKE2FS_ARGS ?= "-t ext4" # Generate ext4 filesystem image -do_ext4_image() { - rm -f '${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}' - - truncate -s ${ROOTFS_SIZE}K '${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}' +IMAGE_CMD_ext4() { + truncate -s ${ROOTFS_SIZE}K '${IMAGE_FILE_HOST}' - image_do_mounts - - sudo chroot ${BUILDCHROOT_DIR} /sbin/mke2fs ${MKE2FS_ARGS} \ - -F -d '${PP_ROOTFS}' '${PP_DEPLOY}/${EXT4_IMAGE_FILE}' + ${SUDO_CHROOT} /sbin/mke2fs ${MKE2FS_ARGS} \ + -F -d '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' } - -addtask ext4_image before do_image after do_image_tools -do_ext4_image[prefuncs] = 'set_image_size' -do_ext4_image[dirs] = "${DEPLOY_DIR_IMAGE}" +#IMAGE_CMD_ext4[vardepsexclude] = "ROOTFS_SIZE ROOTFS_EXTRA" diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass index 1ad0c5b8..ef65af88 100644 --- a/meta/classes/fit-img.bbclass +++ b/meta/classes/fit-img.bbclass @@ -6,24 +6,17 @@ MKIMAGE_ARGS ??= "" FIT_IMAGE_SOURCE ??= "fitimage.its" -FIT_IMAGE_FILE ?= "${IMAGE_FULLNAME}.fit.img" -IMAGER_INSTALL += "u-boot-tools device-tree-compiler" +IMAGER_INSTALL_fit += "u-boot-tools device-tree-compiler" # Generate fit image -do_fit_image() { +IMAGE_CMD_fit() { if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then die "FIT_IMAGE_SOURCE does not contain fitimage source file" fi - rm -f '${DEPLOY_DIR_IMAGE}/${FIT_IMAGE_FILE}' - - image_do_mounts - # Create fit image using buildchroot tools - sudo chroot ${BUILDCHROOT_DIR} /usr/bin/mkimage ${MKIMAGE_ARGS} \ - -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${PP_DEPLOY}/${FIT_IMAGE_FILE}' - sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${FIT_IMAGE_FILE}' + ${SUDO_CHROOT} /usr/bin/mkimage ${MKIMAGE_ARGS} \ + -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${IMAGE_FILE_CHROOT}' } -addtask fit_image before do_image after do_image_tools do_transform_template -do_fit_image[dirs] = "${DEPLOY_DIR_IMAGE}" +IMAGE_CMD_fit[depends] = "${PN}:do_transform_template" diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass deleted file mode 100644 index cdec4633..00000000 --- a/meta/classes/image-container-extension.bbclass +++ /dev/null @@ -1,83 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2021 -# -# SPDX-License-Identifier: MIT -# -# This class extends the image.bbclass for containerizing the root filesystem. - -CONTAINER_IMAGE_FORMATS ?= "docker-archive" -CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" -CONTAINER_IMAGE_TAG ?= "${PV}-${PR}" - -containerize_rootfs() { - local cmd="/bin/dash" - local empty_tag="empty" - local tag="${CONTAINER_IMAGE_TAG}" - local oci_img_dir="${WORKDIR}/oci-image" - local rootfs="$1" - local container_formats="$2" - local container_name_prefix="$3" - - # prepare OCI container image skeleton - bbdebug 1 "prepare OCI container image skeleton" - sudo rm -rf "${oci_img_dir}" "${oci_img_dir}_unpacked" - sudo umoci init --layout "${oci_img_dir}" - sudo umoci new --image "${oci_img_dir}:${empty_tag}" - sudo umoci config --image "${oci_img_dir}:${empty_tag}" \ - --config.cmd="${cmd}" - sudo umoci unpack --image "${oci_img_dir}:${empty_tag}" \ - "${oci_img_dir}_unpacked" - - # add root filesystem as the flesh of the skeleton - sudo cp -a "${rootfs}"/* "${oci_img_dir}_unpacked/rootfs/" - # clean-up temporary files - sudo find "${oci_img_dir}_unpacked/rootfs/tmp" -mindepth 1 -delete - - # pack container image - bbdebug 1 "pack container image" - sudo umoci repack --image "${oci_img_dir}:${tag}" \ - "${oci_img_dir}_unpacked" - sudo umoci remove --image "${oci_img_dir}:${empty_tag}" - sudo rm -rf "${oci_img_dir}_unpacked" - - # no root needed anymore - sudo chown --recursive $(id -u):$(id -g) "${oci_img_dir}" - - # convert the OCI container image to the desired format - image_name="${container_name_prefix}${CONTAINER_IMAGE_NAME}" - for image_type in ${CONTAINER_IMAGE_FORMATS} ; do - image_archive="${DEPLOY_DIR_IMAGE}/${image_name}-${tag}-${image_type}.tar" - bbdebug 1 "Creating container image type: ${image_type}" - case "${image_type}" in - "docker-archive" | "oci-archive") - if [ "${image_type}" = "oci-archive" ] ; then - target="${image_type}:${image_archive}:${tag}" - else - target="${image_type}:${image_archive}:${image_name}:${tag}" - fi - rm -f "${image_archive}" "${image_archive}.xz" - bbdebug 2 "Converting OCI image to ${image_type}" - skopeo --insecure-policy copy \ - "oci:${oci_img_dir}:${tag}" "${target}" - bbdebug 2 "Compressing image" - xz -T0 "${image_archive}" - ;; - "oci") - tar --create --xz --directory "${oci_img_dir}" \ - --file "${image_archive}.xz" . - ;; - "docker-daemon" | "containers-storage") - if [ -f /.dockerenv ] || [ -f /run/.containerenv ] ; then - die "Adding the container image to a container runtime (${image_type}) not supported if running from a container (e.g. 'kas-container')" - fi - skopeo --insecure-policy copy \ - "oci:${oci_img_dir}:${tag}" \ - "${image_type}:${image_name}:${tag}" - ;; - *) - die "Unsupported format for containerize_rootfs: ${image_type}" - ;; - esac - done -} - diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index f87b76e7..4413a7d6 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -10,7 +10,8 @@ STAMPCLEAN = "${STAMPS_DIR}/${DISTRO}-${DISTRO_ARCH}/${PN}-${MACHINE}/*-*" 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-img"}" +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 ""}" @@ -83,7 +84,183 @@ inherit image-tools-extension inherit image-postproc-extension inherit image-locales-extension inherit image-account-extension -inherit image-container-extension + +def get_base_type(t, d): + bt = t + for c in d.getVar('IMAGE_CONVERSIONS').split(): + if t.endswith('.' + c): + bt = t[:-len('.' + c)] + break + return bt if bt == t else get_base_type(bt, d) + +# determine image basetypes, just so we can use it in imagetypes* classes +python() { + basetypes = set() + for t in (d.getVar('IMAGE_FSTYPES') or '').split(): + bt = get_base_type(t, d) + if bt.endswith('-img'): + # be backwards-compatible + bt = bt[:-len('-img')] + bb.warn("IMAGE_TYPE '{0}-img' is deprecated. Please use '{0}' instead.".format(bt)) + basetypes.add(bt) + deps = (d.getVar('IMAGE_TYPEDEP_' + bt.replace('-', '_').replace('.', '_')) or '').split() + basetypes |= set([get_base_type(t, d) for t in deps]) + d.setVar('IMAGE_BASETYPES', ' '.join(basetypes)) +} + +# image types +IMAGE_CLASSES ??= "" +IMGCLASSES = "container-img cpiogz-img ext4-img fit-img targz-img ubi-img ubifs-img vm-img wic-img" +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() + conversions = set(d.getVar('IMAGE_CONVERSIONS').split()) + + basetypes = {} + typedeps = {} + vardeps = set() + + def collect_image_type(t): + bt = get_base_type(t, d) + if bt.endswith('-img'): + # be backwards-compatible + bt = bt[:-len('-img')] + bb.warn("IMAGE_TYPE '{0}-img' is deprecated. Please use '{0}' instead.".format(bt)) + + if bt not in basetypes: + basetypes[bt] = [] + if t not in basetypes[bt]: + basetypes[bt].append(t) + t_clean = t.replace('-', '_').replace('.', '_') + deps = (d.getVar('IMAGE_TYPEDEP_' + t_clean) or '').split() + vardeps.add('IMAGE_TYPEDEP_' + t_clean) + if bt not in typedeps: + typedeps[bt] = set() + for dep in deps: + if dep not in image_types: + image_types.append(dep) + collect_image_type(dep) + typedeps[bt].add(get_base_type(dep, d)) + if bt != t: + collect_image_type(bt) + + for t in image_types[:]: + collect_image_type(t) + + # TODO: OE uses do_image, but Isar is different... + d.appendVarFlag('do_image_tools', 'vardeps', ' '.join(vardeps)) + + imager_install = set() + imager_build_deps = set() + conversion_install = set() + for bt in basetypes: + vardeps = set() + cmds = [] + bt_clean = bt.replace('-', '_').replace('.', '_') + + # prepare local environment + localdata = bb.data.createCopy(d) + localdata.setVar('OVERRIDES', bt_clean + ':' + d.getVar('OVERRIDES', False)) + localdata.setVar('PV', d.getVar('PV')) + localdata.delVar('DATETIME') + localdata.delVar('DATE') + localdata.delVar('TMPDIR') + vardepsexclude = (d.getVarFlag('IMAGE_CMD_' + bt_clean, 'vardepsexclude', True) or '').split() + for dep in vardepsexclude: + localdata.delVar(dep) + + # check if required args are set + required_args = (localdata.getVar('IMAGE_CMD_REQUIRED_ARGS') or '').split() + if any([d.getVar(arg) is None for arg in required_args]): + bb.fatal("IMAGE_TYPE '%s' requires these arguments: %s" % (image_type, ', '.join(required_args))) + + # convenience variables to be used by CMDs + localdata.setVar('IMAGE_FILE_HOST', '${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.${type}') + #bb.warn("FULLNAME is %s -> %s" % (localdata.getVar('IMAGE_FULLNAME', False), localdata.getVar('IMAGE_FULLNAME', True))) + localdata.setVar('IMAGE_FILE_CHROOT', '${PP_DEPLOY}/${IMAGE_FULLNAME}.${type}') + localdata.setVar('SUDO_CHROOT', localdata.expand('sudo chroot ${BUILDCHROOT_DIR}')) + + # imager install + for dep in (d.getVar('IMAGER_INSTALL_' + bt_clean) or '').split(): + imager_install.add(dep) + for dep in (d.getVar('IMAGER_BUILD_DEPS_' + bt_clean) or '').split(): + imager_build_deps.add(dep) + + # construct image command + cmds.append('\timage_do_mounts') + image_cmd = localdata.getVar('IMAGE_CMD_' + bt_clean) + if image_cmd: + localdata.setVar('type', bt) + cmds.append(localdata.expand(image_cmd)) + #bb.warn("IMAGE_CMD\n*** %s\n*** %s" % (image_cmd, localdata.expand(image_cmd))) + cmds.append(localdata.expand('\tsudo chown $(id -u):$(id -g) ${IMAGE_FILE_HOST}')) + else: + bb.fatal("No IMAGE_CMD for %s" % bt) + vardeps.add('IMAGE_CMD_' + bt_clean) + d.delVarFlag('IMAGE_CMD_' + bt_clean, 'func') + task_deps = d.getVarFlag('IMAGE_CMD_' + bt_clean, 'depends') + + # add conversions + conversion_depends = set() + rm_images = set() + def create_conversions(t): + for c in sorted(conversions): + if t.endswith('.' + c): + t = t[:-len(c) - 1] + create_conversions(t) + localdata.setVar('type', t) + cmd = '\t' + localdata.getVar('CONVERSION_CMD_' + c) + if cmd not in cmds: + cmds.append(cmd) + cmds.append(localdata.expand('\tsudo chown $(id -u):$(id -g) ${IMAGE_FILE_HOST}.%s' % c)) + vardeps.add('CONVERSION_CMD_' + c) + for dep in (localdata.getVar('CONVERSION_DEPS_' + c) or '').split(): + conversion_install.add(dep) + # remove temporary image files + if t not in image_types: + rm_images.add(localdata.expand('${IMAGE_FILE_HOST}')) + + for t in basetypes[bt]: + create_conversions(t) + + if bt not in image_types: + localdata.setVar('type', t) + rm_images.add(localdata.expand('${IMAGE_FILE_HOST}')) + + for image in rm_images: + cmds.append('\trm ' + image) + + # image type dependencies + after = 'do_image_tools' + for dep in typedeps[bt]: + after += ' do_image_%s' % dep.replace('-', '_').replace('.', '_') + + # create the task + task = 'do_image_%s' % bt_clean + d.setVar(task, '\n'.join(cmds)) + d.setVarFlag(task, 'func', '1') + d.appendVarFlag(task, 'prefuncs', ' set_image_size') + d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps)) + d.appendVarFlag(task, 'vardepsexclude', ' ' + ' '.join(vardepsexclude)) + d.appendVarFlag(task, 'dirs', localdata.expand(' ${DEPLOY_DIR_IMAGE}')) + if task_deps: + d.appendVarFlag(task, 'depends', task_deps) + bb.build.addtask(task, 'do_image', after, d) + + d.appendVar('IMAGER_INSTALL', ' ' + ' '.join(sorted(imager_install | conversion_install))) + d.appendVar('IMAGER_BUILD_DEPS', ' ' + ' '.join(sorted(imager_build_deps))) +} # Extra space for rootfs in MB ROOTFS_EXTRA ?= "64" @@ -256,6 +433,3 @@ do_rootfs_quality_check() { } addtask rootfs_quality_check after do_rootfs_finalize before do_rootfs - -# Last so that the image type can overwrite tasks if needed -inherit ${IMAGE_FSTYPES} diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass index b021e728..7e9fb0f3 100644 --- a/meta/classes/rootfs.bbclass +++ b/meta/classes/rootfs.bbclass @@ -172,6 +172,7 @@ rootfs_install_pkgs_install() { do_rootfs_install[root_cleandirs] = "${ROOTFSDIR}" do_rootfs_install[vardeps] += "${ROOTFS_CONFIGURE_COMMAND} ${ROOTFS_INSTALL_COMMAND}" +do_rootfs_install[vardepsexclude] += "IMAGE_ROOTFS" do_rootfs_install[depends] = "isar-bootstrap-${@'target' if d.getVar('ROOTFS_ARCH') == d.getVar('DISTRO_ARCH') else 'host'}:do_build" do_rootfs_install[recrdeptask] = "do_deploy_deb" python do_rootfs_install() { diff --git a/meta/classes/sdk.bbclass b/meta/classes/sdk.bbclass index adf9a1fe..477dff70 100644 --- a/meta/classes/sdk.bbclass +++ b/meta/classes/sdk.bbclass @@ -31,7 +31,7 @@ SDKCHROOT_DIR = "${DEPLOY_DIR_SDKCHROOT}/${BPN}-${MACHINE}" # SDK settings SDK_INCLUDE_ISAR_APT ?= "0" -SDK_FORMATS ?= "targz-img" +SDK_FORMATS ?= "tar.xz" SDK_INSTALL ?= "" SDK_PREINSTALL += " \ debhelper \ diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass index bf94af02..74d34e29 100644 --- a/meta/classes/targz-img.bbclass +++ b/meta/classes/targz-img.bbclass @@ -3,13 +3,6 @@ # # SPDX-License-Identifier: MIT -TARGZ_IMAGE_FILE = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz" - -do_targz_image() { - rm -f ${TARGZ_IMAGE_FILE} - sudo tar -cvzf ${TARGZ_IMAGE_FILE} --one-file-system -C ${IMAGE_ROOTFS} . - sudo chown $(id -u):$(id -g) ${TARGZ_IMAGE_FILE} +IMAGE_CMD_tar() { + sudo tar -cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz --one-file-system -C ${IMAGE_ROOTFS} . } - -addtask targz_image before do_image after do_image_tools -do_targz_image[dirs] = "${DEPLOY_DIR_IMAGE}" diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass index efaf058e..92acb6f8 100644 --- a/meta/classes/ubi-img.bbclass +++ b/meta/classes/ubi-img.bbclass @@ -3,30 +3,18 @@ # # SPDX-License-Identifier: MIT -python() { - if not d.getVar("UBINIZE_ARGS"): - raise bb.parse.SkipRecipe("UBINIZE_ARGS must be set") -} - UBINIZE_CFG ??= "ubinize.cfg" -UBI_IMAGE_FILE ?= "${IMAGE_FULLNAME}.ubi.img" -IMAGER_INSTALL += "mtd-utils" +IMAGER_INSTALL_ubi += "mtd-utils" # Generate ubi filesystem image -do_ubi_image() { +IMAGE_CMD_ubi() { if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then die "UBINIZE_CFG does not contain ubinize config file." fi - rm -f '${DEPLOY_DIR_IMAGE}/${UBI_IMAGE_FILE}' - - image_do_mounts - - # Create ubi image using buildchroot tools - sudo chroot ${BUILDCHROOT_DIR} /usr/sbin/ubinize ${UBINIZE_ARGS} \ - -o '${PP_DEPLOY}/${UBI_IMAGE_FILE}' '${PP_WORK}/${UBINIZE_CFG}' - sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${UBI_IMAGE_FILE}' + ${SUDO_CHROOT} /usr/sbin/ubinize ${UBINIZE_ARGS} \ + -o '${IMAGE_FILE_CHROOT}' '${PP_WORK}/${UBINIZE_CFG}' } -addtask ubi_image before do_image after do_image_tools do_transform_template -do_ubi_image[dirs] = "${DEPLOY_DIR_IMAGE}" +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 index 229eb3ef..60c3bf14 100644 --- a/meta/classes/ubifs-img.bbclass +++ b/meta/classes/ubifs-img.bbclass @@ -3,30 +3,19 @@ # # SPDX-License-Identifier: MIT -python() { - if not d.getVar("MKUBIFS_ARGS"): - raise bb.parse.SkipRecipe("mkubifs_args must be set") -} - -UBIFS_IMAGE_FILE ?= "${IMAGE_FULLNAME}.ubifs.img" - -IMAGER_INSTALL += "mtd-utils" +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 -ISAR_CROSS_COMPILE_armhf = "1" +python() { + if 'ubifs' in (d.getVar('IMAGE_BASETYPES') or '').split(): + d.setVar('ISAR_CROSS_COMPILE_armhf', '1') +} # Generate ubifs filesystem image -do_ubifs_image() { - rm -f '${DEPLOY_DIR_IMAGE}/${UBIFS_IMAGE_FILE}' - - image_do_mounts - +IMAGE_CMD_ubifs() { # Create ubifs image using buildchroot tools - sudo chroot ${BUILDCHROOT_DIR} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ - -r '${PP_ROOTFS}' '${PP_DEPLOY}/${UBIFS_IMAGE_FILE}' - sudo chown $(id -u):$(id -g) '${DEPLOY_DIR_IMAGE}/${UBIFS_IMAGE_FILE}' + ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ + -r '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' } - -addtask ubifs_image before do_image after do_image_tools -do_ubifs_image[dirs] = "${DEPLOY_DIR_IMAGE}" +IMAGE_CMD_REQUIRED_ARGS_ubifs = "MKUBIFS_ARGS" diff --git a/meta/classes/vm-img.bbclass b/meta/classes/vm-img.bbclass index 4bc977b9..8a676aca 100644 --- a/meta/classes/vm-img.bbclass +++ b/meta/classes/vm-img.bbclass @@ -5,16 +5,18 @@ # inherit buildchroot -inherit wic-img + +USING_OVA = "${@bb.utils.contains('IMAGE_BASETYPES', 'ova', '1', '0', d)}" FILESEXTRAPATHS_prepend := "${LAYERDIR_core}/classes/vm-img:" OVF_TEMPLATE_FILE ?= "vm-img-virtualbox.ovf.tmpl" -SRC_URI += "file://${OVF_TEMPLATE_FILE}" +SRC_URI += "${@'file://${OVF_TEMPLATE_FILE}' if d.getVar('USING_OVA') == '1' else ''}" -IMAGER_INSTALL += "qemu-utils gawk uuid-runtime" +IMAGE_TYPEDEP_ova = "wic" +IMAGER_INSTALL_ova += "qemu-utils gawk uuid-runtime" # virtual machine disk settings -SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic.img" +SOURCE_IMAGE_FILE ?= "${IMAGE_FULLNAME}.wic" # For VirtualBox, this needs to be "monolithicSparse" (default to it). # VMware needs this to be "streamOptimized". @@ -34,7 +36,7 @@ def set_convert_options(d): CONVERSION_OPTIONS = "${@set_convert_options(d)}" -do_convert_wic() { +convert_wic() { rm -f '${DEPLOY_DIR_IMAGE}/${VIRTUAL_MACHINE_IMAGE_FILE}' image_do_mounts bbnote "Creating ${VIRTUAL_MACHINE_IMAGE_FILE} from ${SOURCE_IMAGE_FILE}" @@ -43,8 +45,6 @@ do_convert_wic() { '${PP_DEPLOY}/${SOURCE_IMAGE_FILE}' '${VIRTUAL_MACHINE_DISK}' } -addtask convert_wic before do_build after do_wic_image do_copy_boot_files do_install_imager_deps do_transform_template - # User settings for OVA OVA_NAME ?= "${IMAGE_FULLNAME}" OVA_MEMORY ?= "8192" @@ -67,10 +67,11 @@ OVA_VARS = "OVA_NAME OVA_MEMORY OVA_NUMBER_OF_CPU OVA_VRAM \ OVA_FIRMWARE OVA_ACPI OVA_3D_ACCEL \ OVA_SHA_ALG VIRTUAL_MACHINE_IMAGE_FILE" -TEMPLATE_FILES += "${OVF_TEMPLATE_FILE}" +TEMPLATE_FILES += "${@'${OVF_TEMPLATE_FILE}' if d.getVar('USING_OVA') == '1' else ''}" TEMPLATE_VARS += "${OVA_VARS}" -do_create_ova() { +do_image_ova[prefuncs] += "convert_wic" +IMAGE_CMD_ova() { if [ ! ${VIRTUAL_MACHINE_IMAGE_TYPE} = "vmdk" ]; then exit 0 fi @@ -81,10 +82,7 @@ do_create_ova() { export PRIMARY_MAC=$(macgen) export LAST_CHANGE=$(date -u "+%Y-%m-%dT%H:%M:%SZ") export OVA_FIRMWARE_UPPERCASE=$(echo ${OVA_FIRMWARE} | tr '[a-z]' '[A-Z]') - export OVF_TEMPLATE_STAGE2=$(echo ${OVF_TEMPLATE_FILE} | sed 's/.tmpl$//' ) - image_do_mounts - sudo -Es chroot --userspec=$( id -u ):$( id -g ) ${BUILDCHROOT_DIR} <<'EOSUDO' set -e export DISK_SIZE_BYTES=$(qemu-img info -f vmdk "${VIRTUAL_MACHINE_DISK}" \ @@ -104,5 +102,3 @@ do_create_ova() { tar -uvf ${PP_DEPLOY}/${OVA_NAME}.ova -C ${PP_DEPLOY} ${VIRTUAL_MACHINE_IMAGE_FILE} EOSUDO } - -addtask do_create_ova after do_convert_wic before do_deploy diff --git a/meta/classes/wic-img.bbclass b/meta/classes/wic-img.bbclass index 7537a27b..cfcc94c7 100644 --- a/meta/classes/wic-img.bbclass +++ b/meta/classes/wic-img.bbclass @@ -4,7 +4,8 @@ # this class is heavily inspired by OEs ./meta/classes/image_types_wic.bbclass # -WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}')}" +USING_WIC = "${@bb.utils.contains('IMAGE_BASETYPES', 'wic', '1', '0', d)}" +WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if d.getVar('USING_WIC') == '1' else ''}" WKS_FILE ??= "sdimage-efi" @@ -14,6 +15,9 @@ do_copy_wks_template () { } python () { + if not d.getVar('USING_WIC') == '1': + return + import itertools import re @@ -74,13 +78,13 @@ python () { except (IOError, OSError) as exc: pass else: - bb.build.addtask('do_copy_wks_template', 'do_transform_template do_wic_image', None, d) - bb.build.addtask('do_transform_template', 'do_wic_image', None, d) + bb.build.addtask('do_copy_wks_template', 'do_transform_template do_image_wic', None, d) + bb.build.addtask('do_transform_template', 'do_image_wic', None, d) } inherit buildchroot -IMAGER_INSTALL += "${WIC_IMAGER_INSTALL}" +IMAGER_INSTALL_wic += "${WIC_IMAGER_INSTALL}" # wic comes with reasonable defaults, and the proper interface is the wks file ROOTFS_EXTRA ?= "0" @@ -125,32 +129,23 @@ python do_rootfs_wicenv () { } -addtask do_rootfs_wicenv after do_rootfs before do_wic_image +addtask do_rootfs_wicenv after do_rootfs before do_image_wic do_rootfs_wicenv[vardeps] += "${WICVARS}" do_rootfs_wicenv[prefuncs] = 'set_image_size' -WIC_IMAGE_FILE ="${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic.img" - -python check_for_wic_warnings() { - with open("{}/log.do_wic_image".format(d.getVar("T"))) as f: - for line in f.readlines(): - if line.startswith("WARNING"): - bb.warn(line.strip()) +check_for_wic_warnings() { + WARN="$(grep -e '^WARNING' ${T}/log.do_image_wic || true)" + if [ -n "$WARN" ]; then + bbwarn "$WARN" + fi } -do_wic_image[file-checksums] += "${WKS_FILE_CHECKSUM}" -do_wic_image[dirs] = "${DEPLOY_DIR_IMAGE}" -python do_wic_image() { - cmds = ['wic_do_mounts', 'generate_wic_image', 'check_for_wic_warnings'] - weights = [5, 90, 5] - progress_reporter = bb.progress.MultiStageProgressReporter(d, weights) - - for cmd in cmds: - progress_reporter.next_stage() - bb.build.exec_func(cmd, d) - progress_reporter.finish() +do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" +IMAGE_CMD_wic() { + wic_do_mounts + generate_wic_image + check_for_wic_warnings } -addtask wic_image before do_image after do_image_tools wic_do_mounts() { buildchroot_do_mounts @@ -209,7 +204,7 @@ generate_wic_image() { sudo chown -R $(id -u):$(id -g) ${BUILDCHROOT_DIR}/${WICTMP} find ${BUILDCHROOT_DIR}/${WICTMP} -type f -name "*.direct*" | while read f; do suffix=$(basename $f | sed 's/\(.*\)\(\.direct\)\(.*\)/\3/') - mv -f ${f} ${WIC_IMAGE_FILE}${suffix} + mv -f ${f} "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.wic${suffix}" done rm -rf ${BUILDCHROOT_DIR}/${WICTMP} rm -rf ${IMAGE_ROOTFS}/../pseudo From patchwork Tue Apr 5 05:24:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1656 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Tue, 05 Apr 2022 15:25:06 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f183.google.com (mail-lj1-f183.google.com [209.85.208.183]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 235DOwB5023876 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 5 Apr 2022 15:24:58 +0200 Received: by mail-lj1-f183.google.com with SMTP id c12-20020a2ebf0c000000b0024af8f2794bsf3851021ljr.12 for ; Tue, 05 Apr 2022 06:24:58 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1649165092; cv=pass; d=google.com; s=arc-20160816; b=emucn9+A3Vpv8FJZ4tKLeEKUZbJekf2LzhwLaW5rc4MzLdj0QqqbfDARcIMKKlBwb0 K43iNqC7RyMk7a5mHbjb/bLBfTBVcc3JrNJMJqeX/UEKSWNGWOqO2g6p9frK+3bMiWbR JqwGJV1hPSP/oeD1jAOZAnU3aLiwLx+nBWme7uAmI1+7RbG2H/rCuIpHhqpDjZj16Ewx mOGl7/O9CoALJXRzeaZUdOuwykxSlyoxHuCpAUE74OXCVvNTQnJeX2GadXwJYLMtGXku J0WDcoIqekQUj8l7RbJR7pylg5IeTCvY3d6vN7ov7buRCWBD4FlFZI7ZY41+aC5ifMvB OIcQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=e7mIMgxeBv6hUSpF6fY3K/QDNg3klRkgBvA63/p0bxI=; b=ATKtFZJutSaUCoVkK0Ug2K7zMxyrU083auV2Il1y+/xrGdPXSLIoqfd7mTJs+DH+XJ Iyike7YUKtXcyWG3hMi2HVL2SFzhcr7/PGGQ6D4uVDaAWJTGSBAvs9EmFK8CPTUrAful Yf0uloJAp4JrGDHEFaTiwuBsiLMdhp5k+HLSL1k2ZoNtLBycIGNBPrKF64Axs1FW4Mg0 31gv/tBsqapSaovd7gezTPahJ2kgZDS+st/f0BUGHyJCBF0piovn00b1JjzI3xvJWn5/ 4cngALQp0PfBCav6isQrKdIZ2x+A4N2G43AVERyZzsM3woJwNGXmEXAhIi9tFQMllk55 IyKQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YHTabNh8; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1b::62c as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=e7mIMgxeBv6hUSpF6fY3K/QDNg3klRkgBvA63/p0bxI=; b=BZaDg6wGxK4Mf+EXxAh1pOq5ikVbIuofG+zoGKzNaSdqLpa7/1nyIENAxSdiYLbFP0 uBCW728BASN08uvDJ8AGk/cqn0sJvO3OA9Os9mye2FALDgA5ysOlq6/NGZ8lKGvsG7aD uzTyNHztnhsQvdI10IW+Doj7HIxIcOZPM9QIAs7vdGn4l4GE1NeXomOTFR5wdOWyY/gw IZ4bdyCsT+3ntA3Qsj/tAIhueFfc+K3vbyp0Zargg+rTM2fykQZZS0m4VeuY/9YSd0fh VuXRgM6TBrlM3cv++JQPUKQmpwvpFGPeQbNKZw+zT0nxdg2m90KN0CxIu1N/Mh+0R2Bf QuJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=e7mIMgxeBv6hUSpF6fY3K/QDNg3klRkgBvA63/p0bxI=; b=poVUZo0PZpWjVuSoOYfkfhwSCXM95+BSd9dxTz3gIU2tc+pFdRUfgMaNLzrEi8Z2L/ bBzkReTZbEthqXb721OMtHGChX80Nme8li1zO4f04+j14mxHL8izOrSc7JyjJH1vGsvh Jwxso8LqzHdu3aq7WysaD4tpnV0XRLajU33WMXeziyHLrkHZxyIKqsLzbKfayVUWA5Eg rdZt5T5hr6GsTpYeBzn+UXHUzddmjkKFQBsdcOay6vDXQnjxYFO58ejiV+zOUC4fcSOP q1Tl5D/jpJkBddWkoYmmOhZ/yv5lkQsbqXQ/+Q23lI7sdEycAdeyJsJ5q1CXH38+jy84 Bp2w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530Wy6x3V1CrKofXq5unC3CZTT/KF3+uXUfQpjsF0bybV316m2y1 T9Ehu+Mc+uqfQfgnR7DynJc= X-Google-Smtp-Source: ABdhPJxZBf8gw0r3sltiO/vhq+v5Qq1gQsJ+PZv8/0GGVzbtPtlGGuj/pWoPJVGGzkfVlcnBXzDTvg== X-Received: by 2002:a19:ee09:0:b0:44a:37cd:8295 with SMTP id g9-20020a19ee09000000b0044a37cd8295mr2648155lfb.389.1649165092631; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5285:0:b0:44a:94d2:1d8f with SMTP id q5-20020ac25285000000b0044a94d21d8fls544782lfm.0.gmail; Tue, 05 Apr 2022 06:24:51 -0700 (PDT) X-Received: by 2002:ac2:4e0e:0:b0:44a:2607:86db with SMTP id e14-20020ac24e0e000000b0044a260786dbmr2706601lfr.8.1649165091525; Tue, 05 Apr 2022 06:24:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649165091; cv=pass; d=google.com; s=arc-20160816; b=SLaRiRIhKW9D743l10rM6DatpBEz534qMfOmLcvzdPSA4nxcGvBKJ7X4vm6oooS/wV gl5BNewgz7qxhqmz/l6b6+lQpWIHvzHARWVg9uuSSmAJp0+EFkwmFhAvVbu9UsumYai/ Nr+TA5hdpMo+2Afg7GJg4Lh6g7egrDkRuE6kGse7YE9eB5GRbPeJReJW1G9WpsENHbQH bjqR300MegbIMCXo7MhHTtVdmGnQiPp+D2kW32XUV7Cwjsk/kq/ZKig7kJf2c4kOqQ+j 7d75V7GFuivd5X2vRBS9nNnjE4lY8xfTnZldRFj+HCs71RdCebm9UqgDHo/DOpmDETDo Nksg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=N0+5t2Pasy8Vr7BlaKAlo2M6d0tSQkvQOTGYIbmnNSY=; b=cb6JarJcdTG+azcqFf2Tu4nGx+G4VuSK5ilxJhIxKuQRYqUkVwgeD7cSKAwU5Bc+jm HML2G1RZ1d4/P+AQpOSwJzs7WD5HIpAj8Z/HHmaIfiZhyPno2kvLzi848PiUMXHv/GYJ d5l1F56k3f9gPcSD3Im/kD2CAIK7FNKya3bP5ttloCbp5j6BcdAPcf/Wakjq7jRYkULi 5u+HyvBWKDaAIK/NmCjxpFeLDfHj3RQYP+0j6ANnPY3+s7lpOc6JOkXlQmxODtV40vPS /E3KlU8BWytKaZx3Ocsik+plaj8SCBfUq+iE+QBP7pv5cYzu3c4JMx2+MBaDaSJ4BDr6 VkQA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YHTabNh8; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1b::62c as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2062c.outbound.protection.outlook.com. [2a01:111:f400:7e1b::62c]) by gmr-mx.google.com with ESMTPS id c3-20020a2ea783000000b0024af7c9603fsi689188ljf.4.2022.04.05.06.24.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:24:51 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1b::62c as permitted sender) client-ip=2a01:111:f400:7e1b::62c; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ucrs6DbY0VOuJzhpm/voKP+gFhZlNCZJSpntkGEPUU8kX5bCA1ZhzpD2o7zvsAJF/K4cBznnQmG+YhQLoHxK9nKrvqlGYogKlBAwcTwCTY6CmO+Iyx1BiHJb77bAm65gpa7M5n/gGY+NnMpSKz7CRsKBvzXr2R8nliPCwTd4z6kjmqIauZa78PquXh1XHVs0xUDCpJTLBDh1cWT5f4oFZO23WK6NDxbpYZS6a+eshQw+Qlu05R4N7eRQpja7CSxC92gu2gNi9WQNkJLSurzYj9eW2I7D5F8iYU/jtnebK4uSF38AQ2bz2ucpLUs9z2RVWYNM/+rWZZP99aaiE06KgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N0+5t2Pasy8Vr7BlaKAlo2M6d0tSQkvQOTGYIbmnNSY=; b=ebnIQWav1SEAcRaj4I+gxTABQb3IWLQ7ixjcck2Cl9wbkgMv9eShyLKM2Xt3TG0er8Irr259i1WPX4goMpx6+/jwvLsxHUN++2QG+K/mdinm/90/3Grh313piQTkcfhGK6ZO2py6Zc0QTgdq0td9N++c12BLe3fc6ehNhLaJ1gm+0aFUULmDvL2QUTafHk2ZEVkaTv4UUxa5ruUCB9paZJ1P/oIQut5Z6/IY19Kr7I/sOhuBWplppxgRFzwZqe8RQUwI7bcWlym0D3VhLNbZQWUR0IPUBOTrpvLkDNl8ISoUKX5EntXcZptub0nDPBbiJWmaH3axiSVFM3Tmtmvb6Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.72) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from SV0P279CA0052.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::21) by PRAPR10MB5348.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:29b::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Tue, 5 Apr 2022 13:24:50 +0000 Received: from HE1EUR01FT098.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::2e) by SV0P279CA0052.outlook.office365.com (2603:10a6:f10:13::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.13 via Frontend Transport; Tue, 5 Apr 2022 13:24:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.72) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.72 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.72; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.72) by HE1EUR01FT098.mail.protection.outlook.com (10.152.1.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5123.19 via Frontend Transport; Tue, 5 Apr 2022 13:24:49 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SMA.ad011.siemens.net (194.138.21.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 5 Apr 2022 15:24:47 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Tue, 5 Apr 2022 15:24:47 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v2 4/7] imagetypes: restructure files Date: Tue, 5 Apr 2022 15:24:28 +0200 Message-ID: <20220405132431.2895832-5-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220405132431.2895832-1-adriaan.schmidt@siemens.com> References: <20220405132431.2895832-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--9.243800-8.000000 X-TMASE-MatchedRID: glDbLq0IecnZY+nnK3IwnMGnCHwCMuTJElH6l1EPRNgItCy6ZX/lLxqD rPipLA7BoxCLfriDzziVIbfpsq9FzF0qMWNOsGgAG6Aor8mgxBIDI91I0N0Y7w97mDMXdNW3ELb qrOgWzyev/7fHaEp6ExqGc7het5hmUtTgmoNQjI1r7b8CsPPtQe+90yVxudOIEVuC0eNRYvKW31 x27U9QYi99T+uJIleR5wnn9PXAc/dMqWhw3u66AuHPYUUXef6kyu0fpXITlDQTwfDtZ0TwrOC1p 3r9o3NF33Nl3elSfsqygaZY7yrHzn0bwqPJDrnjcVA5tVNQEnRNWtycvYsXAPSG/+sPtZVkRiPT MMc/MmncbHvEdOZOM0GzU7CKX1sdZfimYRvSI6PRV8kT55Za7WFqPXSLpNdALfggThkKF7ZuJXM xOF5JsA75RQuQJ3oKngIgpj8eDcAZ1CdBJOsoY8RB0bsfrpPIXzYxeQR1Dvv6utpZDrpBrBpEyp 4lILEsPS04hDp6EO82BFbSLrsGh/3IFS26TlDt X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.243800-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 038DA878CD099689F2C8ED7614405D85091A5D0D9B13AA31A5A7D470D8757E452000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5365708f-4ce1-4951-84e0-08da1707a938 X-MS-TrafficTypeDiagnostic: PRAPR10MB5348:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: imkOHlLrB0tQnQoDIyFxHLR+EsdzBXTmuMRdj7/HbVRnfwRDF3DgYhwG9xXBqMxRkpwxjfyXLFD5DRhv4HL/UWt+kGKjShZ3UUDjEz87mWa2EMSL+fVyjVSV540FdpIW1pQ324FbKsDfePRjfo/A1zFrmSiuvbrilpkR9Ei9QGftu3lTDWZbKXCDuA0B7E9K+VUmNWXQm7gmq0oLv3ON42ATln10oVV+oIDtVbrMZtPxD1/0MwuJrkTvp4ZPzlnkdtXOrLE44FwfiF30wTBbBXCiaRWgFRomFJKUZZQ206KnlTaU0ekSZi5H971xu4foTVWdrrhG6GdUMXFAP7BQDwsxBRtX/mtIuwtGLnqud1RaeoutTjTn2fBm9GA+F9OaCDwe7QZhvv8+JeBi0PiYP/xJGy2eH1BeiXGs7k8GPeOsR7mQCCs2etFI3j5Sa4+TSMhcx3LC0wVZHeXJaMS5vti1u2Dh5COLWgD/GdPlL6NiFwnMvMLEaG7v/LI2T9oSRrlF5PrpjuwHbRsbjJmUmxFvV8/kYFoy/00KUC/eigZ9gphTBx/Jg7ipFEI+WSjXWGxpeg+3Yrcjm8dH9wmIw1rVki5OUcRJVS6dCxr1CDoe+9IMhTxQFVuy+LcBKFcmesJz+7JQPP5jjFR7Ahw+7nemUF2l4NuvmRIpcm8N/NQnJdhbRVx3+SAit8KnQyPyMJXCWCGERGTxC0bnbEx8VXeVapAQ11i1P4IQupGJ2Mv2n15l5z0vBJDJukVjS2N9nO2+iWUWim9otxJt3qdbjAJppNZWf0+XDLMPW9GN5s1GaLEagS3TnWzbK65TV76F X-Forefront-Antispam-Report: CIP:194.138.21.72; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(82960400001)(8936002)(356005)(5660300002)(44832011)(36860700001)(508600001)(30864003)(186003)(86362001)(83380400001)(956004)(47076005)(81166007)(82310400005)(26005)(6666004)(2616005)(6916009)(316002)(2906002)(107886003)(36756003)(70206006)(336012)(70586007)(40460700003)(966005)(4326008)(8676002)(16526019)(1076003)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:49.6751 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5365708f-4ce1-4951-84e0-08da1707a938 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.72]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT098.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAPR10MB5348 X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YHTabNh8; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1b::62c as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX Instead of per-type classes *-img.bbclass, we move to - imagetypes.bbclass for the "simple" types and the conversions - dedicated files for the more complex types: - imagetypes_wic.bbclass - imagetypes_vm.bbclass - imagetypes_contaier.bbclass Signed-off-by: Adriaan Schmidt --- meta/classes/cpiogz-img.bbclass | 14 --- meta/classes/ext4-img.bbclass | 15 --- meta/classes/fit-img.bbclass | 22 ----- meta/classes/image.bbclass | 50 +++++----- meta/classes/imagetypes.bbclass | 91 +++++++++++++++++++ ...g.bbclass => imagetypes_container.bbclass} | 0 .../{vm-img.bbclass => imagetypes_vm.bbclass} | 0 ...wic-img.bbclass => imagetypes_wic.bbclass} | 0 meta/classes/targz-img.bbclass | 8 -- meta/classes/ubi-img.bbclass | 20 ---- meta/classes/ubifs-img.bbclass | 21 ----- 11 files changed, 112 insertions(+), 129 deletions(-) delete mode 100644 meta/classes/cpiogz-img.bbclass delete mode 100644 meta/classes/ext4-img.bbclass delete mode 100644 meta/classes/fit-img.bbclass create mode 100644 meta/classes/imagetypes.bbclass rename meta/classes/{container-img.bbclass => imagetypes_container.bbclass} (100%) rename meta/classes/{vm-img.bbclass => imagetypes_vm.bbclass} (100%) rename meta/classes/{wic-img.bbclass => imagetypes_wic.bbclass} (100%) delete mode 100644 meta/classes/targz-img.bbclass delete mode 100644 meta/classes/ubi-img.bbclass delete mode 100644 meta/classes/ubifs-img.bbclass diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass deleted file mode 100644 index f4c33bd9..00000000 --- a/meta/classes/cpiogz-img.bbclass +++ /dev/null @@ -1,14 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2020 Siemens AG -# -# SPDX-License-Identifier: MIT - -IMAGER_INSTALL_cpio += "cpio" -CPIO_IMAGE_FORMAT ?= "newc" - -IMAGE_CMD_cpio() { - ${SUDO_CHROOT} \ - sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ - /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o > \ - ${IMAGE_FILE_CHROOT}" -} diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass deleted file mode 100644 index 73d1bb57..00000000 --- a/meta/classes/ext4-img.bbclass +++ /dev/null @@ -1,15 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH - -IMAGER_INSTALL_ext4 += "e2fsprogs" - -MKE2FS_ARGS ?= "-t ext4" - -# Generate ext4 filesystem image -IMAGE_CMD_ext4() { - truncate -s ${ROOTFS_SIZE}K '${IMAGE_FILE_HOST}' - - ${SUDO_CHROOT} /sbin/mke2fs ${MKE2FS_ARGS} \ - -F -d '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' -} -#IMAGE_CMD_ext4[vardepsexclude] = "ROOTFS_SIZE ROOTFS_EXTRA" diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass deleted file mode 100644 index ef65af88..00000000 --- a/meta/classes/fit-img.bbclass +++ /dev/null @@ -1,22 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -MKIMAGE_ARGS ??= "" - -FIT_IMAGE_SOURCE ??= "fitimage.its" - -IMAGER_INSTALL_fit += "u-boot-tools device-tree-compiler" - -# Generate fit image -IMAGE_CMD_fit() { - if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then - die "FIT_IMAGE_SOURCE does not contain fitimage source file" - fi - - # Create fit image using buildchroot tools - ${SUDO_CHROOT} /usr/bin/mkimage ${MKIMAGE_ARGS} \ - -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${IMAGE_FILE_CHROOT}' -} -IMAGE_CMD_fit[depends] = "${PN}:do_transform_template" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 4413a7d6..dfe7bfa9 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -11,7 +11,6 @@ SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH} IMAGE_INSTALL ?= "" IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4"}" -IMAGE_CONVERSIONS = "gz xz" IMAGE_ROOTFS ?= "${WORKDIR}/rootfs" KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}" @@ -85,6 +84,26 @@ inherit image-postproc-extension inherit image-locales-extension inherit image-account-extension +# Extra space for rootfs in MB +ROOTFS_EXTRA ?= "64" + +def get_rootfs_size(d): + import subprocess + rootfs_extra = int(d.getVar("ROOTFS_EXTRA", True)) + + output = subprocess.check_output( + ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS", True)] + ) + base_size = int(output.split()[0]) + + return base_size + rootfs_extra * 1024 + +python set_image_size () { + rootfs_size = get_rootfs_size(d) + d.setVar('ROOTFS_SIZE', str(rootfs_size)) + d.setVarFlag('ROOTFS_SIZE', 'export', '1') +} + def get_base_type(t, d): bt = t for c in d.getVar('IMAGE_CONVERSIONS').split(): @@ -110,18 +129,10 @@ python() { # image types IMAGE_CLASSES ??= "" -IMGCLASSES = "container-img cpiogz-img ext4-img fit-img targz-img ubi-img ubifs-img vm-img wic-img" +IMGCLASSES = "imagetypes imagetypes_wic imagetypes_vm imagetypes_container" IMGCLASSES += "${IMAGE_CLASSES}" inherit ${IMGCLASSES} -# image conversions -CONVERSION_CMD_gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'" -CONVERSION_DEPS_gz = "gzip" - -XZ_OPTIONS ?= "" -CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'cat ${IMAGE_FILE_CHROOT} | xz ${XZ_OPTIONS} > ${IMAGE_FILE_CHROOT}.xz'" -CONVERSION_DEPS_xz = "xz-utils" - # hook up IMAGE_CMD_* python() { image_types = (d.getVar('IMAGE_FSTYPES') or '').split() @@ -262,19 +273,6 @@ python() { d.appendVar('IMAGER_BUILD_DEPS', ' ' + ' '.join(sorted(imager_build_deps))) } -# Extra space for rootfs in MB -ROOTFS_EXTRA ?= "64" - -def get_rootfs_size(d): - import subprocess - rootfs_extra = int(d.getVar("ROOTFS_EXTRA", True)) - - output = subprocess.check_output( - ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS", True)] - ) - base_size = int(output.split()[0]) - - return base_size + rootfs_extra * 1024 # here we call a command that should describe your whole build system, # this could be "git describe" or something similar. @@ -293,12 +291,6 @@ get_build_id() { fi } -python set_image_size () { - rootfs_size = get_rootfs_size(d) - d.setVar('ROOTFS_SIZE', str(rootfs_size)) - d.setVarFlag('ROOTFS_SIZE', 'export', '1') -} - ROOTFS_CONFIGURE_COMMAND += "image_configure_fstab" image_configure_fstab[weight] = "2" image_configure_fstab() { diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass new file mode 100644 index 00000000..a31a1989 --- /dev/null +++ b/meta/classes/imagetypes.bbclass @@ -0,0 +1,91 @@ +# This software is a part of ISAR. +# Copyright (C) 2021 Siemens AG +# +# SPDX-License-Identifier: MIT + +#image type: tar +IMAGER_INSTALL_tar = "tar" +TAR_OPTIIONS ?= "" + +IMAGE_CMD_tar() { + ${SUDO_CHROOT} tar ${TAR_OPTIONS} -cvzf \ + ${IMAGE_FILE_CHROOT} --one-file-system -C ${PP_ROOTFS} . +} + +# image type: ext4 +IMAGER_INSTALL_ext4 += "e2fsprogs" +MKE2FS_ARGS ?= "-t ext4" + +IMAGE_CMD_ext4() { + truncate -s ${ROOTFS_SIZE}K '${IMAGE_FILE_HOST}' + + ${SUDO_CHROOT} /sbin/mke2fs ${MKE2FS_ARGS} \ + -F -d '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' +} + +# image type: cpio +IMAGER_INSTALL_cpio += "cpio" +CPIO_IMAGE_FORMAT ?= "newc" + +IMAGE_CMD_cpio() { + ${SUDO_CHROOT} \ + sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ + /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o > \ + ${IMAGE_FILE_CHROOT}" +} + +# image type: fit +MKIMAGE_ARGS ??= "" +FIT_IMAGE_SOURCE ??= "fitimage.its" +IMAGER_INSTALL_fit += "u-boot-tools device-tree-compiler" + +IMAGE_CMD_fit() { + if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then + die "FIT_IMAGE_SOURCE does not contain fitimage source file" + fi + + ${SUDO_CHROOT} /usr/bin/mkimage ${MKIMAGE_ARGS} \ + -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${IMAGE_FILE_CHROOT}' +} +IMAGE_CMD_fit[depends] = "${PN}:do_transform_template" + +# image type: ubifs +IMAGER_INSTALL_ubifs += "mtd-utils" +IMAGE_CMD_REQUIRED_ARGS_ubifs = "MKUBIFS_ARGS" + +# glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 +# should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 +python() { + if 'ubifs' in (d.getVar('IMAGE_BASETYPES') or '').split(): + d.setVar('ISAR_CROSS_COMPILE_armhf', '1') +} + +IMAGE_CMD_ubifs() { + ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ + -r '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' +} + +# image type: ubi +IMAGER_INSTALL_ubi += "mtd-utils" +IMAGE_CMD_REQUIRED_ARGS_ubi = "UBINIZE_ARGS" +UBINIZE_CFG ??= "ubinize.cfg" + +IMAGE_CMD_ubi() { + if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then + die "UBINIZE_CFG does not contain ubinize config file." + fi + + ${SUDO_CHROOT} /usr/sbin/ubinize ${UBINIZE_ARGS} \ + -o '${IMAGE_FILE_CHROOT}' '${PP_WORK}/${UBINIZE_CFG}' +} +IMAGE_CMD_ubi[depends] = "${PN}:do_transform_template" + +# image conversions +IMAGE_CONVERSIONS = "gz xz" + +CONVERSION_CMD_gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'" +CONVERSION_DEPS_gz = "gzip" + +XZ_OPTIONS ?= "" +CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'cat ${IMAGE_FILE_CHROOT} | xz ${XZ_OPTIONS} > ${IMAGE_FILE_CHROOT}.xz'" +CONVERSION_DEPS_xz = "xz-utils" diff --git a/meta/classes/container-img.bbclass b/meta/classes/imagetypes_container.bbclass similarity index 100% rename from meta/classes/container-img.bbclass rename to meta/classes/imagetypes_container.bbclass diff --git a/meta/classes/vm-img.bbclass b/meta/classes/imagetypes_vm.bbclass similarity index 100% rename from meta/classes/vm-img.bbclass rename to meta/classes/imagetypes_vm.bbclass diff --git a/meta/classes/wic-img.bbclass b/meta/classes/imagetypes_wic.bbclass similarity index 100% rename from meta/classes/wic-img.bbclass rename to meta/classes/imagetypes_wic.bbclass diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass deleted file mode 100644 index 74d34e29..00000000 --- a/meta/classes/targz-img.bbclass +++ /dev/null @@ -1,8 +0,0 @@ -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 -# -# SPDX-License-Identifier: MIT - -IMAGE_CMD_tar() { - sudo tar -cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz --one-file-system -C ${IMAGE_ROOTFS} . -} diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass deleted file mode 100644 index 92acb6f8..00000000 --- a/meta/classes/ubi-img.bbclass +++ /dev/null @@ -1,20 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -UBINIZE_CFG ??= "ubinize.cfg" - -IMAGER_INSTALL_ubi += "mtd-utils" - -# Generate ubi filesystem image -IMAGE_CMD_ubi() { - if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then - die "UBINIZE_CFG does not contain ubinize config file." - fi - - ${SUDO_CHROOT} /usr/sbin/ubinize ${UBINIZE_ARGS} \ - -o '${IMAGE_FILE_CHROOT}' '${PP_WORK}/${UBINIZE_CFG}' -} -IMAGE_CMD_ubi[depends] = "${PN}:do_transform_template" -IMAGE_CMD_REQUIRED_ARGS_ubi = "UBINIZE_ARGS" diff --git a/meta/classes/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass deleted file mode 100644 index 60c3bf14..00000000 --- a/meta/classes/ubifs-img.bbclass +++ /dev/null @@ -1,21 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -IMAGER_INSTALL_ubifs += "mtd-utils" - -# glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 -# should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 -python() { - if 'ubifs' in (d.getVar('IMAGE_BASETYPES') or '').split(): - d.setVar('ISAR_CROSS_COMPILE_armhf', '1') -} - -# Generate ubifs filesystem image -IMAGE_CMD_ubifs() { - # Create ubifs image using buildchroot tools - ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ - -r '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' -} -IMAGE_CMD_REQUIRED_ARGS_ubifs = "MKUBIFS_ARGS" 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") From patchwork Tue Apr 5 05:24:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1660 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:17 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f57.google.com (mail-lf1-f57.google.com [209.85.167.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 235DOwnT023884 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 5 Apr 2022 15:25:03 +0200 Received: by mail-lf1-f57.google.com with SMTP id b7-20020a056512218700b0044869874779sf5066089lft.3 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=Z/u631Av+FiBGMnePPPBedG5o/4EK78kNpaJoEVFMuOgbCUbhsM5oDpUg3GWaMmouH kmIKx9xVXUqa7JqwZtf2Yjf67Mg8451UyUBG0c+IDZ1TVxl2Z2qrV2T9r3ciimqNFWy3 qrnta4WdCY/DGYxKLWpFZ/qYcy2uQgYVEmtEWxzUIkX+ZcOs9KmRhEXbvB3FgFr4bbYL Ezsp1OGzGzK3q7aX6Tj2xOjV/bm70lh2wQ/Ki0NnomcsKcrk3Jg1AUkU4pbDZZ53l+mG 5N1bJqm9b7TlF7tNO+A46owOBt5vNCmIg6k1lyx1rONRBZZEZ5RuA/iRt7aaVbKTXqVB X3PA== 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=oDEJdmEtFgqIjVJ30biFoTRGG0LWFVZGi9evFvnOmKs=; b=Ldl0AJphq9mEjur4e5KDOXj4+8aORCZlMe7skJsECkEnCR1l7+/xfsAdewkD7+qH6o jAgxBkzO4Sjf2oXJe24mZBoRlDa4wbbXMyR6N2ZmSoSE4n3svEbhptIrIt7L1svEdBIH TZ3ev0f62L5nOL0fTpFy6WXWqQvbeXUxItKKQKxaKdp+yaj+43MvUfCB6kqJkYI+RtdW CUVmGoxnfKKjPFuICmutf4Lvpj3aV7VElXFsJVutsdzmlJQKNTAY2GL2rAgYlHI2hzFw mxRMtReB7cQiHgrc8RLJ8jb2UfyOrpqYOfK079s/PJ6jQrlPga5HeVd3SA9yXxEoDLPu nc7Q== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZYMDvoC8; 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:fe0a::601 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=oDEJdmEtFgqIjVJ30biFoTRGG0LWFVZGi9evFvnOmKs=; b=aCLbC2ijeUbYNCQz9oHDpSEDR0FvIcP0DwSPGN3NlemJ8hL7Tp4gk8jfenZrYkbtnD WjUnIxxWfdKhfQthVkqofruCpClYPCW3WSMdqfAvDOhXgQE1w8bOGceEMU8lWsYp5LY/ wzhqQOWSiclukEBGhDGBQkuakXljgKcNHiH1N20LtTZ06/Gve/6dfL94kabLGKytXD69 30xdFTLlH/H/UVhYVLn93HZymf+Bh9HGLthbrmIEsxTdM++L9oU+lgRm8scH7pWDZ9vz 6QrKh1X7cuahKxBuNz0I2h44kjp7F0pu29k8C607lPmdievJg88ivP5TFbzVCxTNhoid 7MKA== 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=oDEJdmEtFgqIjVJ30biFoTRGG0LWFVZGi9evFvnOmKs=; b=SFkniWBheVINwf7iOwoVaVksqnmhfpLStWDtKtvtx2iSEFe5vuYp2nsPW8tjudYlMG xZUOAdD0Ix+r7nYSW+p7swdqmglt8ZvNY7bb5uyBAwg6HUOkGBZltjCotoGR1Hj90q9O Q4/lDFBwcpfUqGUJ1zqEpOJD9nxKKAnXryat5XhET1YpUvXqaNZ25M1+oAwq8/aYrW/d N0nnjL9hdRXNruA7/GkqrTaR6hnGoMWNoFhm6/PuLQfdK0UfnQUZby+G2M/vTJJbviwd 8X/CYyZED80ucI7XGI9q4/09XIHv6kUwZE86QZo0dCsSlqw7jm7Tv3MK/BaBCWry+sD2 dRrg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530E0HdKlTwM0Au47mqEqzC+vdekGIXUydfRZNZizd+zu1zCYCIN X4FyDiAu1zjpMECl45wU4kk= X-Google-Smtp-Source: ABdhPJwjbICgj43J0CyFtTVVxxcnZsYY72SrZFQ3FJMxfr7V1NEAD4I1T4zxIjAYoL7KLP0TP9VSmQ== X-Received: by 2002:a05:6512:230c:b0:44a:2282:8e38 with SMTP id o12-20020a056512230c00b0044a22828e38mr2677658lfu.315.1649165093235; Tue, 05 Apr 2022 06:24:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:3813:0:b0:44a:9ec7:d611 with SMTP id f19-20020a193813000000b0044a9ec7d611ls545253lfa.3.gmail; Tue, 05 Apr 2022 06:24:52 -0700 (PDT) X-Received: by 2002:ac2:4d5b:0:b0:44a:14c9:89fb with SMTP id 27-20020ac24d5b000000b0044a14c989fbmr2646242lfp.345.1649165092443; 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=q/8MEfjhb2vW+ch80fXOV39KY37kVDoKbljTfWEEz9/Rl1Tx6vRq0Uzqog7Z6LGmVw OszivwBMr2NnWBsJeqSv1LdTtUg/UZfgVDsay0V1UQ/Wck3/mepxOGv8CanCa7cSBgFe C9HRGoHgydAPEA4XBkOfuYho1BBDBKe5Q6JaLG4mDJDbO8zRkDojItBy1abf49Qilj26 mbsJOOQ4usuS51snu5Pt6zvpY+F13VErqQ1dlpkZ5+JrjlpSxFtkQBxbFjGr6RMiiukD dweqAX/PSxPF11057snGiw6ulY1fl8SCH1nT26dlp/HALEJSXVvIjFZd5TR122JRSzZE DElw== 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=gcz6hwxUiOqP1Ao2YEhyXLt5eC1rkq16oHQwzaICKEo=; b=UE8JbN2tduokuX1VrVkIBc/vHBm7UN6VpddzeWS4l9IOxnnDEVpOBjCP0kpnaHcBi5 mGh1lxqFKKB4pIqv9HeCCyobPDIT8CiW0vXXkW+Woysv9pPEegzdaBaPCOnvU0MJi1FQ XsvWaU4yQZUDziYi3FSIcZqxfWOqhTe76iowawJ510hk5UlT+mh8LHM4RwJDDxLWnmVE WBLLFenyGGKOlQv8GoiAMgXRIBZz2mH7yaJtcmpj9xErT+2HSEyyj7tr+FAXiOgekMlH xhENJbsb4IjrbzfWBXRCdT0VkN+NZdxBNpkg+ZkQ/rON5rCpWtbpY67YWLiQDaUv6mMN 3RNw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZYMDvoC8; 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:fe0a::601 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03on0601.outbound.protection.outlook.com. [2a01:111:f400:fe0a::601]) by gmr-mx.google.com with ESMTPS id c5-20020a2e9d85000000b0024b16acae2bsi352722ljj.8.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:fe0a::601 as permitted sender) client-ip=2a01:111:f400:fe0a::601; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LbFlZoqFcF1vhUKYvczW5HF7Ip7FbiLIZ5BYgCZCTlJZ+ioc5HdpZ4Ps8QPOyjmazMP+lwmEN2RE3rmyRQIDmhXi31EilC6VcWLDTXWkE1rb+vfYYJVyiVBOBhfWFxLnLtuaVWkVPXO5uH9kW84B5iu/nAiUSpG6mLK+AVH7GhaBitqYRhIRObcLSv8jFDnaS28nlAghkGYs72/51RgsAg5SUCj9So8v/I+jmKg5G1KrPdRwroARMyltn81223XACFPEKH3IfxmFiqX0TPFHmEtQUJgC0/s4+l4GvDhKLy/0TRG/5WeI9A8sGvVLpOcVgMI5lwJBFoGKMCvpKTUzWQ== 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=gcz6hwxUiOqP1Ao2YEhyXLt5eC1rkq16oHQwzaICKEo=; b=Wd1k++27heeUV/O2E15TDinXy7PM1f3G07i/Iw+3cohZE4Fc4o7qisZvBZmR0lWw6pA3X/ZOULa0z3l4X9Y/b0wceAlk+TBvYIrIFazje2ioX6p1FMASl1+cGWQp63boy8xmKJmY7bkiYVbvYEOJggiwgcWS8JDgg9B9bZbQEk/BnHvj53pZv98ZuzySxJU7jhAP1ZmL/DhNvPlv1XKmtnjLFVlo3a05D8HK9ektbmex7cKLcUOQJazKODSrXnGm/beQxQb81slbofN/+GuLt/EDFZj3EJ9cwwymlIG3uZvl9a3NmQfXhQyc0ypnuPBAF8yMecvXgRS4+sJ5ixm73g== 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 SV0P279CA0037.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::6) by DBAPR10MB4283.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:1cb::20) 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:51 +0000 Received: from HE1EUR01FT098.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::17) by SV0P279CA0037.outlook.office365.com (2603:10a6:f10:13::6) 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:51 +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 6/7] meta-isar: remove IMAGE_FSTYPES from multiconfig definitions Date: Tue, 5 Apr 2022 15:24:30 +0200 Message-ID: <20220405132431.2895832-7-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--11.649100-8.000000 X-TMASE-MatchedRID: U8xOoY+QaPmT5dDfN8TpsQp4UBC3atMiDSsx3Wb5DQk3aW/7bl6SZ2tq QgJyb0BRkshAoFcG3yQZkgLnW4KPXRlrc264S0YI5RTVXdccDuoHKdtUS/l9oT8Ckw9b/GFeo3E y1/GoJqWe87/vN9JpT2LpIIQT+xImcrci5qqtowC18ETvXXRjSsHVNeDWrWSGq5uw61JZjZCAMu qetGVetnyef22ep6XYymsk/wUE4hoz688Ors6dsBvmDYM/EQg4NXpzPmLo+2/Hp/TCOedpSwK/Q FOpzzud X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.649100-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: C99AFA5533CA634AE94B5E7CAA40F65C3380EF39C0FB8920CE1C67C3926248FF2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 20208578-7f77-4aa9-5454-08da1707a9f4 X-MS-TrafficTypeDiagnostic: DBAPR10MB4283: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: 96udW1MZLN0ruVzC9T0tdv8OGWwBdBZbRZyN43Ao5WdJecpJ0zf3fyKC1Bu4uH9oFgR2hdQF0tSjRSWxc2/fk71L4d7qCioMRMSRQS39JwdFUDU8krHU8VEPyh2C8AExYAOHMpPaawSnZBIPe/zdOBH2EHq4K+WZu3chD46NEe7OvAm4XKq0y91PHw7WvCStUWbb41qiy8gpNO1WBDea1YqFfCSxWmidNwmL+gJO6PDgKSo2FYDuhuJIsmjT0ELZ9iSZg+QQXrK6s6vp38Vg4a4yfxIq83UoG1wuQlUXA9THxHMaIv/gocVKp1xbvRh3Nh+CjeOVKJ6nVttRwkr+LMCHSJDvoCxGyvO8pERY3asMj1oKKPE30dByzbcAvkhijLyIGGWHTnETAxlhsc61YV2kYB1hmRaMOMA/00OntlsJWKGkVYdxLLVr4VcP1bj4fBCK83OdzJI3kJg+FSuuWUJl1FDAQO47F9wFH3LjBBppNdXKpQL76nTJC+jW18OptZnNuLiSXxZewOn87vC/IyxAwxtYlU4WCR93CmlD7X7psso2LXe0iYwVGxYCgL+dpbaYAojMuOGe0YUCbHN81rDIe3KeBJeq3+9fB8qgjekF2il4QqwpAgKLO5EWae/cToLm+iEACu4jAw9fq5ayqZ+GFJY4YtPTG8z5l7QfBzuzv3ytG7cXSjTaaKq1FOrTSY61V1o+jpfcTRIVmk7k3A== X-Forefront-Antispam-Report: CIP:194.138.21.72; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(47076005)(6916009)(336012)(36756003)(508600001)(316002)(5660300002)(4326008)(8676002)(70586007)(83380400001)(70206006)(86362001)(40460700003)(36860700001)(107886003)(186003)(82310400005)(8936002)(956004)(2616005)(16526019)(1076003)(82960400001)(356005)(44832011)(81166007)(2906002)(6666004)(26005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:50.8845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 20208578-7f77-4aa9-5454-08da1707a9f4 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: DBAPR10MB4283 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=ZYMDvoC8; 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:fe0a::601 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.8 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,T_SPF_TEMPERROR 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 Now that we have support for building multiple image types using IMAGE_FSTYPES, doing it via multiconfig is the wrong approach. This removes the configs that are still using that pattern (buster-cpiogz and buster-targz), and instead adds the building of cpio and tar images to the qemuamd64-bullseye config. Signed-off-by: Adriaan Schmidt --- meta-isar/conf/local.conf.sample | 4 ---- .../conf/multiconfig/qemuamd64-bullseye-cpiogz.conf | 7 ------- meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf | 7 ------- meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 2 ++ meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf | 9 --------- meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 9 --------- testsuite/citest.py | 2 -- 7 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 71ee8579..58f3e1a2 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -52,11 +52,7 @@ BBMULTICONFIG = " \ qemui386-bookworm \ qemuamd64-stretch \ qemuamd64-buster \ - qemuamd64-buster-tgz \ - qemuamd64-buster-cpiogz \ qemuamd64-bullseye \ - qemuamd64-bullseye-tgz \ - qemuamd64-bullseye-cpiogz \ qemuamd64-bookworm \ container-amd64-stretch \ container-amd64-buster \ diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf deleted file mode 100644 index ff491b2c..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES = "cpiogz-img" diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf deleted file mode 100644 index 8eea112e..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES ?= "targz-img" diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf index 1badc889..5c8cfd33 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf @@ -2,3 +2,5 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-bullseye" + +IMAGE_FSTYPES += "cpio.gz tar.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf deleted file mode 100644 index 675d934a..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf +++ /dev/null @@ -1,9 +0,0 @@ -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2020 -# -# SPDX-License-Identifier: MIT - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES = "cpio.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf deleted file mode 100644 index b48b0a6c..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf +++ /dev/null @@ -1,9 +0,0 @@ -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 -# -# SPDX-License-Identifier: MIT - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES ?= "tar.gz" diff --git a/testsuite/citest.py b/testsuite/citest.py index 8f47338c..f8377f79 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -136,8 +136,6 @@ class NoCrossTest(CIBaseTest): 'mc:qemui386-bullseye:isar-image-base', 'mc:qemuamd64-buster:isar-image-base', 'mc:qemuamd64-bullseye:isar-image-base', - 'mc:qemuamd64-bullseye-tgz:isar-image-base', - 'mc:qemuamd64-bullseye-cpiogz:isar-image-base', 'mc:qemuamd64-bullseye:isar-initramfs', 'mc:qemumipsel-buster:isar-image-base', 'mc:qemumipsel-bullseye:isar-image-base', From patchwork Tue Apr 5 05:24:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1653 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:02 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f61.google.com (mail-wr1-f61.google.com [209.85.221.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 235DOuX3023873 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 5 Apr 2022 15:24:56 +0200 Received: by mail-wr1-f61.google.com with SMTP id q15-20020adfab0f000000b002060c75e65asf1545523wrc.5 for ; Tue, 05 Apr 2022 06:24:56 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1649165091; cv=pass; d=google.com; s=arc-20160816; b=Xr2lAtVKkkMcM4Erdz9SbuwNulJ7O/Z0SNkshUd1KktjVMvJ+YqwPEIXlHq+rMeP+l jiIaidxBwJw8W+le3gyk52JtllsXksZRpC1XtAk+IPujyIqUnnUvOsvaxNg363e1Re9F iZ4m52FaXvGDqA+bBors6xks0BueZuGUR682+GVYXSMY59m0GiHD9NHc247F38cnZ7Js MxVgF4dqVdra1Y5lYoA8st/UExbIoBfbSOlg5+Qm+/p7Id0/2EwuKG6g6JrPBUfsctSD ahBblN2nXAyHXPtBD1UkNgELu6ttm1tfSLPXLsYq4GQbopZnev1fMsaEmLU7MlOLRcib XlyQ== 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=rRuBQjRa5QvRo3Ek4ifRKPaFc5mdf9cAlX5NUGT2h6o=; b=dEG0YuM/si28XQ6jPYsrjRzwEbTE3CkNwgthchASZbY4M9KkixL0iK0knWFXXERGEG T6lzQd4qjFjcn8JapZNkyxr03Hrf1s5L1oxuK5FD9PhxF6sznW1bhhgTZmkL+4TEhoB9 95grSdbcWUgHL8NvLeuMJ1ucFMEEsismZmRpSTxfqZipUcKQA9IFkfkI0msljy1m6aKb hUlWLr6UGoKYbuL6Gvp70x5ptC3oE04ie+/yghDQc3MtZO0W7pE37VWg+Kt9mx/BfVCB u4YkxP5VEYfQmWVEzzYLtOXt3j1XC0NARdag9LfKApbZQ43wssgAQDD1II70Fb2RnPeC qwkw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=g53VmH2w; 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:fe0c::61f 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=rRuBQjRa5QvRo3Ek4ifRKPaFc5mdf9cAlX5NUGT2h6o=; b=dtt0RqOvUIslIBR610g8tr3xhCLWjP2Q3jYpdmKCr5HV7Q5syIa9/rjKmUmRIMfPim owY1EJVKzJhMSHvKhYeTHMUXektG45Kud1fRjUIb7Cb+zuTl6U3VITzXZmV/DFkVu9bo b3V/zgvQRdbc7d1kNcOUY0gEkRLWCxW3g+EfiKxA+rzKgFqnurFusDWBd+xu2MKdD67R lYK51sqSUIsN0iuAyLYZA3bAWoBNmgHHMmnMfWQyuyksor8/mW3X91fxj1/E6F5zxpu6 hwFaAN9+WIDhYmMI3TPCcipYk+EtwbszW+FLhBfuJq0iuJTloVr+syIk/Y+0gzeyU4CF u4wA== 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=rRuBQjRa5QvRo3Ek4ifRKPaFc5mdf9cAlX5NUGT2h6o=; b=wXjlBWGuJ7zke0vGUDV8WZjBvba5/kzlTKlghu8QbD6CI8e8ZDrjWBQnfK0nI6cvip bf5cgrKGPnkj4yNDTdYwJgnXW/s9weCDOX8m+eyQvMNKaMBb2B/BFYW94a/vfehSoL7y 8UbsovYRVdEdjSZcKL3Ji+e2GFkf7rxmQRa6Zag14iFw3SqIkvpqT6vbaLLmezWio5OJ UbxoYmXN/iz3WZ007gEyVRiFjdByaYc9HzW9hXxBiNXSB7ObOFETAtGmEVtZLEwypyxK GhACzg8FKqPOwnuouEjcopgNfe14lbm0PMwbBo6yyaty+8pvqkuqtDq3F47nG4Gfcaef ckXQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532+SLYxTDJHJRgOceqDHG2ll6fSRCpyAwWA/qQLnygItWHyRM0i poczTMw3dLXJ0zTAD9O896c= X-Google-Smtp-Source: ABdhPJypdWUzJxpUyruQy4d1/iw+5+whNA5YBTWR63NHHs4wSHpHUGp5bvQHU57QMJhH1iJv8FjKGg== X-Received: by 2002:a7b:cf12:0:b0:38e:6b0e:a41d with SMTP id l18-20020a7bcf12000000b0038e6b0ea41dmr3223928wmg.8.1649165090867; Tue, 05 Apr 2022 06:24:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:5306:0:b0:206:e61:ce02 with SMTP id e6-20020a5d5306000000b002060e61ce02ls753565wrv.2.gmail; Tue, 05 Apr 2022 06:24:50 -0700 (PDT) X-Received: by 2002:a05:6000:1545:b0:205:a82d:8007 with SMTP id 5-20020a056000154500b00205a82d8007mr2850137wry.88.1649165090109; Tue, 05 Apr 2022 06:24:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1649165090; cv=pass; d=google.com; s=arc-20160816; b=Syl96FH93QiVUFPI/JRJWs1Beqi4UWJiSQBKq0GsZ6i2xnM2sPNTKHp2VXBbrWfd1X NfMn0MjNh54UUHwdOlpV1p72oWT9K4VxTLMRS6Nza6JLUAnsTks+M4afKRPsYbh1oXkh 05a9A/hVGjAhdl2T98B991B/egQsxnAB3/EDZ4yzYvSfeCQyXnYzoYm/bA5eaCrb8dIq 9QOMfq3Bn/wgARu9kt+fg8OWsvT+C9KypCGDYqSTyESza8Dpp1/Cuu8zG2yNUG7YaPmV +o7vAvoutZ7DPpfG+RUnwqz0OVup5/eKTU7TDlBsqna7Tac34Q3pnLQ8+bVDOEemmSjL LGPg== 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=2HD6zLVkVS+uwkUrcyrdajsiSwQcYgw3hvjPFJNmHsc=; b=S4Y/NUw1W9PPfBeh3bzDA1vgz/2HAS5AdMxsXwH5CKBNzWMHyTyx50LouMSF7YR8+B J3dvytn2Mcn4UowYjgtsx2X+i2+6CFgWZi18yJ16cSiqYZ/0pFtGESDPIkdY06jbKdTp pgy2NucIDHDel5+S7940Zax7pdsIKUdNPIrKjUhresSNjs4nlQEbbWMrxbreBd8yMhli gSO8KpoCWqjXgesGbWpmPoYGumLEVCJuiQkJIXNjLA9jtLyQrID8FqItag8m+M7fu+6u RYQ/Ii0KoWgnFpS+BeU4dZNU+XuXtlSd/M8zyS1vkKxxajAKoiYa97lkV+gnvfXuuT2M vd4g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=g53VmH2w; 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:fe0c::61f as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on061f.outbound.protection.outlook.com. [2a01:111:f400:fe0c::61f]) by gmr-mx.google.com with ESMTPS id n14-20020a5d588e000000b0020614342564si339204wrf.7.2022.04.05.06.24.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2022 06:24:50 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0c::61f as permitted sender) client-ip=2a01:111:f400:fe0c::61f; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f6mVL0Jt1ObcLH1U3cUZL5aHjgKyKSKHGXrliL90ywhItUmuhLQo2njrFuHA9E9SZNF/UHusCms59BMYPzrozFS87gkq/B7CeFR+LffJN8j9fbhe5JTFQbHu3AFjr+9sx/eEfcmSSHTn7cStdU+EgNhdEitygy6uzgtYUWNoGKFUaatLQRjv/oXsimwQlAeDDP0vU6bDeLwBRGX/BqiVVanHU3HSyhc90FTsiWG8kfdPRALySFJsMBF3dvYdtmcVUZF3kAwA2YIpg1tPxAgCw4hsDgp76lDZiokNSIQ97rMPFiLna0vxzJYgYQZQufAvjta7xDB27u5ojEaCz6OcuQ== 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=2HD6zLVkVS+uwkUrcyrdajsiSwQcYgw3hvjPFJNmHsc=; b=Y13Vk23yaMl6dq5BS2zhYzZN33Ykit10Q38DenMzlzoETJOj1l41uHnSrsUVNEi6JZW42VUjdHLW+cpmZ4O6Aw4Qmq1cXAEgoFYEJk/y6KaHiIL2NsT8SAg9Qf6r0pCarCOs3GpX5thvvMRslh6J1d8TOttubmD4ZotyuvSdy1fp5erPfwaGOuYtVDQb8F2FOA4yQG4Lb1ELs4IPyI46nG9oq7QqP0dfZsc7dnqTTQLrDc52hGcXztFsM4MApfrm8LCcDRddno8gAhGFNcSPa2TOiqbsOIKKkmQ1LrrLnMTGMpir7GF7CHHU5XWgjtk74JcZW7Z2BOGzMDxtB5knug== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) 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 AM5PR0601CA0045.eurprd06.prod.outlook.com (2603:10a6:203:68::31) by HE1PR1001MB1097.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:3:6b::21) 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:48 +0000 Received: from VE1EUR01FT093.eop-EUR01.prod.protection.outlook.com (2603:10a6:203:68:cafe::88) by AM5PR0601CA0045.outlook.office365.com (2603:10a6:203:68::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31 via Frontend Transport; Tue, 5 Apr 2022 13:24:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) 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.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by VE1EUR01FT093.mail.protection.outlook.com (10.152.3.129) 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:48 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) 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:48 +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 7/7] docs: add new imagetypes to user manual Date: Tue, 5 Apr 2022 15:24:31 +0200 Message-ID: <20220405132431.2895832-8-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--16.244900-8.000000 X-TMASE-MatchedRID: f6Rj31JPTe4QwVtkLIfLLbHs1wZTXKHBYlldA0POS1Jtdr9d0G+tOpho XhL48wE7eucl7MdNw8RlgPlELHsWWRyr9kofgD0FFR00oYoqDJafbxa3A1yTpzfu+RTlciXg/Md +OvVRT/kR34ro7k23nVBtcAz9x24SKWZyYRZycgtJ/2MFRNZuNR+X41oiFhcu6HuV1BUJYPNBJ1 CxuVkwjUtcaZvMECGy1Br5wWX7YQ2okitJmrFCuON7MovG9cvQ9eUjmTFKQ/T8OMEMU7OyZtPZW t1+42smTPm/MsQarwMBIoIumpW6V/4yf+7IYDgcsW3Cgu625dVTZyP+S3GVYH0OE02QLVC+WRYt BXVuRSVGMe+tDjQ3FnIin2hX71Kr5shPFSKOueR6p3UUV82FSRVdTj9tM44xggra2NOo2i3jLrH qvAiSy6lTFDGZMPhCixP77M1esQwZmf7ofP3gccKwBNRhxAkuxQuyWuTn6yqXfrypKnpvnre2wM m8sT5/E4klva9z5Jx6RaSpHJq/AA/hpPV0bNgBIvabuzhmQeCEtFE/+7XCuolSWYvdSPSYf3PPz 7C7ukZr9YiEX0WhNplA4IpB7gNOs8mgqR6m778aiTke3N9xUXdpFkj4BgGZCtzGvPCy/m68xE2H 2EuMWS5MlWghP7UmX46iGZTPpJ6qqsCwzad2bB6kX/VShDhejxn4v13MgUbB6S7ffS3eayLLJGC SgZKk4PdcWsl+C/MTUMg5euvPiXUbN++MZYTqFUGiMcidh6Px9/PgR0+rlqubsOtSWY2QgDLqnr RlXrZ8nn9tnqel2MprJP8FBOIaA/3R8k/14e0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--16.244900-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 60F348F3D8EAAC89E06641B59C6039F5A89169D6BF3AEAD2EE61E2C871266AAB2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 32a86d89-40fa-4fb2-ce87-08da1707a86d X-MS-TrafficTypeDiagnostic: HE1PR1001MB1097: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: TQvZVAbW0s3hJsOBhZWfL5223F/Icuadruum9WhY5QoBDdH9fKR78KRJ+ijMjLG+TopoALOb0NTgEqO2NdBN/+GLV1Dn7lsJjnciXxIZXTO1lkUfj9IaLg9ybS5a/ECUX2ELDWqCQENzwgrkEZkhB7H+yS26UPi+y64qVHvv7rRnN9wBVWxt71cOKc51+GliJ4BxckvSx/s+V6Ph9TblGCCt8pIJUx22UvdTzE+MycWT4/gwhjTAE7Nn4FLwIK2OlnkuCA83YpzFWNDKlJqkBaqOrsZMAfgKQmZJQlrbyPQGJqY89EscPLzZp9ltMXsLXRypp1MZtaQYeDqJMouJ4fWDBf91k1DoO+rfZMA/Bl2WiLt7y79aDSAZZUHuFYxMAtEujpSBzNk6J8z3WO1RjAQ1FyKOh0Nm8oVGzSzqYWC1V/CwYJy0EDvfuqRgStauGP5ID1ta0Z7S7Fo6A7CdMWamRW4YYtJIxqpc9Jb5hyQKnTm9Ha390OajmuJw+2ePB1vnYK97oi+qfqgvqUjISQ/0reSmSmwaQFviHMLtVHA4ZQ8RQZlUxxazZdECxG1x+2yiRC6aORrkE5UNdgaaNLai46LNBMk6dGA0SmkVu5jXdunNX+8Wn5tua1u9MYRTeATl8culJmt+4kwoGl9UeCd5oRyoplrKEv00RuSFcMdTlbD35EPb+YFhWGnGN5lPzoe7GLzhY4vUI5vTsUcP4jAWEfFBX/j1X3Fbazb20F151OALs4wMfMlXW319THFqp7MnVP3AfksR57N7gINMD+/z8BrN81eHeegzhTKB+awhWFCoHEaYS9hOSpS3uhuiCdONqa0OuBEPtvzbLicbArDpS+bLfDaSQRCgJECzGwI= X-Forefront-Antispam-Report: CIP:194.138.21.71; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(36840700001)(46966006)(508600001)(81166007)(36756003)(82960400001)(966005)(86362001)(40460700003)(5660300002)(8936002)(336012)(6666004)(44832011)(107886003)(36860700001)(26005)(82310400005)(1076003)(6916009)(316002)(186003)(47076005)(16526019)(2616005)(70586007)(956004)(70206006)(356005)(83380400001)(4326008)(2906002)(8676002)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Apr 2022 13:24:48.3856 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32a86d89-40fa-4fb2-ce87-08da1707a86d 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.71]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT093.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR1001MB1097 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=g53VmH2w; 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:fe0c::61f 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 Signed-off-by: Adriaan Schmidt --- doc/user_manual.md | 86 ++++++++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 33 deletions(-) diff --git a/doc/user_manual.md b/doc/user_manual.md index b950ff7f..334e91a1 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -213,7 +213,7 @@ tmp/deploy/images/rpi/isar-image-base-raspbian-stretch-rpi.wic.img ### Generate full disk image -A bootable disk image is generated if `wic-img` is listed in IMAGE_FSTYPES. +A bootable disk image is generated if `wic` is listed in IMAGE_FSTYPES. Behind the scenes a tool called `wic` is used to assemble the images. It is controlled by a `.wks` file which you can choose with changing WKS_FILE. Some examples in the tree use that feature already. @@ -253,7 +253,8 @@ https://github.com/intel/bmap-tools ### Generate container image with root filesystem A runnable container image is generated if IMAGE_FSTYPES variable includes -'container-img'. +one of the supported container formats `oci`, `oci-archive`, `docker-archive`, +`docker-daemon`, or `containers-storage`. Getting a container image can be the main purpose of an Isar configuration, but not only. A container image created from an Isar configuration meant for bare-metal or @@ -261,10 +262,9 @@ virtual machines can be helpfull to test certain applications which requirements (e.g. libraries) can be easily resolved in a containerized environment. -Container images can be generated in different formats, selected with the -variable `CONTAINER_IMAGE_FORMATS`. One or more (whitespace separated) of following -options can be given: - - `docker-archive`: (default) an archive containing a Docker image that can +Container images can be generated in different formats. One or more (whitespace +separated) of following options can be given: + - `docker-archive`: an archive containing a Docker image that can be imported with [`docker load`](https://docs.docker.com/engine/reference/commandline/load) - `docker-daemon`: resulting container image is made available on the local Docker Daemon @@ -280,12 +280,6 @@ It's technically possible, but requires making host resources (e.g. the Docker Daemon socket) accessible in the container, which can endanger the stability and security of the host. -The resulting container image archives (only for `docker-archive` and -`oci-archive`) are made available as -`tmp/deploy/images/${MACHINE}/${DISTRO}-${DISTRO_ARCH}-${container_format}.tar.xz` -(being `container_format` each one of the formats specified in -`CONTAINER_IMAGE_FORMATS`). - ### Example - Make the relevant environment variables available to the task @@ -293,9 +287,8 @@ The resulting container image archives (only for `docker-archive` and For one-shot builds (use `local.conf` otherwise): ``` -export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE IMAGE_TYPE CONTAINER_IMAGE_FORMATS" -export IMAGE_FSTYPES="container-img" -export CONTAINER_IMAGE_FORMATS="docker-archive" +export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE IMAGE_FSTYPES" +export IMAGE_FSTYPES="docker-archive.xz" ``` - Trigger creation of container image from root filesystem @@ -307,7 +300,7 @@ bitbake mc:qemuarm-buster:isar-image-base - Load the container image into the Docker Daemon ``` -docker load -i build/tmp/deploy/images/qemuarm/isar-image-base-debian-buster-armhf-1.0-r0-docker-archive.tar.xz +docker load -i build/tmp/deploy/images/qemuarm/isar-image-base-debian-buster-armhf-1.0-r0.docker-archive.xz ``` - Run a container using the container image (following commands starting with @@ -460,10 +453,15 @@ Isar can generate various images types for specific machine. The type of the image to be generated may be specified through the `IMAGE_FSTYPES` variable. Currently, the following image types are provided: - - `ext4` - Raw ext4 filesystem image (default option for `qemuarm` machine). - - `wic-img` - A full disk image with user-specified partitions created and populated using the wic tool. - - `ubi-img` - A image for use on mtd nand partitions employing UBI - - `vm-img` - A image for use on VirtualBox or VMware + - `tar` - tarball of the root file system + - `cpio` - cpio archive + - `ext4` - raw ext4 filesystem image (default option for `qemuarm` machine) + - `wic` - full disk image with user-specified partitions created and populated using the wic tool + - `ubi` - image for use on mtd nand partitions employing UBI + - `ova` - Open Virtual Appliance: image for use on VirtualBox or VMware + +In addition, image types can be converted using suffixes, e.g. `tar.gz`. +Available conversions are `gz` and `xz`, which both provide image compression. There are several image types can be listed in `IMAGE_FSTYPES` divided by space. @@ -539,7 +537,7 @@ IMAGE_PREINSTALL = "linux-image-rpi-rpfv \ KERNEL_IMAGE = "vmlinuz-4.4.0-1-rpi" INITRD_IMAGE = "initrd.img-4.4.0-1-rpi" MACHINE_SERIAL = "ttyAMA0" -IMAGE_FSTYPES = "wic-img" +IMAGE_FSTYPES = "wic" WKS_FILE = "rpi-sdimg" ``` @@ -579,22 +577,44 @@ Every image type in Isar is implemented as a `bitbake` class. The goal of these ### Create Custom Image Type -As already mentioned, Isar uses `bitbake`to accomplish the work. The whole build process is a sequence of tasks. This sequence is generated using task dependencies, so the next task in chain requires completion of previous ones. -The last task of image recipe is `do_populate`, so the class that implement new image type should continue execution from this point. According to the BitBake syntax, this can be implemented as follows: +The following steps are required to implement a custom image type: Create a new class: ``` $ vim meta-user/classes/my-image.bbclass ``` -Add these lines: + +Specify the command to generate the new image, and optionally image type +dependencies or required arguments: ``` -do_my_image() { +IMAGE_TYPEDEPS_my_image = "ext4" +IMAGE_CMD_REQUIRED_ARGS_my_image = "MY_ARG" +IMAGE_CMD_my_image() { + INPUT="${PP_DEPLOY}/${IMAGE_FULLNAME}.ext4" + ${SUDO_CHROOT} my_command ${MY_ARG }-i ${INPUT} -o ${IMAGE_FILE_CHROOT} } -addtask my_image before do_build after do_populate ``` -The content of `do_my_image` function can be implemented either in shell or in Python. +The IMAGE_CMD is a shell function, and the environment has some pre-set +variables: + + - `IMAGE_FILE_HOST` and `IMAGE_FILE_CHROOT` are the paths of the output image + (including extension) in the host or buildchroot. + - `SUDO_CHROOT` is a prefix you can use to have a command run inside the + buildchroot. + +If the code you provide in `IMAGE_CMD` requires the building and/or installation +of additional packages in the buildchroot, you can specify this: +``` +IMAGER_BULID_DEPS_my_image = "my_command" +IMAGER_INSTALL_my_image = "my_command" +``` + +To use your custom image class, add it to `IMAGE_CLASSES` in your machine config: +``` +IMAGE_CLASSES += "my-image" +``` -In the machine configuration file, set the following: +And finally select the new image type: ``` IMAGE_FSTYPES = "my-image" ``` @@ -603,11 +623,11 @@ IMAGE_FSTYPES = "my-image" Isar contains additional image type classes that can be used as reference: - - `ext4-img` - - `targz-img` - - `ubifs-img` - - `ubi-img` - - `wic-img` + - `ext4` + - `tar.gz` + - `ubifs` + - `ubi` + - `wic` ---