From patchwork Wed Apr 27 22:06:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1720 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f188.google.com (mail-lj1-f188.google.com [209.85.208.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23S66iFc005798 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:44 +0200 Received: by mail-lj1-f188.google.com with SMTP id x4-20020a05651c104400b0024f253d777fsf1450578ljm.16 for ; Wed, 27 Apr 2022 23:06:44 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651125999; cv=pass; d=google.com; s=arc-20160816; b=IX5uCQlxXZ72eEqL3ssc3fwh/OI9yKWvWz7jxlr2uWZwHHXTfqKxZonCd5vDY2k6Wd OQSBs34JrZxPaFxZw5P1u8Qdek2qkBXNhjpYyqVPTGU47mBQ/xFGbgl6iVt5sClmdnJW s1Omu7yqnLeBr45FSKSNjMG6nX0TIHeBvr44rM9xLlnSbiVOGAHAJQJZnjNcurhpkJx4 /5aPOQQQIlvs0/Ze9GHqYhU2mhGLKhrrC4mGT3sJkfUq24Ti/BlsLniCKqKOWRAFqVcS 1wW3stDhHWUNch0GGwj5Z8KuTa7VM2LIvTzLQ7tS4zE9wgMu7/mxVQJT3Cy7v3Ua+0zE r7Hg== 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=PdOT1tudVzONoPZhxFFBAbxmN3H/MheK3W2NteWpiz8=; b=vtEkgv0SEtVRqGvQrZRYS2GY87D5qbXP1cXQ0Ddjm1L2Awzn21niaR6Vxp7sMwdbXz H85i+VjPTHR8dOxD0l7mSrLbtC0SIqaxIvqS6wkaepM5u76vT39yj+mV+gMc+4E2kM5j O102iyrxYWFEonFut1oiY0tW1QrdO+yBVpj+Ql4I2M2jXILjaKUpZo6QDVT1aEUWjCDo dkwvQlJWijqgJfgvmLVplRmtseNxLEZJ6ggb5/77/5wF2Cn3Aw9+0/bXvIKKTb8LSms9 n9Rh1c9IZNjPPPFiaHz2/XP8X20n/oU0VwkWHYHOU3VsePGW8JKpzgM1GJug8JeHP+a6 cjXg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=BjOAlCYo; 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:7d00::602 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=PdOT1tudVzONoPZhxFFBAbxmN3H/MheK3W2NteWpiz8=; b=rdN3L9wicjkzGGnd9K61Q2RQv6fTwTL6F5tulKgDam55Izg3y1fzymg18ZlRMdKJkW 152FnIhGixbdNPxhWqpeM2STJorWyuC+dPEoEWk5KMwwxz4tOcgUJatrFnmAmyYYGyQ+ 6kfiJ+pmO8oZ1TJBNUdBn/xVTvV5ryCf5EhLxdV1GX9DmkH3omcpB9iH2UdQTynTpwF2 8Agry4vyJoscV+EyL855Hm4AlBfsh13xlt90PvF92P8VUX9Za93MeJJ8FmT4kFyugPDF qplBJS9DlS8v5tePUCKI0YQqRR5zd74a+gU2AvyUqmiKY0C5NufrrvVol6uBX1pcswdT ahpA== 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=PdOT1tudVzONoPZhxFFBAbxmN3H/MheK3W2NteWpiz8=; b=58obHxiL+e+47Cj3MZ8Iqj3NrgtGuGNyLMf8YzNn5BsGBqZvF5UwADMuBDNpWChxmW NqEhUtB8GMEZSwWyGa4cya1H1oYA3P/uRJEbg4rCNKzxaSuYZqDe923zyP71p4img6Ol CAjOQIDG/8yW7Uaz+ghUBzIAhuR7sMdKvQkkB3Ipt8AF9Vy/1nJOwmNKWLcyvDU5Kd1u D6POOfHq8pCvpWccQ6S8DndmmmHM+S4KrgJnDibErREBFxfd502XZ8y4RbpIoyvVirak WNtT08BakPrptA8/wmVQpp0G9gZG/nrmpEAI9enT4I/+q6zg+qfq/rMSRgJEwZpdWdDB W+9w== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532qwpjrksEn3nsKZv2J1/TYGwnBSXILYABSAkRYJ41LGzlHwZUu 30J0XJerOR9IT5VaFQtqeFE= X-Google-Smtp-Source: ABdhPJxTiM2teNCH6UpYge1xX42nkG/2L0xn3MupXLICbrsMV9HblkOIhtqqpvEI5ZYxqXO1sK6w9w== X-Received: by 2002:a05:6512:3d0e:b0:472:f72:a0a9 with SMTP id d14-20020a0565123d0e00b004720f72a0a9mr11396830lfv.484.1651125999082; Wed, 27 Apr 2022 23:06:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:b1c:b0:472:38f0:bc75 with SMTP id w28-20020a0565120b1c00b0047238f0bc75ls870775lfu.0.gmail; Wed, 27 Apr 2022 23:06:38 -0700 (PDT) X-Received: by 2002:ac2:5319:0:b0:471:fc6e:674f with SMTP id c25-20020ac25319000000b00471fc6e674fmr16786981lfh.493.1651125998202; Wed, 27 Apr 2022 23:06:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651125998; cv=pass; d=google.com; s=arc-20160816; b=B0QTioaa9bBcrYvc4/U7SEWOWj1+MBVjEF6o4HMzGMzbMQ1f7c6JJKBmnIL7MfqmFq rbOE7kC6X4gPzfgr/c3UpYjcxh1tiAxrB/zcI7borbvhdtMA7kELVLp6kd/Me9nKlj18 +qpOZcvE36OgjkyBNOXb3+pNvydBaVPoTEZL8uQ2wEOM5Nkh7QpzA6tPkeVPiBR6F1gV RZOMDhZqlymE26T6ZtVDZ0s1OQIzSinYdDIPTuDAmqdMInVBgFVV+DSq61aaCzeloZGD RhcLPoo8UrrcakjejqistmK3JqshAhyF3p0kPr8+onOCSGaZ5LbTWDlpI8ZZZ0lm5NuY hXiQ== 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=YdvXthH/kSy0Qt1/Qujq16XJXXQtWqJF/PoYSPykSnHPu3yD1CbBnYnxpmaiuwXpil x8THhzvPLww1p108p6IDJf0vvhc04wU4GVV+aID/fFXzqGoC26pkH2OtafAzaK2CXK/W Ce62x9m4YIUdHj1nIkIF7NZKBH6dTobM2g14ajhkVJ68k3d1+wFnF7xZdzZ1EGWgAp1B klC7/HYMpYRC/NcP988Yc4KT7FMdsVm30Y2FXuiRJASkVYaYK6opdN/+rpN1ut234XIQ Y8ZxpGUE7vjcbxuG1KF38BZIdjGgZ1fiSsSysXRZITGKxmFJ382vhRxi3Vx6Ic4h7NQz YVLg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=BjOAlCYo; 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:7d00::602 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20602.outbound.protection.outlook.com. [2a01:111:f400:7d00::602]) by gmr-mx.google.com with ESMTPS id d22-20020a0565123d1600b0047223e9d7c6si157097lfv.4.2022.04.27.23.06.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:38 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::602 as permitted sender) client-ip=2a01:111:f400:7d00::602; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=a0NGzIy3+gBGwIHcRrhXC+StQ8Or9Gkr5ZBPSfGEWmtOr9fCvm3KSmtft6CHxSnTaE/o/Or55svhDk2A7M1Ey1n+5eYVrxN38H8pHKAUVYpWGwM4BCqqJ7cwNbHgcL9ej1YkXkbVquIy+DAb49TzH53gXXEneOqAYiSVYBFioW7V6nHl6thG0xZP5smLO1S4VhV0ByjeIvjJofS0z2Z1GV9ovsiqeJEIGDQrRemxdGv2w1u9ZJO3NEbSdkAgr6yt0iVhsVzTocxkNDgAYJf5gyIV7Wc1Ujf4DmhTYKygGb8QVaoUtet5CqOX8VKRUxED3rHTEZsOR82t5fZGWvEisw== 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=jucYivjkqPkYe/42/Hw2vHuFgZQNhgXCymYe8K9hhkVpm8XG+j08dCe2S7Jv2g84rGlR9P/2C/y3AH289QmgdgqPzwALN927Oaz0iEdYccm6xrmT5smFflsN9/O6mChr7dT8w4uG9oAVGI29Y0FZopGmuQv22l8h9YxG5as2QMDaNt4TKFVtTf58MeGkUjCW5LR0V35vVYRpbtHl0zV0hGT9PT0l30ZtMIcM9DvGwb2S3/pL0HPAtQoraU6SrmYR7kmBtyi7U0wPvLzCIhxSqfm/7uBK/urGJtksko6Gfg+kg4251PoIehXBNkQfgYaR0dbLSCUkIdEWkKQlq1KQ2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from SV0P279CA0061.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::12) by AS4PR10MB6135.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:586::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.13; Thu, 28 Apr 2022 06:06:36 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::27) by SV0P279CA0061.outlook.office365.com (2603:10a6:f10:14::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Thu, 28 Apr 2022 06:06:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT069.mail.protection.outlook.com (10.152.1.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:35 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:33 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v4 1/8] image: remove IMAGE_SUFFIX Date: Thu, 28 Apr 2022 08:06:08 +0200 Message-ID: <20220428060615.986332-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--10.336100-8.000000 X-TMASE-MatchedRID: IIyI5q76PIUQwVtkLIfLLXr9azWb8PX1hi9FMLqxZlReu6aRt5rYyff6 ZSoNZQrICwWRLqiC/Uoz1brXqR2bWa3aC25avUuaOUMH3UOqTuB4lxq7pFBUUY1GwXh+kBzqmTM khNp6sQUvfU/riSJXkQXkFZhSLf2GCBG3yFdIPKTE1vMT2mVskU9h1xunNeYingIgpj8eDcAZ1C dBJOsoY8RB0bsfrpPIfiAqrjYtFiQE5m8DEVpZULfnadCslCIFwvAel6fG+EVcNLSNvi2SJn7cG d19dSFd 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: FA087F5164E3C6D1333D7242658FCDD58E0D48AD28E3BA631272770650FD80B12000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2b09368e-5c02-4622-e659-08da28dd407f X-MS-TrafficTypeDiagnostic: AS4PR10MB6135: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: 18gcsY6sEf6UJLQCl9zkFZxg4um7l8ugDH7zQ6LuNNY0ekut5akU/fsSadBonAWCPUFXQwoM8hTjFxoWW2/jMP6F4nhDWx3AyyLUOYlPd9v91ni7WoJC/uBilPj4qlR3/tcYZsIANRfCs2n+2xtzlzOIyUmloxK+04J9YbD8aNDBmUTf9DXm6RGo9PltaZp7ZIKxIsG+SWYV3DUUCarX95BUo/A1e5ouZLPwzf4sz45i7NrIlqWcL0H34UMcO2HGLv12QX8NTxyg62Ltwv6/ZQw8ta7cbHTzAt9FC1O2gHkO+JJ7St53/qgbYWEJmdBFfUcsRSmmrWxg+SkBdCrCT172uilW447P4UKq08kh7p+VTVbZW0ZXinoNk7kKfp39z7+IBj+U6plDjEr8y/TUAZLVqb7yBjDnTRoMTdyS4Iok2ExbIiZLRar5l4b4mkH18Accmey1Sj2MX/7VQuJVszyNX/z+F0YtxGhTC7+4bxgM1UeSOxTKkqz1cbPP9HyRo0SVg406bPhD2LXkdI2j0t+3ajoD4w6/9njdQqgC+jnmNF1GE8KmTbXfvcwPWVse7bDuXJUQH7xXXGdtLMjS9Po3hJIcZS3qOHaH9SvJnec/8ucNsH/M0NOdJ5tMXot1vR+iNFXjn8OOX5sU2A3HExLW//aMS9vbr7tb6omKnQRqSMWKvmnzTG/YJrrW2IJXK5o/G47VoxgX5Q9ic6YGSg== X-Forefront-Antispam-Report: CIP:194.138.21.70; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:hybrid.siemens.com; CAT:NONE; SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(956004)(2616005)(82960400001)(356005)(83380400001)(4326008)(70586007)(8676002)(107886003)(70206006)(6916009)(316002)(86362001)(47076005)(186003)(16526019)(1076003)(336012)(7636003)(7596003)(508600001)(6666004)(40460700003)(26005)(36860700001)(8936002)(44832011)(5660300002)(36756003)(2906002)(82310400005)(403724002); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:35.8229 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b09368e-5c02-4622-e659-08da28dd407f X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.70]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB6135 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=BjOAlCYo; 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:7d00::602 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 Wed Apr 27 22:06:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1722 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23S66i5T005801 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:45 +0200 Received: by mail-wm1-f55.google.com with SMTP id l33-20020a05600c1d2100b00394059572d6sf1063426wms.8 for ; Wed, 27 Apr 2022 23:06:44 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651125999; cv=pass; d=google.com; s=arc-20160816; b=sqal6j2SpyughDo+hVQQkVQiO/bEOICDXYid4vzJF3vKhnx5cy6jsOEz1VgoaqxgM0 dFuTST1HnYDgJN3SGrkrRLbxv1ha0oHc/VXDvqiSdnmEsqWJJN+zNoD/HDbQq9+aXTwE 6PadgX2s4NarDZd2+BcFEpkQQ6+Y1QZBnoWp3qUV4xVVbHo5o0K70jl8HhrOk1VcALZn F93Gxn13pwVA48uUVhb65UnEkJCc0FU0opfMUcxtV10MfGJDEyqnFMgzeAsMJH15x5EK mRxIN1lqaBr++s3z97/6SNmaInrZ12vDtF3ti0+f4W4KuOfi/oJODBzXfjkGNI2skyQP ccTg== 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=djh+yl9TRT1Lat7vpCsBt0s2i0ZR3b6VSuM6SzI8sbg=; b=avN48J/aqSOCADuymsbY/dJ6livD6Es/kD33EgXvOUVEtWDtfTmUVazpO2ZJ9JVK/n xBdMJb2wmat14G8LEIeiQR27fWQFUlym1pPjt9CinmRtSORks3T6B2AReOEfUvwCl6ji aJ/x+cwsuIfF3Ox+6UVJOgzhEUt8WXv4P8qTOvXCE6JmUHzhZbhYiHwv5ARtj04xbjYi TTT5qZQF2YIzLgyI6wa0On0B5FASifGM6SVlKza4kOVzCjCwjCTJGc4EhRJLXvXvpXg8 9mo3gt0hEQnMkGZmiah5Inja83RlZfC31YkB2Eu7PgFEVynCEFRegwCfBPpL95891FIv 2vlg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=jFgO7vbn; 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::627 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=djh+yl9TRT1Lat7vpCsBt0s2i0ZR3b6VSuM6SzI8sbg=; b=L8vl6nJVNOm8x5y0yy1XBTzjYK+1pQvMxp1mcz7NfJRtFanLE0Q45VDYt8VARlqndo 23/ZHC/6gA8ZAH0GBoFZDy6qqxr4CfKWkdGmHlGXlhtvJ0qSl0aiChLTG/FTTidya4Aw JWxxQhvTyhtFG1jITNjcmmkyQHNZc8ZmQuKcyq63Gt152E4rYPi09L7QsnUF1tYtkzhW 0fcwY/c7BDOSgqE7XMgy2AfoZD60B7HdoirSHsK47mq8aMWoljkCmlO6zwKoypJlIDjL IB5cTMg6vOV2uu0nYhtrs7NPSg/LaNRqnT4WLP4Onb06hogdRNGw4L3qGhvjirpxG2A1 yuYQ== 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=djh+yl9TRT1Lat7vpCsBt0s2i0ZR3b6VSuM6SzI8sbg=; b=e4SAVBbARae8pYTkq0kSpD0GTuJIOtzMm3xS3r6MGqADNRbbSU41T7iTk87qtJBr4+ wJnECoce1memPg+B4kVcAvCd+o9Ud/pdp8pFLLeGTW70drgoGvyQfmlEkX3i2KuEWwr/ XZWC9AzAznOZcYmrhzBLbXlaZ0/2YdjIZ0Io2P8Y2qwklMN5J21xwjKtVa2acD3WPXCq gAgiikbKwOGK2o3sUZ9cmDkIriF1X84QeXndQUCvLZwTaNx1CCLb8DTN2N1Xp5gYyTpS wnw/8YjiMpdOoIFlzjeP5cat7hKQnLr4b3IFnxEKkQWtGIgvgvV2ZC8KG5Gtx5IJ2dVN ctUg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530EjDSQEyhNK9XbWeyob639TV4U3rDC/cY81/ggRlvZUW+LT+TA HnSKUKHyZLM7N7iUKtn7zfA= X-Google-Smtp-Source: ABdhPJz27C574+Gk3lqzst8W1RQz4FLhfS26teFV6zr97uG5djKFG5iVHFMa79eKlxaLfTDLvsSdbg== X-Received: by 2002:a5d:5983:0:b0:20a:8801:597b with SMTP id n3-20020a5d5983000000b0020a8801597bmr25321425wri.287.1651125999486; Wed, 27 Apr 2022 23:06:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:2747:0:b0:381:80e8:be59 with SMTP id n68-20020a1c2747000000b0038180e8be59ls2023101wmn.1.gmail; Wed, 27 Apr 2022 23:06:38 -0700 (PDT) X-Received: by 2002:a05:600c:4e4a:b0:392:88e1:74a7 with SMTP id e10-20020a05600c4e4a00b0039288e174a7mr38680679wmq.174.1651125998599; Wed, 27 Apr 2022 23:06:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651125998; cv=pass; d=google.com; s=arc-20160816; b=mBjq4wdVVvbK5CGwbcekPunAF98HfqlEJJ9ctA0+8CJh5t/P+WxzqiyMkJrHoW7lG1 7kBJ8QaJbwZ0mtHQL3EydYHBPln3gKZi8vqQAxXnvRrd7rB/rEWq03iVpIMJZf42RKpj WzFMvmECg2XWERVfJcFGXt9y152ajbkkda7oHj8axa7PYhj803lYixIUVGUlk9ZO4OP8 4ibPIimeRomRqjNNyjrfFyjwy3wwgfcxvoFzVM+1CCHlBBCgyv/YW7RDjc3wYc4H7mM0 xoe/+q0z+evvzdJTyT3ntZ1V9qZOupiYmikjQ6aeHnGU847X+1E+x7v3o9SR28Q0H6dH je5w== 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=pqOqQsoDU4tc8SVRZMQZ5oEg+zuyt66nBiByvLQofx61zmIkpxaDj5sBio9NbxEbJP AKynfvcbtHFFNe7eJe7Cv4BR2WbLQBu0nEhsBhlKkQ5/sHgFJsxBnHpQri+S9iL6wstC 5T5vPkCP9m/n+pQYA7PjPQBjqFeMKA+xC6nvcbmrpJvko4Kp3unU2Yy5TcCI6MKTvn2G CAPsidcQAm2M8hPeBTxWZ14CGDq+GnNlSIqhqEQ9vdWfy7H6sUmtbtOqoLdZ4IvwpXAz iYjTy+0+evZ8PVJ7yuh+p4sKedjhrN+gcdi1JmLZ7zKbNJJ/Jbrc55XbxLsRtxccPcQm bdRg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=jFgO7vbn; 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::627 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0627.outbound.protection.outlook.com. [2a01:111:f400:fe0c::627]) by gmr-mx.google.com with ESMTPS id r1-20020a05600c35c100b0038c8b999fa4si283209wmq.1.2022.04.27.23.06.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:38 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0c::627 as permitted sender) client-ip=2a01:111:f400:fe0c::627; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ae3oTuxV6S+YgydeCnquv2WIlmpmrsUksDbMl9wNA2ip2oFvULiJsI6zm7s/wH4hGgefmrT3VXkOHV7IifYXw+AL1qis94OIEIfVm8QpGcF1Vwm0dL4l/K+pnBbO5JUwnjtjOMF+FEcb43hOY9D/of4H+6CfXH1fec6KVgSXSvpyEvZtCa97VveiWL28lZcRpiFDqLjKPFLCi6CahZ5TsXWudasAt9uR9EVQv8Lz+zWV8CpCf2FXoIOLqCAjPP+O1yYwlbBXwmtLPH9h7mh7uecpFNoi8g77jhDgJD3s+Fua9yW3UDEfRbB0fLSqBh0U84qy12vfT24NcBuG/4B3xQ== 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=gPB5CIXj1TTzXUFwX2yw5UXHKWSAwsVNOcFCP9kIMjj3Uee5HVQ1v15Bvo2K04J9F8c68ZSzYmWBfE3u1YhJ62huLMOBC+AhuvAmnFPDDUs6PO3P8K6prH+Xkp6lqv8AU1T3i+8OxVjfZALr4qLt9LkPWgU0ZVBHuOGhIcGMW14eP73rK5lFpO2bqvF/sTfPeD6xljGtsgSFEd5NRJzFOM3mVD86LdOD1YmFH779YD10mUJr3IrTE5yeidj0udYi5jvAxzi2XO+zgnN09/BK9ss7mZ76tmJ+1LsW33X1lGAukTc4SfS+l6bn8SZsWnETbPo5czeK2mwFquVgdeFtbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.70) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from SV0P279CA0063.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::14) by AM6PR10MB2566.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:a9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.14; Thu, 28 Apr 2022 06:06:37 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::27) by SV0P279CA0063.outlook.office365.com (2603:10a6:f10:14::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Thu, 28 Apr 2022 06:06:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.70) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.70 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.70; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.70) by HE1EUR01FT069.mail.protection.outlook.com (10.152.1.52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:36 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SJA.ad011.siemens.net (194.138.21.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v4 2/8] image: refactor SDK Date: Thu, 28 Apr 2022 08:06:09 +0200 Message-ID: <20220428060615.986332-3-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--11.446700-8.000000 X-TMASE-MatchedRID: 4U5WdtFP0Q6T5dDfN8TpsRjGdv/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+g7BOj1lchJLJ4CIKY/Hg3AGdQnQS TrKGPEQdG7H66TyH4gKq42LRYkKOlHURqRoGDjrdVM8yPd3C/XctpwDOP3XM2pCQlY4zt+3Bndf XUhXQ== 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: C1A03137A9E14BD8FEE48D3A726127D95E0867E0ACBAE1EA407365895FE572712000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: db39cabb-bb2b-4772-f306-08da28dd40ef X-MS-TrafficTypeDiagnostic: AM6PR10MB2566: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: 6W9BH8EH8mRCqNw90BuAfJMX0daUY7ZLWiu1YW8zOIAFASwZO5wSc12fAAKrI2imwEb+6EGjDoCTRtJpiafJbDx/Vj9UXrt2725VMIZP7JidMjl2vHi/fmEPL144QapvOlNxrwgLrGQ2iAh/9a2N4TM5zYVIRvkN4M3l2aVyJW93ROHYM6nNWkmcjfTfDs/kv+lwp8KVPBerMMTlUmUpMC6AG8ilzqputjoMKDvz7uZp2uZceWyiZBmYrrQNSF+AoD5PGUqzI1VWP9DalJGG6zKYPFnym1MwFE09Fr7pHhy84ZhfSeS0ocrp0BlF1KkOvVYdYHd/wi6GTiyMtjU1O0OBCNYLfqu2UQXugn8mu0IhWSVKpUfSqCwIfg1S2BgsZUfiE3JSyL7Z7Y8ceyrBsC0XHPE50RnN72WitAA2pMfFvQyvfJ9/aQZvOYa6AfIMPasbjxTuT/06trX6FCLJuSYM6LufOXLY6gzGwFltDXFOfTB//MA79Thhqlm2nNU2BK05oJ2a+tsmFNJvEO5QKmUBBHpJnDN4N/hDSV2O6m4zNRIawUnNVh+cY3FKwFgrJCOIrnGSP2hZElCZrZBXKXRpDQFcYxCRQZgddD2LOX1Vsy/e0//C4JagGde8o0HvutxxwLAwSUMlkZ3c3LjDn6jhxjjFbiz8e7CJ/J48ZSk0rf1CLIZBkWkTJ4KB/aQn X-Forefront-Antispam-Report: CIP:194.138.21.70; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:hybrid.siemens.com; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(186003)(30864003)(7596003)(44832011)(26005)(82310400005)(8676002)(47076005)(336012)(70586007)(1076003)(4326008)(316002)(6916009)(36756003)(8936002)(36860700001)(40460700003)(16526019)(7636003)(70206006)(508600001)(107886003)(83380400001)(6666004)(956004)(2616005)(82960400001)(356005)(86362001)(2906002)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:36.7447 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: db39cabb-bb2b-4772-f306-08da28dd40ef X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.70]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR10MB2566 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=jFgO7vbn; 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::627 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX - 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 Wed Apr 27 22:06:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1726 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:58 +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 23S66vOd005940 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:58 +0200 Received: by mail-lf1-f57.google.com with SMTP id bp36-20020a05651215a400b004722f090903sf1382948lfb.22 for ; Wed, 27 Apr 2022 23:06:58 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651126012; cv=pass; d=google.com; s=arc-20160816; b=Ju/awC2e4RNnjzaNz3PyBbypks6tVzQY+jwFxiyefURoRzxBClgxEaCLTSxQ3HayUx N5oeWpnfwsk9WMYPLg31s268C0EURrnxIKtV4wbJxS28ef+7rhx0yhnLuFmZGLNOFM1G Zslnebi+XkZhh8lwPNPjLp8p/dUP2DfVdBxUYSfrFQNCFH8X0X2a2t8aANtdNwh6ue4r geNmtLgI8LaLwan0wveTJTEPGrwPRiYeqRijsCc8HljKYaOH1s0LDqcV9NBknhkdKU3W xiiKv3Y7bLlIZxe27Oz9znakJ96YcLGUkst6gGT9jmmeDSYvGpvDZA8U2SESKexTFQ2m 6/mw== 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=y3ELvNLjUmd/hjnuqyOU6SqF5GB7HhiaqvGKZyf33G8=; b=z6ZAFNb2438ZuZb2gW2SZPD6qmIxSX+a4McbzzREXTB85j8rvAnwevqpcJnRe+tZ76 ZIb221OalrRjmW0Nd3BeOhEYH1MZWd4/TytFFTFLATo/RD7w3+DdKTM56sm/bDVdfjqe 9mg44ftQ3bDUkjQlei07Jx3tJS+3by52z6tP4GSWa/gLxMhQdWVxJQL8LMG9BlmFwGuR mnfImCHEH6GRRxr5+ml1ScESyR2t3DOcpOLFHsFRQnK1/ekk3RrQnJzzT6Xk4VQwLFn5 99giO264GqjaXmjJUxB+6yxwKFAKmwM30nZ/VYOG+hzS5Utur6lXgEHquqXKr/yM7Qjw nFZw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=y0ugbGpj; 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:7e1a::605 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=y3ELvNLjUmd/hjnuqyOU6SqF5GB7HhiaqvGKZyf33G8=; b=jx7b5gFbo1vOOH/vTjUqQ8ALjS3vNvRKgPfGekyE7jECgbyxEXzSxJIfGIovjd0uTh nv1C3sBcsJO5Wp2WxzXT3GNOoCS9RbY/FYbbLd82F5NUYdtYVOXb6pAyWSYtaJuX5CUc TK1IRGRB3DnY2SAe/gywHqWdjDxZEr8uvQHI5RPOGWdNQpcyrxLNF4MJoQRSAaDRVzNa bU8KyA046009U1dTC27QhziDr1bmbpUxibfyZk/2Il2KlFD+62bzXKjIBe4KpR7TXoHR PRMJEQofdCTvfvV6llyS6OFV/Zp9Zo7wBzPI9R5M6npXwpW4fL1WO2q62yCchQuNWqF+ X9SQ== 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=y3ELvNLjUmd/hjnuqyOU6SqF5GB7HhiaqvGKZyf33G8=; b=Jpl9xrJ886ZYiWkQyC7MMQD7k84rXEHVFRLbv/Nse77t2wjads9W3ROtOiDK1BtJwh VUnrDMQXXLLl05bWuoTZ4L5Fywdfuv6F+SD0DzBlUaFODyoeFJyBtjeqkyCxKoSm2vUu lx2SWEzAZhonsdmXyscbWPAeE29AlG40amBJ6sRgKkpoeJYfAXKM0GynWmjVPaiP8mSZ /ckjPfRqTJAe2/9oT2Oscje0FEYoEwjWxKpkmsbkkG9A0mAMYswc2woPN4L6VEXowYLz ZK8lT6mv4lSDJWfwbM8WEDLn/O1NsuJeqZFTdydYxRRfO/BRk71T7viCPaf5hafnTh6R 0Zvg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531z0razrqPlfuzdWgBmD+ilVjBN7hdsygbmvBm3Z6YIot2DsaOl cusN4GYaUgsA+3y1w/jFeYo= X-Google-Smtp-Source: ABdhPJxhRs3iA5vgNfc/uzPGS6mckLGL9JaWNyKKfFzS0auEOf/GonwjHqryUD7829BYTNbqm1jaow== X-Received: by 2002:a05:6512:3f89:b0:44a:f5bf:ec7e with SMTP id x9-20020a0565123f8900b0044af5bfec7emr23090700lfa.671.1651126012534; Wed, 27 Apr 2022 23:06:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls3754055lfb.1.gmail; Wed, 27 Apr 2022 23:06:51 -0700 (PDT) X-Received: by 2002:ac2:4188:0:b0:471:96f4:c1d4 with SMTP id z8-20020ac24188000000b0047196f4c1d4mr22943393lfh.626.1651126011588; Wed, 27 Apr 2022 23:06:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651126011; cv=pass; d=google.com; s=arc-20160816; b=XXUI1DJmn6XM8YeTlwBroK823u5+eaWMS/qnd/VozTuxG66ZMGdogB4I2qp+CHlP+T ZZMO772umGnjlZXh5+UG22zJH5KbXEt2XS2BR3nd8F1M30Ie1wo/cgooimCKYHl+56wq S+aqpEcrplRdqoVYlOvEtSKjnYAPXHP2iuZkiKshH2mDbkuCmTafW+wLqtnDUyaxYx9o wiP08VvsZCsRoS86Pbr/Mgf86CKxsFxdr7sr5wHW7Eah68hEh8VbM3n5MjWEWu7zUXYz 6zsun3YswbG4CEHqvl0519SQgBrv2ghfSu8asrUtJbiml36lCl4quA8Y2/taQGCs5SxU 2dvA== 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=R8leZsZSwosLRIqXXM0MebsXZrcxWC0Uvzi2FMrqq6Q=; b=XgqDyhH3xEyJVcoFeOyf+UUtQAzbTc+WXUx4/1jbYZhfW70P9vtmT2qTcGWmLz30fs tX4Lnxy26p8IBHcDIoeBQ4LIrFbko7gAV+oow8h2KOqV5BBA8KxDqRPDCOT+Ycs0y5Ol LIXCJmDVoVvJKo9DRW2eYPWWqAJtKWia0Ha68KRldLJLeCH0y4naP01q2N/s8elNbQGM 3wevBLy0eeP284kUqqU8ZocV3jx14gbVxrwBReetgDaNsbQTsg9u4/x5A3Ms1Sac5MQz B8wsbxyFuSg+VHjqESQwoQYGRqg5DlYHwaGozDuLwFXguYxO89Oze1qRhI8SEZGmiHVR StKQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=y0ugbGpj; 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:7e1a::605 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20605.outbound.protection.outlook.com. [2a01:111:f400:7e1a::605]) by gmr-mx.google.com with ESMTPS id b18-20020a056512305200b0047193d0273asi165819lfb.8.2022.04.27.23.06.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:51 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1a::605 as permitted sender) client-ip=2a01:111:f400:7e1a::605; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nmDkzzq15LCsiE2+oqS27YXxQVC737FrpeW+4me8JRyPQC0vQGXBC5QVoMbyQZ4hR6r/C1VnBEaQYk+bg5LL6N0oT0rGqq12+jXqPMNvISjzJtkKoh4J84L43EXs4X5ys8RW2tRuNYjmuMM6oRy/iXPWs80m5ASSBwJTuVdG9E9fqz3vr5YpVLff0iWlbP45mbVDAf2sWRpEyeCkipf1r9Rf6NPtSmFcFkY2132+OlMSALPjE2xh+WSbAV3kzYOdiBO/E6ex4y09ZMcPz+7SvEr5YxxmXajFiA0n3Xq/mgEuPYd6FG4hZ7ofzgGKTziq3wivjpd54Z52GRW3oKjGoQ== 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=R8leZsZSwosLRIqXXM0MebsXZrcxWC0Uvzi2FMrqq6Q=; b=EZJrncXpX8xt9ouZk3uJ1u+3ZZglNwUW+D5uksFDJirSkTJ4lsW9XS4Wgl5SxFHyClo/IdKi4B3EgHHI0PjGEHGEptFpy1aqz7wa81IFetxkhqfC6QtqmRBvt0RbMg7r9j5DCwQb1iCDQBu2RFzB6y5NZ7PDt2sqwBgCcujrZAjV8aJBeXhnbeLdaBsTppLBPds1Lp7R56IKTlkip+Fml4a+HSlVIOgfwlVs295zGl3Mz6xEf3EQwpo/ugJ7JUkHs2E9yP0rvkOFT2sdWNkskzAt2Ow1L6w3SPUyowxbr3tha/nV0rUVXTcMQDVuo/alqL+B5Qk7YWM6ud+d/IxZYQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from SV0P279CA0049.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::18) by VI1PR10MB2142.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:80::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Thu, 28 Apr 2022 06:06:38 +0000 Received: from HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::5d) by SV0P279CA0049.outlook.office365.com (2603:10a6:f10:13::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by HE1EUR01FT107.mail.protection.outlook.com (10.152.0.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:38 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v4 3/8] meta: introduce IMAGE_CMD_* Date: Thu, 28 Apr 2022 08:06:10 +0200 Message-ID: <20220428060615.986332-4-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--11.322700-8.000000 X-TMASE-MatchedRID: u0SOUSjK6nuKjhO49WcRvxtMufvbmwz+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+a38omfXdjnxOsxOOzVy1G1jO4I4qdhC2OTf6ksRncwz3CwuNS8coKUcaOOvZdr6oz k7W7RVZm0ipWSDf0Ha/ro3I/fUz1JaUm3mqtHC/g/vgkoKiXErhw/CPhbBXOzSsLVQWM99Acduu dkA1MgUEQTkIWiYv9SvU5mykyAqn35kXoM3qyAMuqetGVetnyef22ep6XYOwBXM346/+y0DhJtD ZPazWeDbKlR2lAOw08aAGsG05rxdulGnddVmVEM3VsY/S+0 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--11.322700-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 02E609A6DD9628362CBEF7B0C3B27181AE32C7CA5F2B78FF38F015E7120E08AC2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6bb77bfd-aa90-4a5c-63f1-08da28dd41b1 X-MS-TrafficTypeDiagnostic: VI1PR10MB2142: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: kRd//gWZ2cGvxs0CxrwZ3/bOgPPEau0sA8Km3h+MrslP3s3BC+p135O21V0cdD6QNmndWBRpiZP0V6O8pJ0Mhsy76vm7ZQC4ebU20uA7j30iUAQpITfHFyBMvWMBxYA2vxejAdjaUjwtYUduco8NFVKTiuIzmo4Q5pEWfDXfbzmKLZ53+pVYKvn3DyvOTnkpW0CWHhDTVQ9rixDxA8VbC7NXkHaz6sybeRDRYZSyRsPnQ0l3h6ZcTsm5CojQufjo9KF+VHVLGlty5Aldx7gUZLBG4iADqWEFX2N1zSUWo+m7r6SQNgquDpnLjOumZgb4GfRhQT7DGjZD/blnmdF7DEXiU1CWTiU+y+Px//2CE4pqOn3bvhAQloxXYDFMhxm69Ze09x0KAItAya2CDzWC+cDLPVLKuDEZjD9J+JnH6fOsd/BUTPfh/vnx6wFTo8znREQBIHpOXSC8T2HGKqw99LyiDBcFxZDzs3KAG8DRykPc8Qhj233mzjZcBqpNKZ9kAL24ORkI0ueu//8jQQydz8rWAGTCfRrYPE4DS/IpWneoUGZN25rldcjNs0mGy7evGOB+QY6n0gAJG5SDlgnH2Tx0FYxSEWlO2ofo/disehnA6ij3nEeo/pua4Wt8Ah5hLbW2bsdZkt+qi2z3XI7gxM9YHb/bllsgYxxhguDPvKZEkdsqIHoSa6XNIpDmbMWaHxiiHpVdhf2XU9uTT3rIfVMFR8EnsXjbd/25Fipjndvnhif7yCbbibc9xgyEQwfrATOJXVausOf1fV1Dhk1zCXP0cyAEaa0HVGJLxwYGMdE2OSlv3eqqhaGfOGzEgu+1 X-Forefront-Antispam-Report: CIP:194.138.21.73; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(16526019)(47076005)(82310400005)(6666004)(86362001)(81166007)(26005)(36756003)(70586007)(70206006)(6916009)(316002)(107886003)(2616005)(1076003)(956004)(336012)(186003)(8936002)(44832011)(966005)(508600001)(82960400001)(30864003)(8676002)(40460700003)(83380400001)(2906002)(5660300002)(36860700001)(356005)(4326008)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:38.0593 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6bb77bfd-aa90-4a5c-63f1-08da28dd41b1 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.73]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB2142 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=y0ugbGpj; 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:7e1a::605 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 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 | 198 +++++++++++++++++- 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 | 27 +-- meta/classes/vm-img.bbclass | 24 +-- meta/classes/wic-img.bbclass | 45 ++-- 13 files changed, 343 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..91c7aaaa 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,197 @@ 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) + +# Calculate IMAGE_BASETYPES as list of all image types that need to be built, +# also due to dependencies, but withoug any conversions. +# This is only for use in imagetype classes, e.g., for conditional expressions +# in the form of "${@bb.utils.contains('IMAGE_BASETYPES', type, a, b, d)}" +# All this dependency resolution (including conversions) is then done again +# below when the actual image tasks are constructed. +def get_image_basetypes(d): + def recurse(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)) + deps = (d.getVar('IMAGE_TYPEDEP_' + bt.replace('-', '_').replace('.', '_')) or '').split() + ret = set([bt]) + for dep in deps: + ret |= recurse(dep) + return ret + basetypes = set() + for t in (d.getVar('IMAGE_FSTYPES') or '').split(): + basetypes |= recurse(t) + return ' '.join(list(basetypes)) + +IMAGE_BASETYPES = "${@get_image_basetypes(d)}" + +# image types +IMAGE_CLASSES ??= "" +IMGCLASSES = "container-img cpiogz-img ext4-img fit-img targz-img ubi-img ubifs-img vm-img wic-img" +IMGCLASSES += "${IMAGE_CLASSES}" +inherit ${IMGCLASSES} + +# image conversions +CONVERSION_CMD_gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'" +CONVERSION_DEPS_gz = "gzip" + +XZ_MEMLIMIT ?= "50%" +XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" +XZ_THREADS[vardepvalue] = "1" +XZ_OPTIONS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" +XZ_OPTIONS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" +CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS} ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'" +CONVERSION_DEPS_xz = "xz-utils" + +# hook up IMAGE_CMD_* +python() { + image_types = (d.getVar('IMAGE_FSTYPES') or '').split() + 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 +447,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..5f1be89e 100644 --- a/meta/classes/ubifs-img.bbclass +++ b/meta/classes/ubifs-img.bbclass @@ -3,30 +3,17 @@ # # 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" +THIS_ISAR_CROSS_COMPILE := "${ISAR_CROSS_COMPILE}" +ISAR_CROSS_COMPILE_armhf = "${@bb.utils.contains('IMAGE_BASETYPES', 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" # Generate ubifs filesystem image -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 Wed Apr 27 22:06:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1724 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:49 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23S66lTT005802 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:47 +0200 Received: by mail-wm1-f56.google.com with SMTP id l33-20020a05600c1d2100b00394059572d6sf1063449wms.8 for ; Wed, 27 Apr 2022 23:06:47 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651126002; cv=pass; d=google.com; s=arc-20160816; b=yL73A2Z4vxLR4WnqpB4jUuefLnyZGilcBTSboGdcwEgheBaxKCkElcTC3u5bhc3JuI jhZ+X7x121MaKYJHhIIZx061YhE73z7+MYUapIwcCR6DRuj9fPVdv5aAYsGs7KV0XXqE /xKbMj57/HeEsddgOKnkT5VRjjYH8JQcBmPZ8/deAeQIuGdP8QtT7va7ubHOEEi61mfK 0v8FiqxjJ0W4LVQIf2IroRYmiub7cQA/SDADcXvVP/lqMXwOqY6+I/yIhOY1qnsvhdFc oW2cPYrw9mhala7VobLMmu+/uKIRlK4tCreSXgWbdlpNvjkuHqumAtm/OIHdptmzcjOn DSDQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=NbwSEnfCDijLxlOOVwcYqH++SDx1zWDPRp/KR2qnBQc=; b=gHrtjUAT3Sca8vz09HAk4X2w2rMOG6wN9KivuRKBGIqnxun1hPlkK7Z9FoHMv3mk3w goINnRbLJ3Wv+juiICgNFu1PCzRllZr6wLxZgJ9wlmH9AC06zaSBhISEZZoPFIq74biO +sN9V+NKVmhpdCy1inflR18AOd9Z5UdhIbUep5MFHid8MCCJ4WoFG2is2IRxRtbmOE/I qvqc5Ay2CoyWkB8vRoQsGq1w0f1AzOD2WnkDjIH7pz5sKqoTqEtqHQduENZtIBuy3B1n sP5PwYbh1gc3UN8ubl9/7sflfAOyEaDBI7NzineNTi9tDOwK7xeqcNVHYTGq4/FTemgN uCVw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=VBNW+D8N; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1e::623 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=NbwSEnfCDijLxlOOVwcYqH++SDx1zWDPRp/KR2qnBQc=; b=Yp54GR1QhzhFB3Vee8kUJKbdU1OerxCJ4n/sHr65BsxrQkV7jHOd+kfMuWUfs1bbgT r5qB/o2CGTCvEzekKHOHI2vCV+vRG/kqzi0FJb7sHrdkk2fYc2wDM5TJMITwI0ZzwRz3 qRaGvobigS6i6W9p9l/oIYX5+ygP+g9LbH/Mp7D4zxhkNA5uRE0fX5CdlIYgPGqT7h2c XsJs6p+xUMETk8BqckMPTTDGHxMe32Pt0D0F40Vfk10fK1UAYlvmcl361rLIAyy8/0e1 bUW6v7ws6oQMRrgXXt3nYZnT0p5OqBB+VX9J6hxrbvYET9sy3kYgeVmu4ikz9L6N39c1 A68A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=NbwSEnfCDijLxlOOVwcYqH++SDx1zWDPRp/KR2qnBQc=; b=XvUss7SQz6ACEof8WHZJ4aHzWgRCc/FCcl5hT/3QGNHOVBBlWwyVc+ftFGY7xYZkkF 7FECyEN9lz8vAlil5paSdm/2hRIYAxUUg5hraPABtctlL++U31A0cV3EAGGAkqFDYU7D yBEq4vk6SaF3ucz+hYCbTkp5sQ/w2bpM5gpeKajVSiFXzO8sUv0hwzhnzJqsbcEkhb1W ugsuqTuZJfPl2axqVjMgfC6GiqwdF0SSic+/KD2ao6ot6fFUnp1U40HE67vvRuR7bsm+ n8jGst+fGYt7RLVaWSh63MeLekn1Mc77zpvIX73vxB2ISxVYSVZpFjf6HQDD5yeyi9Qt pELg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5320KB1PtyIJ4kh5g/i4IEBywgZruE+cjgA2vc5tGBnDQu03fRCj 1vnEVN8NOei14b57WMVutUg= X-Google-Smtp-Source: ABdhPJwrwate7Wci834kWdLN6yW7mrxBm80Gd/hpKEE5ysS/wwHcsAWG0ixgGkkOUZsUsplV588Lqg== X-Received: by 2002:a05:600c:2108:b0:38e:b7b0:79bc with SMTP id u8-20020a05600c210800b0038eb7b079bcmr29491047wml.33.1651126002296; Wed, 27 Apr 2022 23:06:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:34ce:b0:393:e84e:a015 with SMTP id d14-20020a05600c34ce00b00393e84ea015ls2022148wmq.0.canary-gmail; Wed, 27 Apr 2022 23:06:41 -0700 (PDT) X-Received: by 2002:a05:600c:19c6:b0:392:926e:5023 with SMTP id u6-20020a05600c19c600b00392926e5023mr38501243wmq.110.1651126001317; Wed, 27 Apr 2022 23:06:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651126001; cv=pass; d=google.com; s=arc-20160816; b=VIZLNb+waZWtFbQAZEP1PEcY9gSV1ufDugxyeyOuR+GR4VP/B/IWjjEV8Q/gg+Q0Ma QjQu5Mukf8jJFkKy11hYTWzQ6KdX6r/d155k7g+L0nt4sHDKLJlvAx8RR67x/YUenlCJ Cs6BdWrJ5WAEchJpHwjteZkx5YOZPW0qEEyof1JQEXUSSdi9ZiNfsBunjknqX7rUhlZx sITPiFNbCOqW8QfoWHz+q259AJdfOGv0hxNJTN8XANe/tfmbNI2o53oqCnQF6LrtZVrr JCdGUOdh4PgdcqBSbbjbBDZ/1lovjGC+i3kT0jJs1TZ9PwtzqVjgIgmQ5LqaaVsLDWeH hR7g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=t1AkY7sljT5Y2gpYjRlwXbqLIoCOZDR/cXtV/jzJnaQ=; b=uXmdkPjJApLynCCRzm4F5zL7P3hAoGWPdalQUnv4K1bZSRy8kFHpkcuR2zGBcMYnPx HjBqgIwchbN9/mhpWt1hgSm2EHsJJ9i5rRtC+etOVSWNTiREOdraMsNcYhYc6qiRpd2H wG48actcJPXfjGaEzK+YaYkjhv++kiUno5V2LBsRu3G0QMvtu9P4MRArn7VS4Gz0WK/6 +n4Wpr6he3oAXrusQxWyGEcPR7l3VsMQpkNGhHPBVV3VbDaW6GI7kpuZwVYo/GtjxtOl sni3oi/F21tfIhdie5gqOrcJHFsMU1E7EJeOrbxvPGBGzJY9umpqtokhFsjil082WB+v q+lg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=VBNW+D8N; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1e::623 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0623.outbound.protection.outlook.com. [2a01:111:f400:fe1e::623]) by gmr-mx.google.com with ESMTPS id p21-20020a05600c1d9500b00393e98f67a1si193108wms.1.2022.04.27.23.06.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:41 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1e::623 as permitted sender) client-ip=2a01:111:f400:fe1e::623; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m7A482dnmdD7UFKz1avfUXRxJp3IZOb3imYVWe/6bH2j9E9yKnf0q7Wc8iW7vh6SniInfXyS34slw9Z/3GN0Y7jd2gvBgRbMBOyAgkh1jMm1RjwUNlVvLurX9PqxbvfCrA2eGU31Y3lDfd1FjX/3yiN+Ol2TyfHM3mHwa27P66fv54gT8QVwxdKB5W9fPRGQIw0mov1r1fMnwAynWj6ElAhBR3x5f406rqFHdw4OZ6S90mIVdtEqxsCkGO4HZc3hXn5Baz5QIe4JMxwtFs77e4yv+xXQkueHOp+hBcR0abQMEm3wLY38qszaO0n9tlvT6BFSsfABeNPniC8qg0hcZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t1AkY7sljT5Y2gpYjRlwXbqLIoCOZDR/cXtV/jzJnaQ=; b=YqOHKkBv48ABBFcRqBPN4agPbNsHsOTF6AHK8xxM6moYPjpeR3c7cS4M1MRomTmDrLot/m1nH/nkNO7CX6eHZik3NWhuhHTKgNnEwkLMA+fvAyMX0Q215GsXHkErKLQHQUx3E6fi1Y8/vmVSvvNhkPBTTVwpeQ1hH0VPjeq4432oS1ikTXrBxH8PDkT1v2dUbcflrvJngHrLKTE/j4Cke8msDoGdu8/cvchledKikSJG3Vdz1T8NfkDKdqu3AyA14kSnACVWTBi/IUywnRr/7YS+pUw1KI02HWXJ1gm/n9Z4SlhJUNYgSp40rRmwUSDpVnaW7657x2ullSTF0zgG5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from SV0P279CA0049.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::18) by DB8PR10MB3417.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:e3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.18; Thu, 28 Apr 2022 06:06:39 +0000 Received: from HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::5d) by SV0P279CA0049.outlook.office365.com (2603:10a6:f10:13::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by HE1EUR01FT107.mail.protection.outlook.com (10.152.0.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:39 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v4 4/8] imagetypes: restructure files Date: Thu, 28 Apr 2022 08:06:11 +0200 Message-ID: <20220428060615.986332-5-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--8.309600-8.000000 X-TMASE-MatchedRID: nMK7vCEp7YfZY+nnK3IwnMGnCHwCMuTJElH6l1EPRNgItCy6ZX/lLxqD rPipLA7BoxCLfriDzziVIbfpsq9FzF0qMWNOsGgAG6Aor8mgxBIDI91I0N0Y7w97mDMXdNW3ELb qrOgWzyev/7fHaEp6ExqGc7het5hmUtTgmoNQjI1r7b8CsPPtQe+90yVxudOIEVuC0eNRYvKW31 x27U9QYi99T+uJIleR5wnn9PXAc/dMqWhw3u66AuHPYUUXef6kyu0fpXITlDQTwfDtZ0TwrOC1p 3r9o3NF33Nl3elSfsqygaZY7yrHzqIaM+CEC29x7GlLKb+3caKOIGWE92dOkM1+HYKUTcWQyeUl 7aCTy8j5LkL/TyFZzYhwHj/iDNtw7hkjCJvdG+FrCXi+CAenHLtj8w9EqUz1nVTWWiNp+v/v5Je olM8iu9JO+sYlhfSoE6ogJvBVT03i8zVgXoAltsIJ+4gwXrEtIAcCikR3vq9rXQNzq0ar0UU8cj +hUWuWCAVttK5Hnp21aYLL2EFDAhlKv3mGlzN/ X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--8.309600-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 11658981CACB2D65B52DC6646495948B2CF3B3A07264ABBE2AEB40DE642027432000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 790e4aaa-9eb2-4aa0-331e-08da28dd4245 X-MS-TrafficTypeDiagnostic: DB8PR10MB3417:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: D3gIdXQnXR4Ejt5k/rS/NBAXzyqIy/QmCjCk59TBl1jLRGa9M7mEn4kbugiq6NwHH0tavKwkn1ph5Fps2jeW3dMP+nj9SunzSl/Ww5jB6o7O7fVzGPp3DfsaS1RLCDeJiPpumjmBFMqqc1sX+BHHT6MHePIHtuXWTkm/Q+3fcITW/o9lcefEZb9E1mMC4iek5j//Xudp4bsTIoNsZvmZXwj+JhsgHHgyPDfEwV/dmayXU8a2HbdW2E34GHZFWfBrI9lpDxnGq6g3RPJTYiuEtvBgyUnCj+9/gR6aJjau8UJAr1zkeIMS2BEHUjm5k0SL1Xl0lJRJx2ddtLOVQo+sp7z3dXBrSsQx1mKmGRBGGk4da61FOH2B0bugb03Nse3kTuYDcI591DHv9TBemYPD5ktga+qB35oeKFMbsdMQnATTWA8RWNyQTtnmtUjWmnMLpekQKnh1y9viXJ/GkQ2mSl63vLG11MXH7zRkgz4c86zZ//xxuURzF0k+/+P/evznPJGRIYefZzYBflwsaPLuSStmSetq/5N2Q6wYEG9MVWF9Lb34RKWFZJg+FHTI3MaXEvyUHfPkfsMbt9dGcD1UpLrQ7/3CEh8QJLjKxG7VVSm66bYEzr030CUtEPbHqTQoLIFPn5W2O4JaQ83/DbMsLfTNksJOqvjWPmPlIHpvzpNG8j2WFwgEESSbXZJlGdlClOWd53gTq48HmGNOfqyih+l/PsOSciHAxxKYkLHJ3SmmE1M05xvHszxF2qPVSSY+PY+ZvhmJn3xQi4MkjnG567FcMDsF0ic9RWZRn7rkAVLHNib+IF3ncuKY8cjwo9Bg X-Forefront-Antispam-Report: CIP:194.138.21.73; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(36840700001)(46966006)(40470700004)(1076003)(47076005)(336012)(36860700001)(6666004)(70206006)(2616005)(107886003)(82310400005)(8676002)(70586007)(4326008)(956004)(36756003)(16526019)(186003)(6916009)(316002)(44832011)(2906002)(26005)(81166007)(86362001)(30864003)(8936002)(966005)(508600001)(82960400001)(356005)(83380400001)(5660300002)(40460700003)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:39.0123 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 790e4aaa-9eb2-4aa0-331e-08da28dd4245 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.73]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3417 X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=VBNW+D8N; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1e::623 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX Instead of per-type classes *-img.bbclass, we move to - imagetypes.bbclass for the "simple" types and the conversions - dedicated files for the more complex types: - imagetypes_wic.bbclass - imagetypes_vm.bbclass - imagetypes_contaier.bbclass Signed-off-by: Adriaan Schmidt --- meta/classes/cpiogz-img.bbclass | 14 --- meta/classes/ext4-img.bbclass | 15 --- meta/classes/fit-img.bbclass | 22 ----- meta/classes/image.bbclass | 54 +++++------ meta/classes/imagetypes.bbclass | 93 +++++++++++++++++++ ...g.bbclass => imagetypes_container.bbclass} | 0 .../{vm-img.bbclass => imagetypes_vm.bbclass} | 0 ...wic-img.bbclass => imagetypes_wic.bbclass} | 0 meta/classes/targz-img.bbclass | 8 -- meta/classes/ubi-img.bbclass | 20 ---- meta/classes/ubifs-img.bbclass | 19 ---- 11 files changed, 114 insertions(+), 131 deletions(-) delete mode 100644 meta/classes/cpiogz-img.bbclass delete mode 100644 meta/classes/ext4-img.bbclass delete mode 100644 meta/classes/fit-img.bbclass create mode 100644 meta/classes/imagetypes.bbclass rename meta/classes/{container-img.bbclass => imagetypes_container.bbclass} (100%) rename meta/classes/{vm-img.bbclass => imagetypes_vm.bbclass} (100%) rename meta/classes/{wic-img.bbclass => imagetypes_wic.bbclass} (100%) delete mode 100644 meta/classes/targz-img.bbclass delete mode 100644 meta/classes/ubi-img.bbclass delete mode 100644 meta/classes/ubifs-img.bbclass diff --git a/meta/classes/cpiogz-img.bbclass b/meta/classes/cpiogz-img.bbclass deleted file mode 100644 index f4c33bd9..00000000 --- a/meta/classes/cpiogz-img.bbclass +++ /dev/null @@ -1,14 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2020 Siemens AG -# -# SPDX-License-Identifier: MIT - -IMAGER_INSTALL_cpio += "cpio" -CPIO_IMAGE_FORMAT ?= "newc" - -IMAGE_CMD_cpio() { - ${SUDO_CHROOT} \ - sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ - /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o > \ - ${IMAGE_FILE_CHROOT}" -} diff --git a/meta/classes/ext4-img.bbclass b/meta/classes/ext4-img.bbclass deleted file mode 100644 index 73d1bb57..00000000 --- a/meta/classes/ext4-img.bbclass +++ /dev/null @@ -1,15 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2015-2017 ilbers GmbH - -IMAGER_INSTALL_ext4 += "e2fsprogs" - -MKE2FS_ARGS ?= "-t ext4" - -# Generate ext4 filesystem image -IMAGE_CMD_ext4() { - truncate -s ${ROOTFS_SIZE}K '${IMAGE_FILE_HOST}' - - ${SUDO_CHROOT} /sbin/mke2fs ${MKE2FS_ARGS} \ - -F -d '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' -} -#IMAGE_CMD_ext4[vardepsexclude] = "ROOTFS_SIZE ROOTFS_EXTRA" diff --git a/meta/classes/fit-img.bbclass b/meta/classes/fit-img.bbclass deleted file mode 100644 index ef65af88..00000000 --- a/meta/classes/fit-img.bbclass +++ /dev/null @@ -1,22 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -MKIMAGE_ARGS ??= "" - -FIT_IMAGE_SOURCE ??= "fitimage.its" - -IMAGER_INSTALL_fit += "u-boot-tools device-tree-compiler" - -# Generate fit image -IMAGE_CMD_fit() { - if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then - die "FIT_IMAGE_SOURCE does not contain fitimage source file" - fi - - # Create fit image using buildchroot tools - ${SUDO_CHROOT} /usr/bin/mkimage ${MKIMAGE_ARGS} \ - -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${IMAGE_FILE_CHROOT}' -} -IMAGE_CMD_fit[depends] = "${PN}:do_transform_template" diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 91c7aaaa..26b1b0df 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -11,7 +11,6 @@ SSTATE_MANIFESTS = "${TMPDIR}/sstate-control/${MACHINE}-${DISTRO}-${DISTRO_ARCH} IMAGE_INSTALL ?= "" IMAGE_FSTYPES ?= "${@ d.getVar("IMAGE_TYPE", True) if d.getVar("IMAGE_TYPE", True) else "ext4"}" -IMAGE_CONVERSIONS = "gz xz" IMAGE_ROOTFS ?= "${WORKDIR}/rootfs" KERNEL_IMAGE_PKG ??= "${@ ("linux-image-" + d.getVar("KERNEL_NAME", True)) if d.getVar("KERNEL_NAME", True) else ""}" @@ -85,6 +84,26 @@ inherit image-postproc-extension inherit image-locales-extension inherit image-account-extension +# Extra space for rootfs in MB +ROOTFS_EXTRA ?= "64" + +def get_rootfs_size(d): + import subprocess + rootfs_extra = int(d.getVar("ROOTFS_EXTRA", True)) + + output = subprocess.check_output( + ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS", True)] + ) + base_size = int(output.split()[0]) + + return base_size + rootfs_extra * 1024 + +python set_image_size () { + rootfs_size = get_rootfs_size(d) + d.setVar('ROOTFS_SIZE', str(rootfs_size)) + d.setVarFlag('ROOTFS_SIZE', 'export', '1') +} + def get_base_type(t, d): bt = t for c in d.getVar('IMAGE_CONVERSIONS').split(): @@ -120,22 +139,10 @@ IMAGE_BASETYPES = "${@get_image_basetypes(d)}" # image types IMAGE_CLASSES ??= "" -IMGCLASSES = "container-img cpiogz-img ext4-img fit-img targz-img ubi-img ubifs-img vm-img wic-img" +IMGCLASSES = "imagetypes imagetypes_wic imagetypes_vm imagetypes_container" IMGCLASSES += "${IMAGE_CLASSES}" inherit ${IMGCLASSES} -# image conversions -CONVERSION_CMD_gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'" -CONVERSION_DEPS_gz = "gzip" - -XZ_MEMLIMIT ?= "50%" -XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" -XZ_THREADS[vardepvalue] = "1" -XZ_OPTIONS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" -XZ_OPTIONS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" -CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS} ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'" -CONVERSION_DEPS_xz = "xz-utils" - # hook up IMAGE_CMD_* python() { image_types = (d.getVar('IMAGE_FSTYPES') or '').split() @@ -276,19 +283,6 @@ python() { d.appendVar('IMAGER_BUILD_DEPS', ' ' + ' '.join(sorted(imager_build_deps))) } -# Extra space for rootfs in MB -ROOTFS_EXTRA ?= "64" - -def get_rootfs_size(d): - import subprocess - rootfs_extra = int(d.getVar("ROOTFS_EXTRA", True)) - - output = subprocess.check_output( - ["sudo", "du", "-xs", "--block-size=1k", d.getVar("IMAGE_ROOTFS", True)] - ) - base_size = int(output.split()[0]) - - return base_size + rootfs_extra * 1024 # here we call a command that should describe your whole build system, # this could be "git describe" or something similar. @@ -307,12 +301,6 @@ get_build_id() { fi } -python set_image_size () { - rootfs_size = get_rootfs_size(d) - d.setVar('ROOTFS_SIZE', str(rootfs_size)) - d.setVarFlag('ROOTFS_SIZE', 'export', '1') -} - ROOTFS_CONFIGURE_COMMAND += "image_configure_fstab" image_configure_fstab[weight] = "2" image_configure_fstab() { diff --git a/meta/classes/imagetypes.bbclass b/meta/classes/imagetypes.bbclass new file mode 100644 index 00000000..07ad0cdb --- /dev/null +++ b/meta/classes/imagetypes.bbclass @@ -0,0 +1,93 @@ +# This software is a part of ISAR. +# Copyright (C) 2021 Siemens AG +# +# SPDX-License-Identifier: MIT + +#image type: tar +IMAGER_INSTALL_tar = "tar" +TAR_OPTIIONS ?= "" + +IMAGE_CMD_tar() { + ${SUDO_CHROOT} tar ${TAR_OPTIONS} -cvzf \ + ${IMAGE_FILE_CHROOT} --one-file-system -C ${PP_ROOTFS} . +} + +# image type: ext4 +IMAGER_INSTALL_ext4 += "e2fsprogs" +MKE2FS_ARGS ?= "-t ext4" + +IMAGE_CMD_ext4() { + truncate -s ${ROOTFS_SIZE}K '${IMAGE_FILE_HOST}' + + ${SUDO_CHROOT} /sbin/mke2fs ${MKE2FS_ARGS} \ + -F -d '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' +} + +# image type: cpio +IMAGER_INSTALL_cpio += "cpio" +CPIO_IMAGE_FORMAT ?= "newc" + +IMAGE_CMD_cpio() { + ${SUDO_CHROOT} \ + sh -c "cd ${PP_ROOTFS}; /usr/bin/find . | \ + /usr/bin/cpio -H ${CPIO_IMAGE_FORMAT} -o > \ + ${IMAGE_FILE_CHROOT}" +} + +# image type: fit +MKIMAGE_ARGS ??= "" +FIT_IMAGE_SOURCE ??= "fitimage.its" +IMAGER_INSTALL_fit += "u-boot-tools device-tree-compiler" + +IMAGE_CMD_fit() { + if [ ! -e "${WORKDIR}/${FIT_IMAGE_SOURCE}" ]; then + die "FIT_IMAGE_SOURCE does not contain fitimage source file" + fi + + ${SUDO_CHROOT} /usr/bin/mkimage ${MKIMAGE_ARGS} \ + -f '${PP_WORK}/${FIT_IMAGE_SOURCE}' '${IMAGE_FILE_CHROOT}' +} +IMAGE_CMD_fit[depends] = "${PN}:do_transform_template" + +# image type: ubifs +IMAGER_INSTALL_ubifs += "mtd-utils" +IMAGE_CMD_REQUIRED_ARGS_ubifs = "MKUBIFS_ARGS" + +# glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 +# should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 +THIS_ISAR_CROSS_COMPILE := "${ISAR_CROSS_COMPILE}" +ISAR_CROSS_COMPILE_armhf = "${@bb.utils.contains('IMAGE_BASETYPES', 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" + +IMAGE_CMD_ubifs() { + ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ + -r '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' +} + +# image type: ubi +IMAGER_INSTALL_ubi += "mtd-utils" +IMAGE_CMD_REQUIRED_ARGS_ubi = "UBINIZE_ARGS" +UBINIZE_CFG ??= "ubinize.cfg" + +IMAGE_CMD_ubi() { + if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then + die "UBINIZE_CFG does not contain ubinize config file." + fi + + ${SUDO_CHROOT} /usr/sbin/ubinize ${UBINIZE_ARGS} \ + -o '${IMAGE_FILE_CHROOT}' '${PP_WORK}/${UBINIZE_CFG}' +} +IMAGE_CMD_ubi[depends] = "${PN}:do_transform_template" + +# image conversions +IMAGE_CONVERSIONS = "gz xz" + +CONVERSION_CMD_gz = "${SUDO_CHROOT} sh -c 'gzip -f -9 -n -c --rsyncable ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.gz'" +CONVERSION_DEPS_gz = "gzip" + +XZ_MEMLIMIT ?= "50%" +XZ_THREADS ?= "${@oe.utils.cpu_count(at_least=2)}" +XZ_THREADS[vardepvalue] = "1" +XZ_OPTIONS ?= "--memlimit=${XZ_MEMLIMIT} --threads=${XZ_THREADS}" +XZ_OPTIONS[vardepsexclude] += "XZ_MEMLIMIT XZ_THREADS" +CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'xz -c ${XZ_OPTIONS} ${IMAGE_FILE_CHROOT} > ${IMAGE_FILE_CHROOT}.xz'" +CONVERSION_DEPS_xz = "xz-utils" diff --git a/meta/classes/container-img.bbclass b/meta/classes/imagetypes_container.bbclass similarity index 100% rename from meta/classes/container-img.bbclass rename to meta/classes/imagetypes_container.bbclass diff --git a/meta/classes/vm-img.bbclass b/meta/classes/imagetypes_vm.bbclass similarity index 100% rename from meta/classes/vm-img.bbclass rename to meta/classes/imagetypes_vm.bbclass diff --git a/meta/classes/wic-img.bbclass b/meta/classes/imagetypes_wic.bbclass similarity index 100% rename from meta/classes/wic-img.bbclass rename to meta/classes/imagetypes_wic.bbclass diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass deleted file mode 100644 index 74d34e29..00000000 --- a/meta/classes/targz-img.bbclass +++ /dev/null @@ -1,8 +0,0 @@ -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 -# -# SPDX-License-Identifier: MIT - -IMAGE_CMD_tar() { - sudo tar -cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz --one-file-system -C ${IMAGE_ROOTFS} . -} diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass deleted file mode 100644 index 92acb6f8..00000000 --- a/meta/classes/ubi-img.bbclass +++ /dev/null @@ -1,20 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -UBINIZE_CFG ??= "ubinize.cfg" - -IMAGER_INSTALL_ubi += "mtd-utils" - -# Generate ubi filesystem image -IMAGE_CMD_ubi() { - if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then - die "UBINIZE_CFG does not contain ubinize config file." - fi - - ${SUDO_CHROOT} /usr/sbin/ubinize ${UBINIZE_ARGS} \ - -o '${IMAGE_FILE_CHROOT}' '${PP_WORK}/${UBINIZE_CFG}' -} -IMAGE_CMD_ubi[depends] = "${PN}:do_transform_template" -IMAGE_CMD_REQUIRED_ARGS_ubi = "UBINIZE_ARGS" diff --git a/meta/classes/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass deleted file mode 100644 index 5f1be89e..00000000 --- a/meta/classes/ubifs-img.bbclass +++ /dev/null @@ -1,19 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -IMAGER_INSTALL_ubifs += "mtd-utils" - -# glibc bug 23960 https://sourceware.org/bugzilla/show_bug.cgi?id=23960 -# should not use QEMU on armhf target with mkfs.ubifs < v2.1.3 -THIS_ISAR_CROSS_COMPILE := "${ISAR_CROSS_COMPILE}" -ISAR_CROSS_COMPILE_armhf = "${@bb.utils.contains('IMAGE_BASETYPES', 'ubifs', '1', '${THIS_ISAR_CROSS_COMPILE}', d)}" - -# Generate ubifs filesystem image -IMAGE_CMD_ubifs() { - # Create ubifs image using buildchroot tools - ${SUDO_CHROOT} /usr/sbin/mkfs.ubifs ${MKUBIFS_ARGS} \ - -r '${PP_ROOTFS}' '${IMAGE_FILE_CHROOT}' -} -IMAGE_CMD_REQUIRED_ARGS_ubifs = "MKUBIFS_ARGS" From patchwork Wed Apr 27 22:06:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1723 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:49 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f188.google.com (mail-lj1-f188.google.com [209.85.208.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23S66msD005808 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:48 +0200 Received: by mail-lj1-f188.google.com with SMTP id q7-20020a2e8747000000b0024f2d363986sf877686ljj.5 for ; Wed, 27 Apr 2022 23:06:48 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651126003; cv=pass; d=google.com; s=arc-20160816; b=B5AXZDF3WlsBHoFMXBSw+HvqZA9NRDIiI6cqf057xVd4rwcgtUVPP1oeM5VqFA60cd ltw22I+iRJPA11XEUyETF8y1xBJ0/X3u0HjzjXUj2eSjxdaE2tx/ogv4Bmu83pcSB9du qvF7cTn4KOWrLZywZziAwJkLuvBpUXnpf/o8qCRpJd1xcgBHojxvjOFEvbV3kr1KS7gD l1KcqwHKPpbxiy0V2qoiVzhsBJoH72UhdeDZFMKCr5361HU4UuDlImJ5ffXG7y0/Idmh F0xbGExq2fZqpSsK9xU4mi2Kn5bjBggChLzyJqAyzWfJae6gzIg4DhXR/CMXP8VEYmjJ rlVQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=BzDyB76Lgv7WhHCStwk/5qmVwIDYs5MxcKvYLcjPLq0=; b=koXQPaup1LFu43o5Xu1FTRmGGBpICopeNJXyF0LDKTEfc6iS1qGDdB7SOkX8/fRrgv DZR4v51SKQXXbhj2QLpy4YL1SeBdcOLMF3kkZxHrOpkBMwSQ/McCZFwLGDiYM8F+VVcQ XVNazUERNbX9eEW5NQM3w+VV40R/FbLF+9RCAb45QgR8PF5aRf+3jQsnKVUubm47rdsO CTtpZD4QsStvjR9i9VZwp81X0ydtdWDewXvrxLg+orSD8kpmvM+WCmN1gwHJTsO+4qIV XO3Z08H9lJIlELIJbWXbxk6/qUVWm+MGvYiDdusXIhBLzvyr1kZ5CE6uzVgefanDhCrJ eWFg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dwF0a8Gt; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::61e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=BzDyB76Lgv7WhHCStwk/5qmVwIDYs5MxcKvYLcjPLq0=; b=najw41MVzpyx1Yljxn2J3bRNkNdPD9l6xHd16gbjhtZVUsCwYCHCMnMVzNZ56APixJ LNkxV/GZYYEjBfXBWC3GMAthZRALrh9S1F+Edxfqn9DYyr5YejSz32QYSvmP6ZETb9lV qFd+BchBPbSjsL1z7h/7zmzwkSQqregB4sNR6ZIh/f8aDn37iklLm+UUCHpH5C8YWG3o eO478KJZfinCScq8wCFLs3zErBziJNPGmzSe0AeMKdnRCgm+NT33YObX58XxltcEdWJy PdntaQQH5CbRbr1RUBVgNlOL/vrmorTWxA9KGiurDMQ7I3PLz3nzeiNjXYOLtWB4Rjbp Dtew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=BzDyB76Lgv7WhHCStwk/5qmVwIDYs5MxcKvYLcjPLq0=; b=rwqc8RGYc+rjEKMLMVy/3CT6oDXdwYJn7DmPzhCLO+W2He6vjCyrhycz2r+8QutMzg omb19oissfH1B9anCoAcuw4w0UM8yj+M+PmhMlPrGlqnyqQH6ARdaZri1ROj/9P0CHIO ZWbVV31HePuZhRhrCjF14KLgcx4/5ih2I574CO8TPiDchiMgsVDy0slI5EoDEYg8U6C7 iYBT7zlGy6pC8OrPFWX+KNu3tsgvIs7h3EYEuLHmCeYtJUdbIshR7yoqtYvCqVKXix9f 4qo1/9A0deHKDwhTHhx+ri46JJPztfrZc204KBIl+zrEX9WQ+ejGn4vh8VF3MxbwOp3I SYUQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530b7lQuLQ3XH41h22jKRLPViQQ3Y42DMGnmdjFWcq/gGrNmTYwc OfjSRi8VEf8dG3766+sbDHI= X-Google-Smtp-Source: ABdhPJzKxjO35bL8B90Z2HlCUQgbraxwM9iS7yj9+bddTF5vNSmtv26mPK1BJIWHI4Qn+Ajj3FI5FA== X-Received: by 2002:a05:6512:3986:b0:472:4f5:33a0 with SMTP id j6-20020a056512398600b0047204f533a0mr14233043lfu.341.1651126002814; Wed, 27 Apr 2022 23:06:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:1693:b0:448:3742:2320 with SMTP id bu19-20020a056512169300b0044837422320ls3753644lfb.1.gmail; Wed, 27 Apr 2022 23:06:41 -0700 (PDT) X-Received: by 2002:ac2:4204:0:b0:464:f034:77a7 with SMTP id y4-20020ac24204000000b00464f03477a7mr22539375lfh.328.1651126001639; Wed, 27 Apr 2022 23:06:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651126001; cv=pass; d=google.com; s=arc-20160816; b=OYK0sYqJrUQZpeLF7XedViF1TKMwdcjZbpCBkgu8nt4DpnIbwBP+RraB3QXDktDqqE +wbJyqAKBdOmnQudIcAI0v6FoPy5gwM72ka+RyHBQ+YBDVcWQfacAY4Ml28x2TLamOgK FY++5lNtpuPXMwkNd2AFpcrl0M38kbI6MYr20uc8gicNvGF01t20SEXEUTpRilqarSML Vi9f1zFNM2TkIG1paLn099I5Z9h5ndy5zGHR5oTkis+yh2fINNZKTkKFV6wDwaVTdloK 2mMxA46rGyW1nYX0xLUPSuYS4AG7RiUlH6QsykCf62GghhSazfdGRvsWEAC0cmAmMU2h JFxw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=XWFGthK709YdwYJMtVBiatY7Q3WH73mFZZ7XcJnUfDQ=; b=L5LGIkL04K4DODjrOC7F3i3/wyvgp+fqa/k8/90psdh5RI0M7t0nmW3p1i7PAkzNVh sOaCPkIcpbwuoslx/mZzgtCfjjC7EN4vJEZpq63NTuB0Ar4iYuVpztg9rSNM/zbwqNQn uEIA8NxAX8OCrdYneAWm1rPm95akVXE/lHDuoPYUc0kCqNxmPbKDV60i0Z6B7anUX219 qTtWjTdRqRVpjg7ydeK16PP7wCu6TTAQJY30iGlAqgRgZ8lTt7EnKXFDZOxgtnayovrt z6GMxMg3jRs+SHHrQEc7yM4iEvz5r503rAjhmVNY4omAuzpYlNsqMItPiXkJub3KE4Ix g/JQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dwF0a8Gt; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::61e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2061e.outbound.protection.outlook.com. [2a01:111:f400:fe1a::61e]) by gmr-mx.google.com with ESMTPS id d10-20020a05651233ca00b0046fede34ee5si166595lfg.5.2022.04.27.23.06.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:41 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::61e as permitted sender) client-ip=2a01:111:f400:fe1a::61e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dMp45jNmfcyHuAM/w80Fo2y6krH89PCJhF2a8+x2knkacAxXOrvEqMqQRjcdlrz8G9korv0Qw5dlqFnwqScgKme+VApBkW7h4VASbHiQ5u+ShAGvTRhzlZzMc9d1NKkjuTh5n9sUDh3JeDLmSD2tO/gALyW/T5bD5OxX5LcxpJ9nb8t5X5jsJzH+60fcVqH1u7SItU6SyzK8Yc50wuEzJTlawPl2Jdg/N3aEG/cmBAXd7DjPgGmqJOwbJ300Yu2oCfdM+OVhLvjVm+SRa7rKXxzyyDEKKkmQMSyS5ZMPXPTL1T4ppvIS0LU2kWfZpw4A1JTNhzuYKn4U9mORFSQNlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XWFGthK709YdwYJMtVBiatY7Q3WH73mFZZ7XcJnUfDQ=; b=RvAsnV2AAqEFdyzgLOoEQTHcgi3ydAyCtO//k2WM/4yFHSJr6EpSzI63L7kP7crUnuC98EdA3RtBdLm7MODtWkV/LJ4L3GVCeDpxjBFtiaFaBztiAYyd9BVOQWS16I7HDkGyXgYw5fy89ZfF943G/fv6rkjFmAITydvtoTQAPzdpLlBgJpUBMzzUiM2VN0t5j30WcCG9CYo1sDLOwtQHWIO9SioGKdzCNdEB+SxE9FvB8vgnnSs58HfFIPRqfsYtTQwIxtMNYBFgWKHWigP67BJt/jG1Izd2HzCsbC7cR3JzWREAQaGakAP7gRv6TO4sUUUBr9X2zdEyIY7Kaoxpbg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from SV0P279CA0052.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::21) by AM8PR10MB4145.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1c8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Thu, 28 Apr 2022 06:06:40 +0000 Received: from HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::a) by SV0P279CA0052.outlook.office365.com (2603:10a6:f10:13::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Thu, 28 Apr 2022 06:06:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by HE1EUR01FT107.mail.protection.outlook.com (10.152.0.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:39 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v4 5/8] imagetypes: switch meta-isar to the new scheme Date: Thu, 28 Apr 2022 08:06:12 +0200 Message-ID: <20220428060615.986332-6-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--4.345200-8.000000 X-TMASE-MatchedRID: FLdX6EDRuFgQwVtkLIfLLRmYnxcmyg73NtWTJI2Df5JrIu4+N99FEdoK fgOoKJc2TJDyHMXec/aDnmxD/gIAeHb9uKwttSVV1klR/VbdVY2plEyHVtAnRZxVZzZr7+O769x ONVZSrH2pTkI0HK8zpV/uFVcjJsvfGTLPAS0gWUveL+dGDLE1Stg0S4KWRIlGp7rgqkxHgFTsfG +/NIT6/u/AZTBTiDOZ1qPBHSGmMaLxbqg/pB9kFVh9hewKITDKy5+wSPwnsbvuykw7cfAoIARry DXHx6oXe5EXi6Tp2n/bTyGgZTKDvlLFNpfGeNniiZD11v4eij4B2AjU9cY3854CIKY/Hg3AGdQn QSTrKGPEQdG7H66TyKsQd9qPXhnJ/4rWvpj9Ucg+NxsoL2fwHmEU36k9kJ3Gy3CJgzDSbWK0294 T0sJuYiNS3NI49OOLgImcnb4lDuNaQVxB9HMolPSRmFtyHPJc8PA5e+2DmDZMGInq510f4Xhb+t XQ0Z2H9HOalI4Kiyr2JUHlN8ax9FL0bdz5ADdFQwymtxuJ6y0= X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--4.345200-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 89BB8F340923F3CEA08E8CC59A16DC1970CE20426FD8FBACE67B95BCEC2C4C352000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7da282d0-d3c1-4555-b658-08da28dd42ab X-MS-TrafficTypeDiagnostic: AM8PR10MB4145:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 81iJ9VfaOqKdGEBagPOUDXWmsPjuZKV2iSrnqs03o2uBizCC+ga4cOAQ3I8h6EBaa1xCg4FL4sSxRyKbnGt0tZYlu/pItI87B7kx1WmJKABHEnBKpv3G/rOY/Q8lBPaXVwcd5EV0mZ7b+BTwNOmHb2JmnyPycXHp7Gf0b/5ehmvIbM5lkSDFgT3LjdAUaprOyqiLy2+c4FE/saTwGXWhnpONXj/IgASbEJEmDfxcJF+daBAU3bCDumk0lmsNMiVtahLjHd63hridNZ6xsF6ypdZsSnK33zGM1aGJDCehLe4yav1hEiTLspjkyLXQ4RIbULmY95WCk5ZRYBOrcKWjUoX/thzjef4H1o2l1bW2jGh9Zbgf2Znn3Jx+4EiQy9120yuQGKV5awQTNLq/fKKXenYidcg2AcnXKXTNUPfBIuiZ0MX4Dr71oxnwq3QloKPxQ+/sVd/2aU3GF06RF+gC8nV0E+oiuf/4PqiXljsqJGxq2O24VxcL7It99U7BAQ9qN9pX5SNZLmZSOyjinibulIWkS4YV/EOvVgRw54JWYz2zPUo1OHP/qMuqhrOcuo/wFKkz9Nl4mGwR2Q87aP0CVOeY/yUnrg/mCHLnf/E3WHA75PMQ1YL8QqvSBmPC7vDVA5bGVtFap8ByDhfhuBz8aAq0g2lLI3HGm0/Djn2VpbPhUBxItG1AA6iL72pgRKlqWkrCIHQLn+mER1U1IRIYDr4XW37JI9ThcrzherIDck/h/MIkM1PQgWI5l356/2Uk X-Forefront-Antispam-Report: CIP:194.138.21.73; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(40470700004)(186003)(2616005)(956004)(107886003)(83380400001)(47076005)(1076003)(336012)(16526019)(8936002)(2906002)(70586007)(70206006)(44832011)(30864003)(356005)(40460700003)(86362001)(5660300002)(8676002)(82310400005)(4326008)(6666004)(81166007)(26005)(508600001)(36860700001)(82960400001)(36756003)(6916009)(316002)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:39.6842 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7da282d0-d3c1-4555-b658-08da28dd42ab X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.73]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR10MB4145 X-Original-Sender: adriaan.schmidt@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dwF0a8Gt; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe1a::61e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX - new image type names, basically replacing wic-img with wic, etc. - adapt custom image type rpi-sdimg to the new scheme Signed-off-by: Adriaan Schmidt --- meta-isar/classes/rpi-sdimg.bbclass | 2 +- meta-isar/classes/ubi-ubifs-img.bbclass | 11 ++++++++--- meta-isar/conf/machine/bananapi.conf | 2 +- meta-isar/conf/machine/container-amd64.conf | 2 +- meta-isar/conf/machine/de0-nano-soc.conf | 2 +- meta-isar/conf/machine/hikey.conf | 2 +- meta-isar/conf/machine/imx6-sabrelite.conf | 3 ++- meta-isar/conf/machine/nanopi-neo.conf | 2 +- meta-isar/conf/machine/phyboard-mira.conf | 3 ++- meta-isar/conf/machine/qemuamd64.conf | 2 +- meta-isar/conf/machine/qemuarm.conf | 2 +- meta-isar/conf/machine/qemuarm64.conf | 2 +- meta-isar/conf/machine/qemui386.conf | 2 +- meta-isar/conf/machine/qemumipsel.conf | 2 +- meta-isar/conf/machine/qemuriscv64.conf | 2 +- meta-isar/conf/machine/rpi-common.conf | 2 +- meta-isar/conf/machine/rpi.conf | 2 +- meta-isar/conf/machine/sifive-fu540.conf | 2 +- meta-isar/conf/machine/stm32mp15x.conf | 2 +- meta-isar/conf/machine/virtualbox.conf | 2 +- meta-isar/conf/machine/vmware.conf | 2 +- .../conf/multiconfig/qemuamd64-buster-cpiogz.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 +- meta-isar/recipes-core/images/isar-image-ubi.bb | 4 ++-- testsuite/cibase.py | 4 ++-- 26 files changed, 37 insertions(+), 30 deletions(-) diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass index 010c573c..508c4bc4 100644 --- a/meta-isar/classes/rpi-sdimg.bbclass +++ b/meta-isar/classes/rpi-sdimg.bbclass @@ -3,7 +3,7 @@ # # Based on SD class from meta-raspberrypi -inherit wic-img +IMAGE_TYPEDEP_rpi_sdimg = "wic" WKS_FILE ?= "rpi-sdimg" diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass index 095719aa..7a917b47 100644 --- a/meta-isar/classes/ubi-ubifs-img.bbclass +++ b/meta-isar/classes/ubi-ubifs-img.bbclass @@ -5,6 +5,11 @@ # # SPDX-License-Identifier: MIT -inherit ubi-img ubifs-img fit-img -addtask do_ubi_image after do_ubifs_image -addtask do_ubi_image after do_fit_image +IMAGE_TYPEDEP_ubi_ubifs = "ubi" +IMAGE_TYPEDEP_ubi += "ubifs fit" + +IMAGE_CMD_ubi_ubifs() { + # we need to produce output (with extension .ubi-ubifs), + # so just create a symlink + ln -sf ${IMAGE_FULLNAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ubi-ubifs +} diff --git a/meta-isar/conf/machine/bananapi.conf b/meta-isar/conf/machine/bananapi.conf index dd3a0667..36cda28a 100644 --- a/meta-isar/conf/machine/bananapi.conf +++ b/meta-isar/conf/machine/bananapi.conf @@ -9,6 +9,6 @@ KERNEL_NAME ?= "armmp" IMAGE_INSTALL += "u-boot-script" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "bananapi" IMAGER_INSTALL += "u-boot-sunxi" diff --git a/meta-isar/conf/machine/container-amd64.conf b/meta-isar/conf/machine/container-amd64.conf index 1f7669ad..e24729ff 100644 --- a/meta-isar/conf/machine/container-amd64.conf +++ b/meta-isar/conf/machine/container-amd64.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: MIT DISTRO_ARCH ?= "amd64" -IMAGE_FSTYPES ?= "container-img" +IMAGE_FSTYPES ?= "docker-archive.gz" diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf index f822e24b..55343e9f 100644 --- a/meta-isar/conf/machine/de0-nano-soc.conf +++ b/meta-isar/conf/machine/de0-nano-soc.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-de0-nano-soc = "u-boot-de0-nano-soc" U_BOOT_CONFIG_de0-nano-soc = "socfpga_de0_nano_soc_defconfig" U_BOOT_BIN_de0-nano-soc = "u-boot-with-spl.sfp" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "de0-nano-soc.wks.in" IMAGER_INSTALL += "u-boot-de0-nano-soc" IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc" diff --git a/meta-isar/conf/machine/hikey.conf b/meta-isar/conf/machine/hikey.conf index 615d6749..7f9cccb2 100644 --- a/meta-isar/conf/machine/hikey.conf +++ b/meta-isar/conf/machine/hikey.conf @@ -7,7 +7,7 @@ DISTRO_ARCH = "arm64" KERNEL_NAME ?= "mainline" -IMAGE_FSTYPES = "wic-img" +IMAGE_FSTYPES = "wic" WKS_FILE ?= "hikey" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/imx6-sabrelite.conf b/meta-isar/conf/machine/imx6-sabrelite.conf index 5be337f9..d8cb93ad 100644 --- a/meta-isar/conf/machine/imx6-sabrelite.conf +++ b/meta-isar/conf/machine/imx6-sabrelite.conf @@ -6,8 +6,9 @@ MACHINE_SERIAL ?= "ttymxc0" BAUDRATE_TTY ?= "115200" +IMAGE_CLASSES += "ubi-ubifs-img" MKUBIFS_ARGS := "-m 0x1000 -e 0x3e000 -c 1500" UBINIZE_ARGS = "-vv -m 0x1000 -p 0x40000" -IMAGE_FSTYPES ?= "ubi-ubifs-img" +IMAGE_FSTYPES ?= "ubi-ubifs" DTB_FILES = "imx6q-sabrelite.dtb" diff --git a/meta-isar/conf/machine/nanopi-neo.conf b/meta-isar/conf/machine/nanopi-neo.conf index 2475ce9d..5aa717e5 100644 --- a/meta-isar/conf/machine/nanopi-neo.conf +++ b/meta-isar/conf/machine/nanopi-neo.conf @@ -7,7 +7,7 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "nanopi-neo.wks.in" IMAGE_INSTALL += "u-boot-script" diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf index 2d052d0c..0c6d29aa 100644 --- a/meta-isar/conf/machine/phyboard-mira.conf +++ b/meta-isar/conf/machine/phyboard-mira.conf @@ -6,8 +6,9 @@ MACHINE_SERIAL ?= "ttymxc0" BAUDRATE_TTY ?= "115200" +IMAGE_CLASSES += "ubi-ubifs-img" MKUBIFS_ARGS := "-m 0x1000 -e 0x7e000 -c 8083" UBINIZE_ARGS = "-vv -m 0x1000 -p 0x80000" -IMAGE_FSTYPES ?= "ubi-ubifs-img" +IMAGE_FSTYPES ?= "ubi-ubifs" DTB_FILES = "imx6q-phytec-mira-rdk-nand.dtb" diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index ccfde391..eca2628c 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -6,7 +6,7 @@ DISTRO_ARCH ?= "amd64" KERNEL_NAME ?= "amd64" KERNEL_NAME_ubuntu-focal ?= "generic" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/qemuarm.conf b/meta-isar/conf/machine/qemuarm.conf index 20a71ea4..06d4b34d 100644 --- a/meta-isar/conf/machine/qemuarm.conf +++ b/meta-isar/conf/machine/qemuarm.conf @@ -5,7 +5,7 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "armmp" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf index ca23cef5..b30fad47 100644 --- a/meta-isar/conf/machine/qemuarm64.conf +++ b/meta-isar/conf/machine/qemuarm64.conf @@ -6,7 +6,7 @@ DISTRO_ARCH ?= "arm64" KERNEL_NAME ?= "arm64" KERNEL_NAME_ubuntu-focal ?= "generic" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf index 17cff1eb..ddfc077b 100644 --- a/meta-isar/conf/machine/qemui386.conf +++ b/meta-isar/conf/machine/qemui386.conf @@ -4,7 +4,7 @@ DISTRO_ARCH ?= "i386" KERNEL_NAME ?= "686-pae" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "directdisk-isar" IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf index b34e46de..40f5e744 100644 --- a/meta-isar/conf/machine/qemumipsel.conf +++ b/meta-isar/conf/machine/qemumipsel.conf @@ -5,7 +5,7 @@ DISTRO_ARCH ?= "mipsel" KERNEL_NAME ?= "4kc-malta" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "sda" diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf index 5c687a03..cd04d873 100644 --- a/meta-isar/conf/machine/qemuriscv64.conf +++ b/meta-isar/conf/machine/qemuriscv64.conf @@ -8,7 +8,7 @@ DISTRO_ARCH ?= "riscv64" KERNEL_NAME ?= "riscv64" -IMAGE_FSTYPES ?= "ext4-img" +IMAGE_FSTYPES ?= "ext4" QEMU_ROOTFS_DEV ?= "vda" diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf index 8d6dff9e..327ac91b 100644 --- a/meta-isar/conf/machine/rpi-common.conf +++ b/meta-isar/conf/machine/rpi-common.conf @@ -5,7 +5,7 @@ BOOT_SPACE ?= "81920" MACHINE_SERIAL ?= "serial0" BAUDRATE_TTY ?= "115200" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "rpi-sdimg" KERNEL_TYPE = "raspios" diff --git a/meta-isar/conf/machine/rpi.conf b/meta-isar/conf/machine/rpi.conf index 0ab701c9..917527f0 100644 --- a/meta-isar/conf/machine/rpi.conf +++ b/meta-isar/conf/machine/rpi.conf @@ -4,5 +4,5 @@ MACHINE_SERIAL ?= "ttyAMA0" BAUDRATE_TTY ?= "9600" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "rpi-sdimg" diff --git a/meta-isar/conf/machine/sifive-fu540.conf b/meta-isar/conf/machine/sifive-fu540.conf index d73f0475..1eb58db1 100644 --- a/meta-isar/conf/machine/sifive-fu540.conf +++ b/meta-isar/conf/machine/sifive-fu540.conf @@ -7,7 +7,7 @@ DISTRO_ARCH = "riscv64" KERNEL_NAME ?= "mainline" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "sifive-fu540" IMAGER_INSTALL += "opensbi-sifive-fu540" IMAGER_BUILD_DEPS += "opensbi-sifive-fu540" diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf index 22e88ea9..62de7dd1 100644 --- a/meta-isar/conf/machine/stm32mp15x.conf +++ b/meta-isar/conf/machine/stm32mp15x.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-stm32mp15x = "u-boot-stm32mp15x" U_BOOT_CONFIG_stm32mp15x = "stm32mp15_trusted_defconfig" U_BOOT_BIN_stm32mp15x = "u-boot.stm32" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "stm32mp15x.wks.in" IMAGER_INSTALL += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" IMAGER_BUILD_DEPS += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf index c0f65842..de3d04c3 100644 --- a/meta-isar/conf/machine/virtualbox.conf +++ b/meta-isar/conf/machine/virtualbox.conf @@ -12,4 +12,4 @@ WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" VMDK_SUBFORMAT = "monolithicSparse" -IMAGE_FSTYPES ?= "vm-img" +IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf index 9bf1fd96..fba639b1 100644 --- a/meta-isar/conf/machine/vmware.conf +++ b/meta-isar/conf/machine/vmware.conf @@ -14,4 +14,4 @@ IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl" VMDK_SUBFORMAT = "streamOptimized" -IMAGE_FSTYPES ?= "vm-img" +IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf index 37f89581..675d934a 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf @@ -6,4 +6,4 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -IMAGE_FSTYPES = "cpiogz-img" +IMAGE_FSTYPES = "cpio.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf index e3992e60..b48b0a6c 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf @@ -6,4 +6,4 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -IMAGE_FSTYPES ?= "targz-img" +IMAGE_FSTYPES ?= "tar.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index 44fe8af9..79d0aa63 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -5,4 +5,4 @@ DISTRO ?= "debian-buster" WKS_FILE ?= "efi-plus-pcbios.wks" IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" -IMAGE_FSTYPES ?= "wic-img ext4-img" +IMAGE_FSTYPES ?= "wic ext4" diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb index ef2cf1c3..8c70c1f7 100644 --- a/meta-isar/recipes-core/images/isar-image-ubi.bb +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb @@ -23,5 +23,5 @@ INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}" # only one dtb file supported, pick the first DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}" -UBIFS_IMG = "${PP_DEPLOY}/${UBIFS_IMAGE_FILE}" -FIT_IMG = "${PP_DEPLOY}/${FIT_IMAGE_FILE}" +UBIFS_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs" +FIT_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.fit" diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 0281be41..1dd7c7a0 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -120,7 +120,7 @@ class CIBaseTest(CIBuilder): ['do_bootstrap_setscene', '!do_bootstrap']), check_executed_tasks('buildchroot-target', ['do_rootfs_install_setscene', '!do_rootfs_install']), - check_executed_tasks('isar-image-base-*-wic-img', + check_executed_tasks('isar-image-base-*', ['do_rootfs_install_setscene', '!do_rootfs_install']) ]): self.fail("Failed rebuild image") @@ -163,7 +163,7 @@ class CIBaseTest(CIBuilder): # TODO: if we actually make a change to hello, then we could test # that do_rootfs is executed. currently, hello is rebuilt, # but its sstate sig/hash does not change. - check_executed_tasks('isar-image-base-*-wic-img', + check_executed_tasks('isar-image-base-*', ['do_rootfs_install_setscene', '!do_rootfs_install']) ]): self.fail("Failed rebuild package and image") From patchwork Wed Apr 27 22:06:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1725 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:49 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-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 23S66md5005813 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:49 +0200 Received: by mail-lf1-f57.google.com with SMTP id bp36-20020a05651215a400b004722f090903sf1382779lfb.22 for ; Wed, 27 Apr 2022 23:06:49 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651126003; cv=pass; d=google.com; s=arc-20160816; b=F1F6YLA8OeiKIIOVIgetieDTO2x4jjBWmv8ucCVDrYqMMiou2MCHocDXbThvWmBP7Q 0/pvth4ZjNekRwFS7ym/lSBWQ1tp+8fgtYF7vpm2eITsyFMfk2LpD5KLuO3bVTVRgHte E5IaghpkYWNoWeIgpXBQR913gqjAAoFrrrowmrKOfpRBrQmbCHQO4x/wlKxp+e6F2HHW 0caeBZIR4tHLflT2JCpKQsorwAldRjqWFepl5AA6z5kZtGoB2XlLI4X8Tflf2ZSrau6M iyE/wrhKQLnJFilneDgHl9FemkdEFfDGOcPHBq6Kw1vhH8gqNCsqC5ytqTFRtLgZmbhw cPmg== 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=Rrhfh1t7ejGXkB7kktesgu1SJYOrXyEXolCvtR0j3mc=; b=O49WNfjAeA+pO1O9IKAUA0hQtW7XAQeJnJ9vtddC7aisLIhROKgLZ/kwUo3+/KSzFk OzR7swdOjBxJ4H7EUbIINffP6frbn5GqtvGMoi0ARC6pCdIk+gGsmoLrN1pGVCDRqc44 hi5kz/FmQ96RazwGmQNx2QXFSUD36SZLJI3u4x1GiWFdSgCPNGRbqBF7GfKyyl+e4oQ9 dLEYDF4gM1g4ebvytqHzDnlH2ENbxUjXVGSr8NJPQj0n8UeTiTs5TsokA/NkVFNN/qxf ckqXBcOgOW1da5gpynq9XBnBcZgvmvYhth/OozXeyrYO4u8IgLor8+uLJ7EyF+EXLSrR KFnQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WVqzazG3; 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::624 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=Rrhfh1t7ejGXkB7kktesgu1SJYOrXyEXolCvtR0j3mc=; b=IudsN4WtO45YlNiIdCAlPUZzMnj7JsoI6nYQ2wpqgCPdpz7RSq7th662WiDt+JOdmu b7CC5e3BJFJz0m+u3XAdk4e/Q5siiGs5HN2OsF71CKl1Zk6uysivV9BDyCnihSI2aZYF 9S46mtxKNQEGESEBJT3fRrd/hUiD9mrVzkSjcVIj4enctok1rVjhRE2xo166yeIGkNEV SNN6NbnlUBGdGDUbygedMGz702DrldAfekit4zGJqnQKOdcxZP82RwFF7UCtGqq2I7S5 ife5P8wuEcv15u6qdX9D98yRbTHbKJDHh0RG6vGI5US/D+9A+oM90bF3a19D5kqhrvBW gvIA== 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=Rrhfh1t7ejGXkB7kktesgu1SJYOrXyEXolCvtR0j3mc=; b=soGbDztqQtQhZGgPdDXgWSB7een1JT7/wVG5TeohUfNBptVqOpq+RyrVh0F0+rRkR0 LY3CrxmS77L8ZRgFojhHz8nK1EIeXzYhLrCeFPNVMXWNSsVFyKj1GN8saT7zbvKzYJnI fNoVPX7iZv49I5R9kKOAy0mD8rvdpLoyVjCi3EXCNL4D6FE08NQzDh27iveCivYOM+uI VeIE0hiK2gxDe6r0l21gO2qXA88BYW6zSxV3Rt2JGpGTf5ZRqrTMXeYJ/xi7HNxcixsl BLWJx64X86Qhc/Zl3j/tlHxPoOWv46+ex6dc76oueWhPA/uAgVfIrojYGoFOcM95148t R1nA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532Z2uWJiiQF/gt+gIGm6NWhngD9leEQIJhNsBcNw6xQWpJtLzpm i93aMOkjDwl8l4OyG9hjP0Q= X-Google-Smtp-Source: ABdhPJxF4l+ZnLa3v02srwFQsFMhWO51fxmaRITL5+/FQuEI1t93Up4n4EyM5+cGAt6HJ8jEM4H9sQ== X-Received: by 2002:a2e:a7cb:0:b0:24f:33a8:b1a with SMTP id x11-20020a2ea7cb000000b0024f33a80b1amr401053ljp.263.1651126003454; Wed, 27 Apr 2022 23:06:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a54f:0:b0:24f:18c1:d26c with SMTP id e15-20020a2ea54f000000b0024f18c1d26cls1812873ljn.5.gmail; Wed, 27 Apr 2022 23:06:42 -0700 (PDT) X-Received: by 2002:a2e:92c9:0:b0:24d:b719:23bd with SMTP id k9-20020a2e92c9000000b0024db71923bdmr20197324ljh.304.1651126002398; Wed, 27 Apr 2022 23:06:42 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651126002; cv=pass; d=google.com; s=arc-20160816; b=eE08VmiGFBYHFHkA3zD2QUbD1H2CTjVf/4wAuvfSo3AGdLfGwRUh/YJ7DPQyDeH2Gq 95kXkUUkNnrVb7Un1fluJRF4I8mLGDx+o4qk9Mtl2qB9OTnaF3KzHrcsFZKIXCrV5vQI +GgoAqVklr5wnoaP0P4WzCnKTGpZDn+DZvMbbN4+olWam+gRpU8Mq8vrefp0S1r5ic4q DK8+B2ZVgz6Kyqfm7H5O35fCkBDncQBepm+DK1And+wHiQ0CwGVLGCePvg1pBNhhCeWa gUScEk2Cj1Kd0gHpEjsal2zkMF98RSSrzS7yCL8c2xdVUCQNwNrZZE9rwuBZD9NXV86U Zafw== 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=TUh/lBGK6t03KxOTQbtE/WFHjVF5l0lo+8TLNwdsFK0=; b=NDOMf/D4E22i3NtE9tZjwZEj6aOmWFAX1mfmg0ZbT/583WwkfA4uPS1uTJm0Ad+TGC FuetkAKVKFYfamIAtKEQ2N8a/S+ZxJvARh7TtVJwK+GFrMorahOAHf3mN3YbMT2jNXz1 J9RetsvGH021q0DZ+/N8Xw3D8nb4g7+5j/3Vdp7+rk226j0xCjobXaQdf0edQG7yjRta uaGZt6SATkjlm0dRXBLfoz+ZNEpq5WbNgHrgcXg8RrVwCFwoqiDd8Pgp1JJc6giCHgSS vHme9NHtnte4/hHBjq563gr43X5rDxWGLGjVRNL0WNLSNT/r17SZx+87n/R0hTJj8KEo 4g5Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=WVqzazG3; 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::624 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-he1eur04on0624.outbound.protection.outlook.com. [2a01:111:f400:fe0d::624]) by gmr-mx.google.com with ESMTPS id d22-20020a0565123d1600b0047223e9d7c6si157102lfv.4.2022.04.27.23.06.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:42 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0d::624 as permitted sender) client-ip=2a01:111:f400:fe0d::624; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LSExy2tvYFk3SkiK2KSDcE/aMgK9pBPzcgv/TNE/RNqrGlBbB7UB5m0f74rYXUReGhfzIufOcaAIEtTqzDCiro9VrF1m81lmHqSTrKbwY51olMu+HFY6cc9cFYE2ldeweUW1wYgwl9Of/iHuRZSWnthEkWoonCgwwi5BnGqjBfzYtIxJ14duGshhKWSLBxcqI2TyBnn7qZfRuXjTHpwVSjiZE2ESuuBvq9LGcvYMEOwu7YdMRrtNqWHkNiK/2jiR7hhOqld7R+WViKKLhwRuB8mESCJYQu6RuDseVwLWYj9tqZFrnLYIBUgg2/gtklbB8ZLKtPzUK9IVgAjSjpTbZQ== 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=TUh/lBGK6t03KxOTQbtE/WFHjVF5l0lo+8TLNwdsFK0=; b=QPRvj6N35P3ED4bJOesoGFitV+qbJAlrlKF19F7bJthx7zvlTcUmy4nHnTlKtktTjlWGG+NxdhUYCdAXbl3L1hIqJIQ6Q6xk0rIVEW3jCDMM//fLnLHeRQJK6Y85G8g1fR8+9mr+6PpcGCO6QFAcg7KxjmScwOoUFS7cAqJD5pTFNZJVNe2GCy/Eb0BaUJclXr75LislRN3ZvlQjOWcUcrCjrGuCNo8WlGyl3LVG/Y3yaYBx1C2A7r8n/jdUqF4NTCtnV0PxtA2cxPzpWDTzJEMEZBALfipkqauCpQVO6+V4/1JkLVaV1V9yG56pfBughUqdfvr6x2nKDAVbLKzMkQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.73) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from SV0P279CA0049.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::18) by AS8PR10MB5927.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:529::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 06:06:40 +0000 Received: from HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::8c) by SV0P279CA0049.outlook.office365.com (2603:10a6:f10:13::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.73) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.73 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.73; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.73) by HE1EUR01FT107.mail.protection.outlook.com (10.152.0.244) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:40 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SNA.ad011.siemens.net (194.138.21.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v4 6/8] meta-isar: remove IMAGE_FSTYPES from multiconfig definitions Date: Thu, 28 Apr 2022 08:06:13 +0200 Message-ID: <20220428060615.986332-7-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--11.649100-8.000000 X-TMASE-MatchedRID: IIyI5q76PIWT5dDfN8TpsQp4UBC3atMiDSsx3Wb5DQk3aW/7bl6SZ2tq QgJyb0BRkshAoFcG3yQZkgLnW4KPXRlrc264S0YI5RTVXdccDuoHKdtUS/l9oT8Ckw9b/GFeo3E y1/GoJqWe87/vN9JpT2LpIIQT+xImcrci5qqtowC18ETvXXRjSsHVNeDWrWSGngIgpj8eDcAZ1C dBJOsoY8RB0bsfrpPIfiAqrjYtFiQdVH/by8xG12bd6oRVk09Xjmd6OKQfWtXHTpsBm4OHaH7cG d19dSFd 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: F5E55B4ECBD81337B879795E7A084F5ECBBBA2C9B7C6615BC930CC1EF7D729352000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2591ecfc-28ac-41fb-8979-08da28dd4301 X-MS-TrafficTypeDiagnostic: AS8PR10MB5927: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: /YnxzSRHTl1tWkcYPzmF9DXtzrRaZy9a5ThuQHu8rC1fZW/SWkxQvRT2/yB/YY/1FUxhUeB+46hClGpDlw4XjEtgfXHWSSkmQc+1j5M0Xr3iMpKdC+CpMjPsHD7WVO1/RGfJknHSNee3xS96S7WQZpza6XtZG8/pvBTQJgE1NpvSu95xBXvx6je/BCleTF8TXcEq5LZ9Iya46Wbnl5e0nUjMKyF7m888d1rLg174MY2FX/RmWkHtyKEz5eVnulwumpMXrKtxkRbYJRknwiNeYAKPJJ06tuxlQS9UfP/fFD2gPdbTyYg/idyfihVqHuLHSO0v4ZTngLafG6yT054hRGZxupNLRm/CLb2cWRtvccc1q5IAl4GTJg0q92PXDXlPHKEisxu3y95i+Ftf0K8POMwe0iUMUhqBKkK+Duj92C2pIjLMEfJuIum95PXPDJUYEAWZ40RjrttdhllKpcYfB1osWSjWuSuIuBZAoEBKbAQDjil+e2Ys2zDFdklfzRoyTHZukVFZF2hnb7ePIPhsWCjEqZiTqSBvh0GBtX+mvp/T5ewCTDdiyPgRcpH2uTYdqJN81Ogj68TCZS6ZCSYpmVD7prbYadbIZg2TNURYOL1RkSV1RXohaY6IHniM64M/bEr2J5WHmlRye9hUvoZIYk0JOv50335BFni3M7488vIG/jTuhxQoVnsYRO4WrZHZJDXnYP+5EzlOHqxpp7DIrA== 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)(6666004)(36756003)(81166007)(47076005)(336012)(82960400001)(40460700003)(8676002)(70586007)(83380400001)(82310400005)(16526019)(356005)(2906002)(70206006)(186003)(26005)(2616005)(86362001)(1076003)(44832011)(36860700001)(316002)(956004)(8936002)(107886003)(6916009)(5660300002)(4326008)(508600001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:40.2466 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2591ecfc-28ac-41fb-8979-08da28dd4301 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.73]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT107.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB5927 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=WVqzazG3; 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::624 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 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..13d870df 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_append = " 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 994c130a..69c66b1a 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 Wed Apr 27 22:06:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1718 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:44 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f56.google.com (mail-wr1-f56.google.com [209.85.221.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23S66hhq005787 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:43 +0200 Received: by mail-wr1-f56.google.com with SMTP id t15-20020adfdc0f000000b001ef93643476sf1524239wri.2 for ; Wed, 27 Apr 2022 23:06:43 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651125998; cv=pass; d=google.com; s=arc-20160816; b=lS5oe45A1s3f5tWL88+UrPrqk5QYxq5oZjBCpqKUv16LZH2KHE/iYOfOSQbzDpHDXU sfMGoqXkP8fEYzEk0RA5NMWo6PWvKLAVLlZAc08JGtCv4ZPV90VwudHWmCfra6FAMj+x Ios0kPjot3Q+a2BzoDTwwqVUl8tJG5rtaXo57I0lhEWUrlLHNe9lbjQdIs9miKx6wUdn jXWRnxSUK/S4RabUIJxTQx0iOTcaLBp9wvlXxkCcTyQDvmAsV/Mja/HZRrOpXvroQlgR 6MtNyyz3xVQD7q027nm1oqIY8+u0peHzXeeKP//oboXeA+SJ54EAP55iigM3JOuEvTGm K4Pg== 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=YwrpLUPmRKiCmrritG8IXQHMgiKzjz0vyZ24PQA8o1Y=; b=SsiPqPOQCd1ejMaL+96kvbtgAmpWStEC+u3zQzi2b65Kx9RNBFFCJXGJXHe9GCIvC0 +YVLI+6TkHU+w5v4ur73VGIGg00CMaqr5ffJymDFYg7n7gmW60qJDErW1gFMy1nMxdvF LNGt6vtFm3bPqKNF/51WhNmXyGqVMJ77Pb92YOEV7i0vFuAGu1UP55ZQXYkwEz0ziJa4 XH+InDN2zemvsqF+t2vx2ovDlX/L0ahqkNKepTjVOQKBRuAktjo0zhUDfmDJf96zmNh4 T3KabR/nNdxumSGHoDp6aZQLDEL5Hl5VFDPUp2FkYTBtWCEVw+eeTImRdP2E4rss38TC 8cZQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=uGy0L0Lo; 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:7d00::600 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=YwrpLUPmRKiCmrritG8IXQHMgiKzjz0vyZ24PQA8o1Y=; b=ekL1MkKYxtJOYWGxLrZ60VrWxnBic3Sp3Y3iUHCEsWKWYHmSlYJsWqe7c4Qp6yBeYk pk3Nvo6MjrXAklB+ltpCMZPnD89bAe75jqXGCFvbqFhmQnIE5PHXxJIekORLs1IbSrOC zSjx7pvu3qKR+/jcFTocU2pgfsxAgscslX+KdrTp21z4Qi0XjW545pPG1db3EmgAG8Eh HfuJXkfgSPU7n46YvXF9a8DYrkG44Q07lO4rhtZqiCcyhPfio+1REvkNgq4xR4430iNb ig4guitmwrUcijoPCuZu5HEvKpnBwG9IZFxzMceAQUmP7jCMARNjyVf50vuwPqx3qjaq M3uA== 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=YwrpLUPmRKiCmrritG8IXQHMgiKzjz0vyZ24PQA8o1Y=; b=P0wU1tCcng2OPjsxLmSGZxZ4b3qE0jcSPuZ6bdHt8+E60CCccXBI+CCB1JQbXlwlvO g7U4gchoq2gLsQd+f6M2IAs7mKjIlyLCAmpSyUu5/nSEjFFRObX80kfWLDxwouNHBknU 10BITViP9G0q4b4Hvn2ktI+/xsLU2ScMW/IlCjJCr24HPQY8Tq1oN23yoAxwsFEL+F7x ibyeGN6+qiCZtO0Kv2e9K8MMaq3TXPHKx1UFY68otEJ3smzNZUwXsppFUwIAqi0miYAW JEuUsNxW+w3FonDx3Oo67BAcrirov5KZsDeEMGOtpTv+PUDMqU3cRzN1Y3mP9vgUdPXx d7eA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532Pqzsl+wAX8Twkgfz/yihldos0FVWy+xfKNY5/9/3yiuoDdMKJ h+t58vFNnCgLh7t4bbAviow= X-Google-Smtp-Source: ABdhPJwKNz/5wBagXMd8Wkib2ZljLiCx0P0Am1fxtvFLdrcmd2py2CumpxCY/dM4WPlEgL0LOT6F7Q== X-Received: by 2002:a5d:5441:0:b0:20a:cdc0:6e90 with SMTP id w1-20020a5d5441000000b0020acdc06e90mr22428787wrv.566.1651125998072; Wed, 27 Apr 2022 23:06:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:59a4:0:b0:20a:d221:a277 with SMTP id p4-20020a5d59a4000000b0020ad221a277ls6333041wrr.2.gmail; Wed, 27 Apr 2022 23:06:37 -0700 (PDT) X-Received: by 2002:a5d:61c2:0:b0:20a:d92f:9056 with SMTP id q2-20020a5d61c2000000b0020ad92f9056mr16025213wrv.652.1651125997155; Wed, 27 Apr 2022 23:06:37 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651125997; cv=pass; d=google.com; s=arc-20160816; b=CL+29DmwyotkhJVgXQ9dBU95pjxhj/Js49TlRLLlX9DGnXbgeG9riblB6nL37ZKVJ2 4lveGDAYvdda8hBSs5bAUx5fWBT/NbNZmvpi/Koqw9Wl8N/STpPaclNZf9CneZbGTmwI qT57mpOiQUrDLExspCkg98Rdmetz0GUBNQHR+qwZJbAUeub8bzdwWK/lG3mrqf+rgBmg 0mOZhboBX9+OcMkpUPgVs+je8NoKmqloyMJmcnhw5xUhgV3yOjna+vDvrb3fjZTIgZ3F LvahDCZ7P6Jh5hTHLVFx/MF4kCyW5WJ65f/BqLGDSXxaJldTinOVgYB4A8fAWUYf2cR6 IkRw== 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=LJNntfJ2gS1x+E69bo7kqemDAHnKIqDz3ORvQEyywb0=; b=qxACAsqLwI0lU6SegwmnEDAObCiDH4Lpo4JTpeWR+iKyMHibYorNSRZ9oHcr/UgF4x UlbN/gl8loojUN880anJ4COmRfWkwLj7fWp39qCkfuBzkxvrVQIo/hIpKACDHLovmHcR fcLLGn7sbJ3Jvn3sFRwNqzn+fPgiMAEjWltgURo8ftcgGUOR2xwqRbU9wGet3+xA0x2B 7D3aQJOu3hFzkhmsmXH2d02Zg/mHOJqxXtLmuVvqXm3fr7LU/7RYvBvpTYcIbu+kKVuo 3MtZEx8MMm8M6+iamK8FhyspbXZD31OSK5mSgAhZE6hZdiSP0/1288eknhMXontGHzR6 DVhQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=uGy0L0Lo; 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:7d00::600 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com. [2a01:111:f400:7d00::600]) by gmr-mx.google.com with ESMTPS id d23-20020a1c7317000000b0038ebc691b17si503106wmb.2.2022.04.27.23.06.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:37 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::600 as permitted sender) client-ip=2a01:111:f400:7d00::600; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=StK6dCz+eZcuyBQmHaCOouFAjgC5UaXU/nhNucrmrWUNigQTfB7vM1cJ00OmYee+hVmrpamaW5/AO46PijkAstqKrbagF0gZiUGLyU1imCvKh5zaoIK6lJVHFkdM833BHw4bEVbLKNAMsC0PZeMfAHKLcs3MwNu/r6E6x7Co+W+Oh50901ekV1iatv03raE4DhXMNfut1V0KjHxvJZIk0ceL37JcCyqGtgN20gV7yWKcOVjQ1EozNIQizSmZI92dw+B27br3eyeFkwyQ3lPriv55wpIw/3/vl1Kjzvbvk55lFwgT7j0a8n4+GHoD4R3trbUnAdzq+KaGPoR+ILV95g== 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=LJNntfJ2gS1x+E69bo7kqemDAHnKIqDz3ORvQEyywb0=; b=fgzVl6j7X2A4BgQbTamIJrU51tpzCTdRimB4sNn6pu1LRtEsp3nMMtGCl+rz/bKHkPZhyfgseeLc5B4BS8135NMeDh8XmqQ77kjS0DstDZ3o0BC5ZXtmKOFLuNdbeELrjVrs1sO5ZwycWLWTutTE2JQ9RcEiWJtRQARGifUXIUcgw49alDYy2pv8OwALdcib5ju7/B79Mye8sAlWMeoKCNGWBbk1MvSst2clw7A8kMKR9c33LrcQxsrWcpKpkRR2TeY8PiOvKxnob7EpIDum/JNZQF/c5ZutIxxaqbksZsWhiSnkdLFGLYGoaEuWo/fwhU6MIP7e7Yh2RgVPEhOksA== 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 DU2P250CA0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:231::19) by AM6PR10MB2901.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:e5::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Thu, 28 Apr 2022 06:06:35 +0000 Received: from DB5EUR01FT085.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:231:cafe::e7) by DU2P250CA0014.outlook.office365.com (2603:10a6:10:231::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14 via Frontend Transport; Thu, 28 Apr 2022 06:06:35 +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 DB5EUR01FT085.mail.protection.outlook.com (10.152.5.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:35 +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; Thu, 28 Apr 2022 08:06:35 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v4 7/8] docs: add new imagetypes to user manual Date: Thu, 28 Apr 2022 08:06:14 +0200 Message-ID: <20220428060615.986332-8-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--16.244900-8.000000 X-TMASE-MatchedRID: 4U5WdtFP0Q4QwVtkLIfLLbHs1wZTXKHBYlldA0POS1Jtdr9d0G+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+rlp4CIKY/Hg3AGdQnQS TrKGPEQdG7H66TyOk/y0w7JiZo 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: 0FDA5D56C3A81DD9C1409E9F3E6E00F9CF90E1430AC48E8B3340CC1093AAC6CC2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7e6de02-0822-406e-a7ac-08da28dd4035 X-MS-TrafficTypeDiagnostic: AM6PR10MB2901: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: mmd0N8VQ5kydnvjhcMFkqJI3gC/SG18Xep4enD7rLFtLc8nSApTHK5oAksxGV5glTZUyLaVzSYTBic24ijPUqjwi7iM9h77jFSPEu5Lvmv3z/njUaaLMeM9COXF36+tP6TKN/ImD9ETJh3XLk6uZyRQypUNkIgMPD4WkZjJ3ixuTe8BtkvQUq7orce2DEeXPGtdjPIg6ZkRnlbfeAQErJNcApw/YSp/EhO7JXt19LIY666FXIxcRNl6oxIEEsGrFK2JE6wb2Zy5gJ4xk/eYktU2sicxYy1ZuXcIKurKiuhwO6mQXbsOjKY0rqLFDLHAvP6vSnV8+VaekxvO2CGjk2cgc655cqLLE/wY6LCp3VwaXIwfJUruhpsVyZGlXP5CQOL7HK63mkKeNG92k3H1q9eJoBgsMuaawyv2kvM3ndf9nTKXnIpSrBBQwXZi+HS18f1xvoDyp9XGLIWh22avpd+4ATcUDbH/eKw3QVp2pFcw1zzBpVgaoON7bDq3y9eGZqn/ik6HdATi1ohVZ1n2clNdJgX85NUsoyXCCo2Ds0Ctw8Nv5Xf8MHHEB40RPpNprw4qK4pLXBVOmrVu9ccBnXMvHCDUGk7FrNe1cSGfS+waelapbj+MUQr5TIA+xePg2rSGrz94y1g3bXWSK5si7J2mw0Oq6L87M1ZniNBnEOCeXBTxA3uX9mRTsf6pY6gfRGqOSJ6+c6HR0IJhGVZ0KiVIbRBS6qcr4jnkoYOeLQ/loGBxS96RVYYPHEk0fAalHD3akRQpn8n9TGJicYoFIC34suOecJ8ef2Pfa2x9YdbV+UXg7q6b5cb2tllhlPrW5Wrg5qLEDtvW9qLXFS8BYtjWU8DmHtN2ZKeW/4Q/muZ0= 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)(40470700004)(46966006)(186003)(70586007)(70206006)(336012)(4326008)(956004)(8676002)(82310400005)(5660300002)(16526019)(36756003)(26005)(6666004)(316002)(6916009)(86362001)(356005)(2616005)(81166007)(1076003)(966005)(47076005)(107886003)(2906002)(83380400001)(82960400001)(36860700001)(40460700003)(44832011)(8936002)(508600001)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:35.5550 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7e6de02-0822-406e-a7ac-08da28dd4035 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: DB5EUR01FT085.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR10MB2901 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=uGy0L0Lo; 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:7d00::600 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..cdb73224 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` --- From patchwork Wed Apr 27 22:06:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1719 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Thu, 28 Apr 2022 08:06:45 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f58.google.com (mail-ej1-f58.google.com [209.85.218.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23S66iCi005792 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 28 Apr 2022 08:06:44 +0200 Received: by mail-ej1-f58.google.com with SMTP id nd34-20020a17090762a200b006e0ef16745csf2334562ejc.20 for ; Wed, 27 Apr 2022 23:06:44 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1651125999; cv=pass; d=google.com; s=arc-20160816; b=NSkz2EZHbYvaG+yFLERYQtEtD0sdZoOWSZogU550SsLFVrgLrh0e5WjXJ5e+zf3g44 RSMIhSm7DQHGksizqWJ1lHVSmSQLiRXCtl33Z2ofEin3Wtv8TZS67uHZJdeM1E9H0GJX hJUOEVyTQ/nQrJTbTIunu3tVYr493H1AjrThIiaUi8Yc1GWOFHB2ffNUVAsO+qrWUtgZ JSM5M9bLzCB7RbhNb2syjWKOpEejnD0OuaXthf7TpM9tERV0C6+GHfdtQqaWRGaEK7pX V1gWYuIzIXjJhmqzleY5KLVNTn9yOWfPPtNsJP1LbgUmNfOzLo7ezODlOmF8AWeUQRU1 Yv4A== 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=t1+un2BcLWbNaiCBYI3egyIlvdomjmq24INeJo+0JZk=; b=0OAml73pswZovGvTEaFsVWOdSHUC75yh1M0n7XSY1LYJ+JGDwXH6GNbGzOzOivrM1u rFf+3rKSMHzDpTdqEtbwLwUC5mrF+HSy/nu0RcmH/ocJJqePJnXdwnddwN2kzUyON+Pw wtSu0ar76Wm2IKTZDPnTNpLH1POhfaFQ5GaG4tmU5mxgCa6yGabTw+6GfJh5CaEilpAU b8Qyr4MqM5hmfn3tVdeMiIcevPAI2G59m2MYxIfjYGYz9ImZofaunBd/d+nxMrbHpNoY zQyAmtPV6Kxnnf1qUA0aikq1kvo2QAgwO64f+II0JuA+offS8rexZMeWgmO3K/Xj1hPu wHvg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=oz+p5+xL; 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:7d00::610 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=t1+un2BcLWbNaiCBYI3egyIlvdomjmq24INeJo+0JZk=; b=Avq6bao3JR3TVjgfkgVz14I1zpg576LxzVCRgMvehy7M0LKsgYKrpCNjPVqZK/5B1U CLKZRjXzLKPMIKZLkpPaNudPj60ccbQHq4mfvOYgrQ4cXehlxr2AefHgWh65EU4VajPG mL+To4rfYUT69jOtKtStoS1FoXoN+i0+LtTUjoGdKQOzeutvFg30+ih66V8PTjAwwjzJ T3TXLhIqyPV1IjbWD3Z9M78tkH0Sc+zHNevd0bd6+r9u2v0sc2nzvC5xBesd1izKmGWs vyHMW14Y+8MVd+9AW3dqb89Hb3hZx2BQftgIogGZY2V2AhDLDVRmz6wRiESE+/jNVpuh XJhA== 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=t1+un2BcLWbNaiCBYI3egyIlvdomjmq24INeJo+0JZk=; b=2Bnej3/eXUMgsZZaIEXM+qIGI5SjxcbIFB+p9x3tgLJoblxYoqRh73SSC8Ecjf9Dw8 AXEvStvzAZkegzMjVRucFQ/redjkzzVfN3pLtDG4VHEBPiflYyF5WUkTRxLyj3FEHGkt BkHyaql+1f37XgX8UGaCGVscok0Q0aB3S6HMGEGbyf/A8A8s0jv2RjTxAJVzIGX1Ft6P oAZgBm7LCntcPaolAHg/gCFfXBllv1dkHwh4WaIlnelbqFlY8JeCP1ILMHH5FglC1WS3 R2ggQ1lixqCqU3d6gNairs4x6SVToMa6VSlhQt3QDV4LI78CnRGSdpoyHmmqS7pdoFZO qA+A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5302GqTK+7ZiidbhmvD0AuVu3lxEd7pFoIEDa7grLyiUEUkJnWn3 A0TE6rS4FVMD+0F1m4puIAE= X-Google-Smtp-Source: ABdhPJwkUmTuFThRcDV+e4AfV5WpQ57ei49mCKkkfmeUur1Lict0ESHBKrfyOdQV2Ym9NZO7FoON1Q== X-Received: by 2002:a17:907:62a9:b0:6da:7953:4df0 with SMTP id nd41-20020a17090762a900b006da79534df0mr30177821ejc.316.1651125998721; Wed, 27 Apr 2022 23:06:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:430e:b0:425:f7f0:fb74 with SMTP id m14-20020a056402430e00b00425f7f0fb74ls506285edc.0.gmail; Wed, 27 Apr 2022 23:06:37 -0700 (PDT) X-Received: by 2002:a05:6402:238f:b0:426:1ac0:12d2 with SMTP id j15-20020a056402238f00b004261ac012d2mr5672464eda.62.1651125997756; Wed, 27 Apr 2022 23:06:37 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1651125997; cv=pass; d=google.com; s=arc-20160816; b=0aI7GSR6fyD/ySkJW5h7lJhpPiwX6dTEAyQo0htKSWOiK0mjGylxAxRdU+unLt2PO1 DsDe/rqYfwJBUUBfkoHfpnDJQQiaRMA3FK67E7AofUtW0bGX7lyGyEsnPqXfkQx1yxWk 5eXRabR5s5yyUuVBzoGj4SdzZbdgfTwrywEUAyGHlrJ5LhzqhtWQXQQDi4ZY+wnnHTrr qoEPLHnPZFTjES+mAosW76p1T38FLlZAEu1ghKsZT5xRM1nmLGrBZazu+5oLIOJkPt9c i77247DHArUEaq/jaZkOUSi/SyQYSGT5oPSbrT7udAGlkgVcOTRv/4uo46FEswojTxMw 73cw== 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=syFuZ0B5uFvO1pWxbghq5kTavzJr4vx4tqdhAcnCgFA=; b=V673wFiy+4FCXz4T8V0c+L/LxFcLT6AADpjmUXfq0F8/8OvWN+MmYc008B48UtuYZd Mamzs2ST3YgZ+9VMz/u47l0rtZSRL0mGLfYyHRwuc+BZoWuy9P8xFAWnGy4S2owZT6C9 BmcSGA+HgT2YQAoWLITZ3WCRru7+d47bz4gpZvwT+gPyFB3t7muJzHIWTl9xM6fG2Kij P6TUKm2J55ooKX4nISaNx9RDeKmhOzFTI3bqn6wPufYXXcADxHxy5eMR+j4/CUM/wwSA Ty1Cbat7pNFay7UjVgiAe6M5MiQ2z7qC//wDFzrP3Dr1jNIHcOQV2WmgwuqcTY9b0/7l Cp7Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=oz+p5+xL; 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:7d00::610 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20610.outbound.protection.outlook.com. [2a01:111:f400:7d00::610]) by gmr-mx.google.com with ESMTPS id ho14-20020a1709070e8e00b006f3e70bb5f1si18713ejc.2.2022.04.27.23.06.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 23:06:37 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::610 as permitted sender) client-ip=2a01:111:f400:7d00::610; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W661yf3bi6X7UJDxQy5lIxnpwjnCc2rNT2lO0C9015fDJiVbNJSPfOePEdEGfnDU75/SSra5h48i4vP31bgD5kt+07LwNFVVSXQ9yQmT2aVmqF6l14YyQdTYVQjKj5riNVKGRjhe9sIH8RSKY02xiCUyoTv2eE8OrrYMd+L1x/NJLFCT6C92eNc6s1rQv+MmgsSIlgtMpJTRVLRJyereRUSGOBcxvvJU2LLo4jLmYA/CVR/7bTVZWT3mtiLrMc6y3SUw3mJPYuRAJ0HRmgeM5f2XRZs6t4LHVzfRe71nDhhbeoAh/uGRx1uK7sUCA+VyBTBBY29RiGEkeU8RVAjxqg== 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=syFuZ0B5uFvO1pWxbghq5kTavzJr4vx4tqdhAcnCgFA=; b=Vq42g/fB9q5zCVwYgmjqqYUCm2Q0SZaalA7GORd14gf0fEnIvCUxbKFKAElZvBnZ93lEdYaX1esuuCMNwR30sBYljFWvVGkZpXfkdlg/1oALN1l9L2I6/4f8gdQh8ASZzcaLKsvQZRsmyirszzGLwufSE85RRYInvDevmB4HyGP+4jsAWVW72Mgqn+kmu1EHB3+G+c9evqg5gW8kDjmtPEY2XIU0dOj1fBlCXCjpsMustLAmR1p3vqhc4+qG/a2IB3Tn0BRNfRg7KbdII8FiplPpMRof0VI4gVhHdrNJ7QG7EE94Gh4sboDeklBXPRq8EXtOndlL44ZVGMddvT04Hg== 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 DU2P250CA0003.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:231::8) by VI1PR10MB3133.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:134::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Thu, 28 Apr 2022 06:06:36 +0000 Received: from DB5EUR01FT085.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:231:cafe::40) by DU2P250CA0003.outlook.office365.com (2603:10a6:10:231::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.14 via Frontend Transport; Thu, 28 Apr 2022 06:06:36 +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 DB5EUR01FT085.mail.protection.outlook.com (10.152.5.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5206.12 via Frontend Transport; Thu, 28 Apr 2022 06:06:35 +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; Thu, 28 Apr 2022 08:06:35 +0200 Received: from random.ppmd.siemens.net (139.25.68.25) by DEMCHDC89XA.ad011.siemens.net (139.25.226.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Thu, 28 Apr 2022 08:06:34 +0200 From: Adriaan Schmidt To: CC: Anton Mikanovich Subject: [PATCH v4 8/8] start_vm: update image types checking Date: Thu, 28 Apr 2022 08:06:15 +0200 Message-ID: <20220428060615.986332-9-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220428060615.986332-1-adriaan.schmidt@siemens.com> References: <20220428060615.986332-1-adriaan.schmidt@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.25] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC89XA.ad011.siemens.net (139.25.226.103) X-TM-AS-Product-Ver: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-AS-Result: No-10--12.861100-8.000000 X-TMASE-MatchedRID: HKR1H9L53+gaWLbof1VKrBSJb5GcA+vRuGH8gro7lJEC4mcWVH6HR7qo FakaELIgBph69XjMbdlAHOg8qEtqyG2haNW3VghmWepptKQeL7oXBhtco0Njgd5x7RpGJf1a9e5 am3m57X0ELMPQNzyJS4ntzGO179KY/3WCZWNVrmILTIKt4AqqFRwC2WjWJzck3ObAp+dZLrPjLr HqvAiSy+y9vsxhLmzelWD5kixb3rqrcT+YJB7Y0Zu74XJZgEpKHxPMjOKY7A8LbigRnpKlKSPzR lrdFGDw3oxHtkvPdMnPkdd/ZpY2UYUDC6VbdWAAT722qPwOeozeRFiRBvGwVg== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.861100-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 68554990115356190E23606CF94D14CEDDF87A4FF6E8439729F1008B0BFEE9652000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 28f86160-87a5-4f98-419a-08da28dd4071 X-MS-TrafficTypeDiagnostic: VI1PR10MB3133: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: PwM2h+D3rvn0yD8T0CH7pZb/ceftAXNQR3v02TAXGNo/HXRUfPDrg33ymxCZMAh6vfKUsGVmBFoWmKJleM0NN1keue+qZp2l4fkTp6PDqEYWSy56/yr1YB98bP1KXuaQRNA3g8xLmRanaJGDktYby0b8v6fPsZFF3xzubwpDgxHzfmS8DZpEegaIWBL9CEpzG28gIlfLrUEGxD96IjnSiPwMA3mJM7byhPF2FYeSjTmv7cNC6o5MRrE4ov6uQVvBAJFya/kcO7ezJiEm2d9SeQMwxdTwJTkWIjqW2hv6w4ojZlcdzqBeJJEK3YGhAgqafuk1nYtrocmCdwCK22jnCodGGiqBiKhCZsEd4lwmXOHpTOyuBC5XImRPH8shKO+UYJ58/ySZFbn/ybJ7CdQw59TId5XPuA4uILkms3jOLIRIB62RXjLWedwqKWoxc3cwqt2SFzdu3NeP3s7u67I2S7TpF9T5o4WknCJmkVRf8IQzx55PusXbOf3h8g9IV5xDMUXxHM92vhY9h0KbCug0xULYh7NvQ3dLCAJc7MHBT3YoLF9YNKadpTgbHSYqNybKSw9GT+Qp2ncND/OmHr0WJjEgrENj5cfxo0nTAYIN2UYrdcs+JHtbHXz7TeaiklA9nCHMtMo8wNCxZuEsRI2BnXpTM2ODBDFJDyfMioAwtfUCmxsNgovdJNtGYSwu1J9D7d2DC8t6a1+aWoQR+WlbDqRU/pgcGsyqVmn56z8DLt6vf0D+sWWEBN7ZsNxiwyrx 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)(47076005)(86362001)(83380400001)(70586007)(82310400005)(5660300002)(2616005)(70206006)(26005)(2906002)(336012)(8676002)(36860700001)(1076003)(4326008)(956004)(16526019)(36756003)(186003)(316002)(6916009)(15650500001)(508600001)(356005)(81166007)(82960400001)(40460700003)(6666004)(44832011)(8936002)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2022 06:06:35.9612 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 28f86160-87a5-4f98-419a-08da28dd4071 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: DB5EUR01FT085.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3133 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=oz+p5+xL; 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:7d00::610 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 From: Anton Mikanovich Image types checking in start_vm should be aligned with code updates. Signed-off-by: Anton Mikanovich --- scripts/start_vm | 8 ++++---- testsuite/start_vm.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/start_vm b/scripts/start_vm index c114d864..8876e538 100755 --- a/scripts/start_vm +++ b/scripts/start_vm @@ -113,8 +113,8 @@ eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "\(^IMAGE_FSTYPES= # Take first image type for VM if there are several defined IMAGE_FSTYPES=$(echo "$IMAGE_FSTYPES" | awk '{print $1}') case "$IMAGE_FSTYPES" in - ext4-img) - readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img + ext4) + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4 eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=") eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=") @@ -130,8 +130,8 @@ case "$IMAGE_FSTYPES" in -initrd $QINITRD" KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw $QEMU_KARGS" ;; - wic-img) - readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic.img + wic) + readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic EXTRA_ARGS="$EXTRA_ARGS -snapshot" ;; *) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index 708520f7..f761a8bd 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -31,8 +31,8 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): image_type = get_bitbake_var(bb_output, 'IMAGE_FSTYPES').split()[0] deploy_dir_image = get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE') base = 'ubuntu' if distro in ['focal', 'bionic'] else 'debian' - if image_type == 'ext4-img': - rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4.img' + if image_type == 'ext4': + rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4' kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE') initrd_image = get_bitbake_var(bb_output, 'INITRD_IMAGE') @@ -47,8 +47,8 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): extra_args = ['-kernel', kernel_image, '-initrd', initrd_image] extra_args.extend(kargs) - elif image_type == 'wic-img': - rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic.img' + elif image_type == 'wic': + rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic' extra_args = ['-snapshot'] else: raise ValueError('Invalid image type: ' + str(image_type))