From patchwork Thu Apr 14 22:56: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: 1689 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 15 Apr 2022 08:56:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f64.google.com (mail-lf1-f64.google.com [209.85.167.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23F6uj3q010364 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Apr 2022 08:56:45 +0200 Received: by mail-lf1-f64.google.com with SMTP id k11-20020a05651239cb00b0046bbe5d500esf3254746lfu.7 for ; Thu, 14 Apr 2022 23:56:45 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650005800; cv=pass; d=google.com; s=arc-20160816; b=JBA3kUQhZZ/Yfar5xA+youqO8UsDdREciGSKUjEg8QLYEqdlZEqCxoj1nOSVJ3Ihsz KG8TrE00BE3el4SJAFWp0tPKRagkiOidohl7ezURZv3cMi/sl/eh7bciGBWwuJUmxLdl OelHKFtyw91jb4KmuvoLg1AaDzS2VQVJbacjNi8K6mxHgQFu6a3/NQTlWS32N8jNFVNh c0I7gkbYu3YshB7maAwLzMuMWkBYlIKXVetZ9a58hCBIBO0riBcOEJ2eC5QlnlB06FaT yQ2kryy3GKcuriwG4/8oWuScIjPHTsrQTM2Kqea7i9A1ORNyLSjRMPCNsxDXcv/H+b88 36kg== 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=xqPQGcQOtAx26PUi8LJx1uu0iidszfCghgllywIIGao=; b=R9HV9z/fOREtNDE3YltAdRga41giLS9D184o00u18wfLs4NKmdn5b/PpB+7no0l7K6 5kS1nHHypOqIfpeP0pPivLE39KuYMqtocleFfgswsJLIZ1pQ6+i2QnowuLwyhhWJjhRv ac5Lo4dshKB2RxVoi6WZX0FBYGF6epGdW2BdArUdykJQtola36hcuHGJvnBcliLPgtl0 57XvOaCUvQw+Wn1d7Uv29JkuRuj3JaWWRfLz+jyhYj0U60fF0hVaVyoDHxXInm83FXpZ +arnbppazeksl6k6pakPZ4MoL8hFt7whlJtA50fpKhjmr8s/NTh/gvlb/2uJb50JX/CQ mZOg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=SnbwAH1f; 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::615 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=xqPQGcQOtAx26PUi8LJx1uu0iidszfCghgllywIIGao=; b=mF6EbWcH53UKQLDNCDtCn1y6LkCY3u2gYKX5gyDFejrq9kxBoG9/F9VAqlyRkoxH2f XiFbjezBfUdegpTNT9ZoYn4+oEmwWqNayQvuKkmqrpwUBv9K9D0fDlMyTFe7JY8L3f6F beXa/mkbJ0dAe4W/BLXlnC/n7oqH4Htl9n7kwfRZ3PTOD8pOvXaHiZw+Ryt9lxjFpLOc 0UP8oPwuvUSY6Ea/xFcdo2iHOWOTNZYv0gHrWK7ea8NjuJTmhrAHndJUFYz0bDyjRbhm 7CqW4XWd6dnJiNHXXa5TcGe5ONgaY9nnAM4X2wzs/2AisFr1eJykHhn7KOvg8VfetK2w w19A== 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=xqPQGcQOtAx26PUi8LJx1uu0iidszfCghgllywIIGao=; b=TRi3UFv2v9kM5IJOjyIsf/iL23X4THqTWY+hrMK/FJvD/F3hvK3IEHdhuJCLwti2j8 uQDfl+lTlxF4RAvrdmW9lCaQSEogb298XU0rWTVSny0pL5XEEGd0azFBmdseBfpqnIfF 6O8nVeCpSthiAjIqJ3zfrOh+HihDEnpK9gBCzB4gOiMqjVFa3Hw0q8L+qmrkr00k0gun 2d/R2pa2rO62ak0ALI8ZONWTC4k/oqV4G8mbXDAKtncPAnMhcT3le1Jbw+BxhG+dKfY0 VafFVZwt0UIsba1FcRfJLUNcVj1T5WL9bVMEZXT1AEmLDY+a2a577bJlcLQ0r8D+wUmW RlIA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5304saDTlVjkaKpqUdsQTVprKz9wwVM0D4BYZFfIyLdemnjaymiS tKpGTHv+c+ydUYiw6CP1mNI= X-Google-Smtp-Source: ABdhPJyL/uplEysmUo0DOAesxffo2QFwv7+ANkz385j9r4nDkmSQNFlaz4b+JApqrUQNJht9N4+nSw== X-Received: by 2002:a05:6512:1195:b0:44a:6e0a:115b with SMTP id g21-20020a056512119500b0044a6e0a115bmr4329218lfr.115.1650005799948; Thu, 14 Apr 2022 23:56:39 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f16:b0:449:f5bf:6f6a with SMTP id y22-20020a0565123f1600b00449f5bf6f6als5947259lfa.2.gmail; Thu, 14 Apr 2022 23:56:38 -0700 (PDT) X-Received: by 2002:a05:6512:12c3:b0:44a:27c2:b0a2 with SMTP id p3-20020a05651212c300b0044a27c2b0a2mr4283009lfg.325.1650005798669; Thu, 14 Apr 2022 23:56:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005798; cv=pass; d=google.com; s=arc-20160816; b=jWrC1vtJkGJGzUVHuGjeiZcCzlSyFMrzuD55dsslOzS9psrOTftAge4TUaGZP0WVc2 J8BOtLlcX/nXQ1xubvshEM0CcXyC9Tv42hEtERh0NlgBc01A9PAC3J1VH2SMJbw4E9yD SYFJys/WMBfMgJiO/yHPGH/7vWXZKCBdBKZTJ8zugalSG2zgSrUJ9SzSZzSzw6OGnDI8 AM5+RD7Wj9/pajMmnmaAzQrZH2FjFelSHT9WbYw0yNlJSIiIbKZBZCFMYQUP6fF+bE91 45sk7GTdkU5UmsOjDHoF7B3Lcx5SStC9L3bAESjIM40XWdj/CoRItThpfEXch9fS2cA+ rErg== 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=FwwxPBI4S/lz+p6OvFx2uo54kH7xnLb8ltD6Ug6qg3fP1VGP9SVH/xySIHDYUP1K2K EYGhhxw2rAdKU5ReDU1yA4HAyvlywGmDPeyXqMa4w33IOw1wQXDsbqFcYmhQehQyhgSx nUn/a0eaKVZgoEyUDR2/CNh09gya0he2fLNvhFmeUC8Zporraig0xgBqaPwqozOIXxRC ntNXWgF4USgmOl37y/x4rRzQiwCZXTsHRYILs8u2KWAmiZzQu0YqvbOyadh9SDOlUQ0O SjTtp8a7LOCrQlGXijhSRV4B0LB6mL3LysXhfvczv8kyjK57o3nDQsQnaEhaYD656adt Bz7A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=SnbwAH1f; 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::615 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-vi1eur05on20615.outbound.protection.outlook.com. [2a01:111:f400:7d00::615]) by gmr-mx.google.com with ESMTPS id m2-20020a0565120a8200b0044af4a5b540si48020lfu.7.2022.04.14.23.56.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:38 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7d00::615 as permitted sender) client-ip=2a01:111:f400:7d00::615; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MV4aAUS9PtA2azHaxDUjX1DK5/Q+uUnT55bys0fgQ6fFiaHHVSwR4fhulS7psgkVaZSABrQM48JAt/FtH3KPud2xcwFM0GWZqEfdTIRZu0deqpWX0sPfD159Xta2Dm9o2R0Td2Rd2GxWdv5B4CEL/mnzmdo8B26KUHSSS0sUQ5RM4HdtrWIXdIsTPw7HpF/KeRs/ODJ+y8Jexivr5e5gP3mLtpEvJvnWVBwwzow/dFbdb813o407b8O7+vjO83k2fiP1lBcI9rFNjNA23WhwNQuqsaGA2hwhECWvUHVhAPig9DYbjCvLUteOltzrhJ5CpeJFXppej5JfnmjrQaQUcQ== 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=a0RwZGdM63VVA9TAGh1XLM/qscArzSCq2E7G4YklRAR1eTwj8i+HpxbaVpehcYxDi7y21IfOusv04bA+J8eEQBO46Ezo8lu8rhLB4s23LZSjiEfEoqe0/iRmv+5svAvQ54qoFrGFkDm+j+6l2idoQxybITjDDOq5/CoViNp9ItLN8YbcZS+DRJDGyUwx+eRg9G8Lcdl9oI3Ico02pNfnL+hQaxgl2vhU+umugxANVvWbdlTQeyX/UDEqvIJb+LJ6RLLWe1lRm/fqOfVlRJ0mJxnHLfmcVqpmP2mz1jDn7yCjZqFGjlfiJJdXqxsAC4J9xdYbCpAd6rZp5tCTlhmwGg== 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 DB8PR03CA0032.eurprd03.prod.outlook.com (2603:10a6:10:be::45) by PA4PR10MB4461.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:100::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 15 Apr 2022 06:56:37 +0000 Received: from DB5EUR01FT056.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:be:cafe::53) by DB8PR03CA0032.outlook.office365.com (2603:10a6:10:be::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20 via Frontend Transport; Fri, 15 Apr 2022 06:56:37 +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 DB5EUR01FT056.mail.protection.outlook.com (10.152.5.101) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:36 +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; Fri, 15 Apr 2022 08:56:36 +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; Fri, 15 Apr 2022 08:56:35 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 1/7] image: remove IMAGE_SUFFIX Date: Fri, 15 Apr 2022 08:56:11 +0200 Message-ID: <20220415065617.1910954-2-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-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: 83C873BD57D754A92F58020C07D480B23573B048251157F3FD3CC9EADB65218D2000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0603db5c-a984-4198-70f0-08da1ead15ca X-MS-TrafficTypeDiagnostic: PA4PR10MB4461: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: 13Vdw6nSSsLlWhia0LltkbhHL0lb2XJ/zWwiuhPCGT6fndEn0tsiPQmqgPiaE4jLiDd1vz5VuP16Rjw+ptzE69AvRMlTtFbFKrUYB0DSKhlyitooVs5SpM3jfZkaKX5mSzBvGXM2OUWEjSCOONOHGwX3h4LUkRKJ4psBY75f5QaMXx5EIcjmFlrfQNYtLCL5oeI//CDwBkA47X0kge2lA5048VzgIq218KgvUrr2ScBOAmVsUOMMDsNyAzIsEzdGRO3O2qZJVyIUN6GHBoxzUs5hXSQbil7zKX1fROArYrlCgFhaf3LFl6KrjLVWRwnu+F2b+YJGfMc78+gXhx8EJUVZROiFYuuwTpvah6a6jSoKDRQ7bayUPGOQkVlh4OSKv8ELCcAeZzZWvzOBGRAFssSlN9nGbvaXs1bOOXazyPmjfCou5M21nxeR/ygnQwMjuMAdZ95GSJP7EYBH43fsdGNTrs29P4Ev6Ncmc8krzCqKJghh+dUUwmO34hwaHGDqG49e78aD/FlVg+mM6YYWXhIzIKiB/QYbj5FasPhXHfiSxLFNGAopWFh77yDsAGeq5i6sFHJGZWR6os4Zb86qOqD6uayl7F8Dck/IVAin2d16/JBwNYURWfarYD973o+IKEobqyYKOTo+CtBiOmTY5OyoHIjnZEjLUPgV5Em+R+KRUatfzJSif/ofCoi4bbK5NtBuSqXOzEo0DaVPGU6qxKQ7v2Ze8xcL+KZ4i0xQD0VWX4lrJIghn8AEpjHoqvkk 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)(46966006)(40470700004)(36840700001)(336012)(47076005)(83380400001)(6916009)(186003)(356005)(4326008)(36756003)(26005)(107886003)(16526019)(2616005)(956004)(86362001)(40460700003)(1076003)(8676002)(70586007)(70206006)(8936002)(5660300002)(82310400005)(36860700001)(498600001)(82960400001)(81166007)(2906002)(44832011)(6666004)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:36.9485 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0603db5c-a984-4198-70f0-08da1ead15ca 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: DB5EUR01FT056.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB4461 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=SnbwAH1f; 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::615 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 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 Thu Apr 14 22:56: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: 1690 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 15 Apr 2022 08:56:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f58.google.com (mail-lf1-f58.google.com [209.85.167.58]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23F6uj4K010363 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Apr 2022 08:56:45 +0200 Received: by mail-lf1-f58.google.com with SMTP id l13-20020a056512110d00b0046ed385ed94sf641003lfg.1 for ; Thu, 14 Apr 2022 23:56:45 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650005800; cv=pass; d=google.com; s=arc-20160816; b=wcLFaZuyqHjHKS/pfAWHCuo6ySeY2mfH8Tqb734d7JRyUH8J1eKTVTjv8YCQFsEaCu XVkxsBB8oZdgyIE5lMazmF9HWuTUy6fymwESBLGK3wkZ5sHEADlEruT2HLQn4r2nkYzr lX8nzvT/Ruqn/XSU5lCdZTB1DBMrT4BAFR6BYnHvOhW4BiFNUDBjGV3zkDsU9N6Xnt6i 8wo4ccWIJzOyppb66+QKIL9FYOAVdPu4Ofi7xBfDt1K+sT8MEI5fAYKO+2mi0Ym+UzxN 8idRguw+a9A/1+NGGFW2+0qqxFI9WlMI+QCJNQIwMua17iZTItwRHfgrBDJP1TDm9F/a vMSA== 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=mDJE8IvLDo4S2j3qp8eO7FPwT5T2KqfFRE/KP1We8MU=; b=ckgjbWYLGKsuvOZLJAELjesC2BNs6mLyhOTy6AuiL2Wnkqhtv7mvwqo4IvarfqLYOb NWhtCUv/T/2KPfbhehlXz5ckqHSBWXqYPRHMjbudnrwd50M/NxSw9etam+MS49YxfaPy WC865atcskMOr1BMC4JK2CgQxkF3yZeJLVWqDpxq9HYlXlgcvyDOifE62zkuymbMk7kH QhaSBAD2b6YjWnmaQtz/JTpLlFochd42zNuQ2qNqO3wsucaat7uMdUjreeG1s2upaR77 jQcvC0OdRgjOMq6IWMrBmGVVHLN0gxDe8xK79yNtDafEXyBfnNin5Ejk1vzk7bFVjjR0 Mw7w== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=q4yHpV5s; 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:fe0e::615 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=mDJE8IvLDo4S2j3qp8eO7FPwT5T2KqfFRE/KP1We8MU=; b=D1Xa9K3qkol8KvU0lFoWr2yjKy+OlCnmODw3EiBVW3u5PMJMSlz/kd4ZmI1S+Z4eRS IorRhLQYMrUDYP9uwMClXepXEimKxWT3MMldNzBV3P9258btdFLB7ojCNkeY+Xs3tVwI +9kN6MbvnnqSutKyIWM3PlPzb+XVQ0WifLtFpVuj+FVZPKrUp3E8jADQWtRy9euKpu/H UYDALGY5AveivnqI3qdhOsO/vmaoBj2X3EQqxpqEyiAXm+AQ1kE+iM2mpT+1j4PyhHAk P0Mim/jzmez01ltT7E7DUZ36vtzYJHV0Kd7PNvI9NBl9okLH0Rd86+NCnGpWim/kpziv 5Osw== 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=mDJE8IvLDo4S2j3qp8eO7FPwT5T2KqfFRE/KP1We8MU=; b=a8UFmHcD3rjsmSFHO8nQ1ghittwctlL0UTIDl8fV6CK/qSl9S4spOAGZqH6E6hBe4i MuPjKrm8jknIRdXnPTZaoAVPrdioxFyG2AjwO9luRWHx4rYylzlKn295DHPzkiJDh08u gxnThifkCd4aOLfzALfRVzpP5fST9UORefuVEfgq5mfGQXI7IxrImjfBAmFpW2goBeAK FOUf8EFD413Jp1nocdzJd47aSS9ad449DO6OatcWFXHfUGhc98um77foHDuOMFHcHBle /5/d17Br0FgqzJ1ecx6AC2b5cFW7LquP2DC16Z+3wThgjSS/dU+GbFKv1vudcrVrChHv uWug== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5302uCzB5ejcu1cKHpEYeCjqI8rsovtS7vBlVvhZkWpEghnMw4JZ CmBZwG1Hx+NPKtSY+beYe2g= X-Google-Smtp-Source: ABdhPJwcWzmCe1SsrCrHmoVz6ZAO37toOlUXOWo5mLOPjcOJZBOm0sbxPdjwsGULc+sv73Y2KBoX7w== X-Received: by 2002:a05:6512:4006:b0:44a:7434:9829 with SMTP id br6-20020a056512400600b0044a74349829mr4271352lfb.661.1650005800014; Thu, 14 Apr 2022 23:56:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3f16:b0:449:f5bf:6f6a with SMTP id y22-20020a0565123f1600b00449f5bf6f6als5947260lfa.2.gmail; Thu, 14 Apr 2022 23:56:38 -0700 (PDT) X-Received: by 2002:a05:6512:1096:b0:46b:fbfd:b7f3 with SMTP id j22-20020a056512109600b0046bfbfdb7f3mr4206652lfg.174.1650005798689; Thu, 14 Apr 2022 23:56:38 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005798; cv=pass; d=google.com; s=arc-20160816; b=Ex+Y2uyca1PVnRqhg89FRd4PdWTHhedyW+qI/8YiOWm9H09AoKOB7sGZoiI2TLfV3Y Co58MxVCaVeb4XoxUsL8g8hY7dEHR2C9eGK3vrvwbeXHgIfqpC3eO8pm9C3psIf3k+pf 3n7oEanjq+kEr3sRUEW2eBRScPBnNtk0vRISm+YY/xJDFWhJlaUoQR/GOtWhoPt6d4xD kUOzxRFawIBIIOLiC20gHXQWcNb8/muJ1iggKel9w0RfzJqdtmpkPEPamaJ+9EWuHnrw vE4as9sSMMx6kUch0Y+AU/4s7koNrrqHp3Q4l+V8r5P8fGH/GtXo7H8t7Rw5kGoVrAeN XjPw== 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=kd9zDnafGZ5UUSYn9POUQsPN6BZi8wLWJfFVULkdXIaQu4O9IDNt/Fy7bYpjS18FIb r4LD8aR6FXmOBmRqp7k6TyEsyT81O6Mo5eoygNLwfV1SQ1vRyiAEy2yFOJVACg0ZRBTD wKUya+hxWQGAHH34B/WUaKkQqlE3CBDWuygRPZ6bAc0v7AW9NIzvuVnecwjQfUxk9PGj 0UoRYCu6iFaqxvGPdyvCpWk8ko53zAMDnApFbNrwfmM3/Fna+po7vYS6ifornpv3qxfg w2yzxZJn+CyDxmuasZkeH+N+UtOvqbUnwtpyYyH3bHvlD2U7Dsf25NrEHKtbGO1OyGPA 6rnQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=q4yHpV5s; 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:fe0e::615 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0615.outbound.protection.outlook.com. [2a01:111:f400:fe0e::615]) by gmr-mx.google.com with ESMTPS id t6-20020a199106000000b0044ada592078si45686lfd.6.2022.04.14.23.56.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:38 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0e::615 as permitted sender) client-ip=2a01:111:f400:fe0e::615; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oKwsJCTUr9st6UtH1lPs28pyyEv3/O8wSSFsHeKaW1KmgL1HYw0nXsqSO/GMJE9YzGQwSlyN0AJB+DMobixugLjS3m66Te7gdEzLsN1efcuWGlqvbetcD5eEU93g/k/N3nMAy+UdO56tevEAcPvIdNaOvoR3PftKOu0Rvplb5QU2mStgmY9HkBkZKgXMbmDxttq7RzaN5FII7bcCIeAuJ2HyjFnsEbEt1rldSLNVuo4f+5e9hxsMTrXnocCq1VSgdURefgabT4Aks083K4M8mkPTzrNC2II9gdVxwc7j4FHCYN2rsvoWZjV2QfCBepSlVgUjCXkqRUVJXYtYAVZ+LQ== 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=Hmsgc8lRClY0v3lw1NWnWlWM3lZOMxY5z4iz3G4yjQodLaAfNplSnM/g54k7ilY6Mt9oC+hanVq5AmyHhpFK0oQpSkOaXiS5LjBtBxCOywPZNn3yDJE+G7QAh6CXul/CYrkUNBNOjdZWkJqrYL+l/gcZYa/bTxuqh51Z9c7Pbl5OPItLnX4z5pLyqcV9/y4CBNBGwMywCGmXYNqZvo3/xAg8xxCfM2ueZeb0x+sIIQ16SepB/iEAsufCOu9eirGDlS7cx4P166IqSnXVZuKtp5eJ3R3K+eCb6NZjTYt9URnM26el0CKJfNjjdP5uVEPmIvBmThLJ1flQJAmwer/ioA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.71) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none Received: from DB9PR02CA0024.eurprd02.prod.outlook.com (2603:10a6:10:1d9::29) by AS8PR10MB4693.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:33a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 15 Apr 2022 06:56:36 +0000 Received: from DB5EUR01FT061.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:1d9:cafe::63) by DB9PR02CA0024.outlook.office365.com (2603:10a6:10:1d9::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20 via Frontend Transport; Fri, 15 Apr 2022 06:56:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.71) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.71 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.71; helo=hybrid.siemens.com; Received: from hybrid.siemens.com (194.138.21.71) by DB5EUR01FT061.mail.protection.outlook.com (10.152.5.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:36 +0000 Received: from DEMCHDC89XA.ad011.siemens.net (139.25.226.103) by DEMCHDC9SKA.ad011.siemens.net (194.138.21.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Fri, 15 Apr 2022 08:56:36 +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; Fri, 15 Apr 2022 08:56:35 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 2/7] image: refactor SDK Date: Fri, 15 Apr 2022 08:56:12 +0200 Message-ID: <20220415065617.1910954-3-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-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: E637F116E13A7228566FBC124A29A813D28A58F1FE29E1799EC7D918C5FA9B162000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd500cbb-6e9d-47fb-d1fd-08da1ead1593 X-MS-TrafficTypeDiagnostic: AS8PR10MB4693: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: rxYjbH+k1bBQsNAqdSLWvKFXmEkBLLykQd9XfClZuy0ulPNjT8uKIGAhmtiX5PyMysNaTEhuCDUfkybARyJ5bpZ2r5hipzTJNBDfBa++zfosg+2PFmSHWp0EijvcjqDnCCJRb2RQrSdbnN9wnXqPxPbOIf7Lm7qwLYr891/0090UTHJ5KWS5nInieLKRVdKJBehiVysxI5ywUmWl2YJaTU5i9U4uZxWtapHIKqA0NXFFLGf4c3+9oIpdczxwoTAHy5mwsWoPNqcVK3rsJZ3aahXG10uptX2woBz+v7LuMrtBo++7diRkAYFG1fC3kGTHGQR6FJnHZ3MywYtSBl8XMUZlko9kL9KM51OEtbMvczNEYRnHzIZNI8aSBrutSgMzzeqO90uvJeoDqp5y9abTTiwVwszJ/z7T9CkWIj7acwXMsvnRc8MYZRwYc1cZRNJ/zZIxsQFm2yw1GwvUJgFYHEwKaNeu9Xh+wmUOgxyXYfe88cqFxZVQrhs+DsHZGGjvLSTnEQ0Vo/OqmEMnYeCFiZV4WSh7SR8r9xHGUfA/+FdQo1A/AkLUtvXt2dFh7wHFdfvCe+i9fSiwd6HK6SI3FsfA89VGWmgnzrcRw9zBSz5RZB7clYvZUw0Kirwoqb9XyZTzW9khdK7La0VcyQjM/ciGh2FLEz7xnfSQ0nQuPMHIOAsM+lmr208XxOzA+nAqTcIe5u5uj2DNlhNhgtlARg== X-Forefront-Antispam-Report: CIP:194.138.21.71; CTRY:DE; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:hybrid.siemens.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(81166007)(5660300002)(6666004)(2906002)(82310400005)(356005)(82960400001)(36860700001)(8936002)(8676002)(6916009)(4326008)(70206006)(70586007)(498600001)(336012)(2616005)(44832011)(47076005)(40460700003)(956004)(107886003)(26005)(186003)(16526019)(36756003)(1076003)(30864003)(83380400001)(86362001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:36.5827 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dd500cbb-6e9d-47fb-d1fd-08da1ead1593 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; Ip=[194.138.21.71]; Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR01FT061.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB4693 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=q4yHpV5s; 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:fe0e::615 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 Thu Apr 14 22:56: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: 1694 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 15 Apr 2022 08:56:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23F6ukc3010373 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Apr 2022 08:56:46 +0200 Received: by mail-lf1-f63.google.com with SMTP id n2-20020a0565120ac200b0044a2c76f7e1sf3228131lfu.5 for ; Thu, 14 Apr 2022 23:56:46 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650005801; cv=pass; d=google.com; s=arc-20160816; b=N91RiP6uz1H/rXh0k/G6B8UQqCbHXPgq0gKunoWKF8tItgonD+G79Exhwhq6OXdTsJ ypOmb0QFatOMav9hMOMgIPdeyv68eVgswkZBv+TDSmeK9p/g7iKIhzWgM2PizZVOyqqq EMnYDVYPE26o7eGRoUj2eRB7uL/ZQBD7rVNJrFeievc7gBonCMky9IBA3Mv8kU4ksFWt RHsMsognF4hEGcxUit+yFdevjAtyl2weCWeXdk1ndOU1uC9qLEan8xbEZZTQ0v/pZxS9 DRceawFj8q9z49bGqX9ZUyDjs7sQy0t5uFucRinoqk6EhOpeWcKxLbj22XTmNPfjzxAX E7Fw== 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=IU4Em0lhxf530sDTX7wdax3oZKLx3bGu8Ua5/SSuOyM=; b=v9LjU9GzFXLoHq7wuRwdzyUwqUXuVX/LXgqFQS9Gq8LvhyyzVaF83ulwiO/3nIbBGF H/+qRlNtyzFjgTq16eHLZoap4f/7WbEDGvbiTXX3KSY49l+xSpRZnV6okXomaQPkybkz 9nVko3BVMBbp6pXSYJ1mrfY719hmJFltkSd6r7GSKKfLQtZ/SGBTtONF9d38uR4RSbdM VQvVy7b2URNkf68BNHpAtSTCgzfABuNdIQwBzws9W+NfN0hgKj6etdBidMfhuU+ZP6vd yjDcp0ISm31tb1OuOoPvdDgxQdTxLDHooqNyyOmXpTkKMNITnnmmNHCxsghVI8VU8UZM Cx5g== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=j8WJWuwt; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1b::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=IU4Em0lhxf530sDTX7wdax3oZKLx3bGu8Ua5/SSuOyM=; b=cvFi8w/rQgId589IRZzwLm1GqvN+PA/y+VGItVnanI1BAZJCp9N0awDPIP8nSHfQVL PJp6e/jOSBCkvxGx/Ve2VVwk2VKKBC1kLKuLXhIpnHeTtGBljkOoAghleiCQ6b13BKU2 sAOaOKApBz+yd0sa1qPT4tYUJGcEvs+LWr2xYbMDyn2snZIfC7c/ojRYukIv2hlAjnB2 7NFCZXsmVFMCefniUx83AorH0BF8nKaA3EnD72Z6fn74fTW6uxeynZGGotzhc97vS27k iE1WXdwm6d/hc3ABPxSDedBU/qwZY55N+h2gNRy2i/9NDUvKaAUnWxO8UI8bUlAGoTSO va7w== 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=IU4Em0lhxf530sDTX7wdax3oZKLx3bGu8Ua5/SSuOyM=; b=5R2h4O5IJupAsNjXgCxXysj3CBXvsGBiey/BP1RAatBQPnB4E6M8vyg013JLBKePhg ALBU14T9+xPjisAgNoae0FxKYrDpIsjMUAJ+EvS/naO508rtCiRQaSzCMOAkdlkYbyFt I5qbzZ/YxisDV0fD/S/c6lgog6Ha4O1TIgOCbVKwWVPKNI6f9Ea4ki6A7j5J7AdU+hd7 Xjrv9Ura/Fd9LYdqUk4MMjO+R0Ws0djb1PLbXMlC5RB5AWP998VXgtM30iPlzVdC/DdA ixZQBE9jCJmFoY9KO2qCZbeVjLIogx2dc2QytBqKLAZFzkeL5IedNzekGqImUtzy+PnG FwnA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532PJMl36TPXIV4HZSuOU78s+bsaBxZsyUT4J1zI1mh5rwuOVPwZ Uf+ZU8NS38H8SmXpaDVydFg= X-Google-Smtp-Source: ABdhPJxMIFg5upFe8ZsIQbcsWESt0UtWxg4207CiZt3P4+M52BBoRq9Rbin03oMyGtDvQHXqlYy5aA== X-Received: by 2002:ac2:5fa6:0:b0:46e:cbb1:4d14 with SMTP id s6-20020ac25fa6000000b0046ecbb14d14mr1575876lfe.249.1650005801099; Thu, 14 Apr 2022 23:56:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a7c3:0:b0:24a:fddc:ed41 with SMTP id x3-20020a2ea7c3000000b0024afddced41ls1333455ljp.9.gmail; Thu, 14 Apr 2022 23:56:40 -0700 (PDT) X-Received: by 2002:a2e:a54a:0:b0:24c:88db:783d with SMTP id e10-20020a2ea54a000000b0024c88db783dmr3649820ljn.341.1650005800033; Thu, 14 Apr 2022 23:56:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005800; cv=pass; d=google.com; s=arc-20160816; b=U98EV2/+ZVzt7FfeqxmlLMfGv3I76Z9VDZlMRWjHVnldp/SAJh7uSTdNI+eXsY9jan BQAlzjiXAXthwWiq2Xs2jXmnTff6cMqUdnOXkFQ0nSFFvGyTAVtQUrDFj58FZ1KGYAwH 3XP6qGwqbNsxXZKO/2Ym+azkJALd8g3buWWhKDxqgPEnFLvsWJh/Qcq5fcP7n5o7RfmK x0KzWbGW3to0BOCuX/bQfpP60GHQ9usubA4XuYgjV3uAKS9CKirPndI3gFjAEdNCj1lf gYngYaistVk4dntXniy0mW3jvpIvZG7hUwIONRMgkE6tY7Yib4asFGG+9tpihO9XRJ2K 9kzw== 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=Qxd/NkHH1CDzlgrR6kCKL0Rzg5g+m1WpYrwRweTitnw=; b=sD4rkP3ZA/kpDZO2qALDBkWj4jbNkDbcZaMEBeR1GfjKr2tIPvOZewfC/RcCubFYK1 aQuo8yVKyupQS19FHDrdEtSMb94enNgDa4cksexq++gwN2ozsE82UxgZS6xmrSSNaM/r s24kKMOH4a8jv2C4qxzp9yh12xvosUDvOo0bKOryuym2DMXpCUcOPOT1ZdBlHcJzlsgQ 4JxKMFrX1aIJPDXR9zMfh21dmvZQb1JP7xKdtN4C/aRNe5zUAomW7iNfydpTZsykllj4 HSjrfplLAZwVJhGG0WqCeiH07pOTEBnenLiSVLtDHfGDM7PAOpHloJgo0mV5BVeft90+ nHgg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=j8WJWuwt; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1b::61e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2061e.outbound.protection.outlook.com. [2a01:111:f400:7e1b::61e]) by gmr-mx.google.com with ESMTPS id z11-20020a0565120c0b00b0044a4ca0a067si45025lfu.0.2022.04.14.23.56.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1b::61e as permitted sender) client-ip=2a01:111:f400:7e1b::61e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IQE5mAJYeXa8ci41ESKR8zNITRNChjBQdhZRpcW57z4rFKCrSg6auLtRRGZQQypnOq32YAlgh+npuOk73Bwn65Cmn9YM38KRrTJBxqitUxXxTgBwkm1mMk6lA7WfAo6VGrR2jF+YvCtvUGfZMuSdDVw9NpJ26VkAwFKU9EIZ7Do7ZLUHJK4/Wlc0naZzpYRbuLW3c8WUte1Z4oZ8I5rLni9Cl4xjPQh0dtiXPoTPcimIeQJburB2dVL2YwuzHWV+WKIq082TcvomWZFeHNZ7fltJRHbguVy7AiasuFIBQM95AiLbc513AHRTr//rgq1j46vFhsamTW0QZOY+01AjWw== 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=Qxd/NkHH1CDzlgrR6kCKL0Rzg5g+m1WpYrwRweTitnw=; b=QFf/sbPQvl98eovPGokt9orfrApo0idcU++UwRmkeS9SaGDTMz+aqR9unNzgew0qsMrrc+HGkPROx/zteNEov+flYA2oTj8XeJ7RMWksvlmPKCpmtp5esJI6XwO9yMMUUMm7NnIoLHWuIVC3H+LQRW9MvHykJeQd7WCJR1s1Lf+wo2Uuk0GGo+TVURw519RGssKQkcUFzxGa+5yl1pQOBmGt+PFczJW6n7MbqiGz3MdlBcykNwqVTj0aLdyRufrElx1zfIgcLmX/+Zw/fPOb6ygyKCp/THMth7dW9u2kNw9iZMvZfmFOeSt8XtdmSelLLyWv/3d3TWJFVUN35cKtOQ== 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 SV0P279CA0047.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::16) by AM7PR10MB3253.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:10c::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 15 Apr 2022 06:56:37 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::b9) by SV0P279CA0047.outlook.office365.com (2603:10a6:f10:13::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20 via Frontend Transport; Fri, 15 Apr 2022 06:56:37 +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.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56: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; Fri, 15 Apr 2022 08:56:36 +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; Fri, 15 Apr 2022 08:56:36 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 3/7] meta: introduce IMAGE_CMD_* Date: Fri, 15 Apr 2022 08:56:13 +0200 Message-ID: <20220415065617.1910954-4-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-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.331500-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+a38omfXdjnxOsxOOzVy1G1jO4I4qdhC2OTf6ksRncwz3CwuNS8coKUcaOOvSY4skV GVGWSNg0i318C4Nk3j1Ia1fLx7Sd3GFnbhB0oIV0fRxNuolTAMZ9Mzkp0iMWEjFxQJjX9v8jdqv FOu+K2iesj26RWB2maPuaHi3e6O1dE/jI8ofiAMuqetGVetnyef22ep6XYOwBXM346/+x80OEmU hofv+yt67dYqQjJqp56DByeLDRkrdlHq2FtYAqZuffWhtd5 X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--12.331500-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: 0278F2C53C738E9397D4F300A266DD26D4AFD1DEFCD55D7F9D988F0C0F97D0B82000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 629752ae-99df-49f9-e73e-08da1ead15d3 X-MS-TrafficTypeDiagnostic: AM7PR10MB3253: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: sLJwKtaQpmEu1eYE1q5fkA87aiGYUJHrrZ6Q9mTVp+pYCPuvclBA5tYUKqnSWQtQOtwzutH223+T2Gm7F+6XlTdL+2BakHYSPz/8igBOzWXi9VznmnSxJE3G1XWo2Mhp9a/JHAS5PhJ0WsmfbbOLPUWrDpZcvPKhotEtyl2oLFcNpOg+3rbXisnSWBon6H0rW6oLuWzl2//GDBu5Hptbl5YJsVnO0/nOt7i5jBg4m4aFqA76FsdOL/20sL5V0KEEGosG5GWvXxjDagJnaRpSnDR4aXJTxK47o0jRvwhK0gq4Ud0osJMJVDORl16BocX5jiwD1Igbkx/EKuoGdJHuHUG3ZFclrQJglTFaNhVfEAV6VHdmg+MdjY6QCt0vMQ5lz83kFZt94TcNNGiIYFHNQYOyLSgEK0Op1vl1DMOWeBAVZpERS5Zny4WceSJaBqSRdPlrEhWQk4tmeEx7VF9Z/0T0Nyjt4/KuNLJPc5UIu22tKI6e8ipBHpyRlVuFu34OGR0grDqASB6bulLdOTzxp/3XKHRtQIO3quRJp5HUyZYndHdMNBdqgUoEGdZSti5ZKxLsDED2x5BGG2yhoR5jZ5eo9BX1isioTpxaPVEhtpVk4LEXXZ6k8tLf69Hyw5YINYCN8heVcMfUICz1IZ2cfQn6gtfBe5MjbiR5GJL9V+/v0UFUs6TBW7LXfwnAZsRO65JDYhD5x/+rlB2CWEVGwSDO06L0NmhdUzSmq1kCFDZYXIlEdLrqegY+EFGrfl3jHCLeZlJAO2rFY9/oROseSREcSnX8m19lFbLDFNSR0xg= 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)(8936002)(5660300002)(6666004)(498600001)(6916009)(956004)(86362001)(70206006)(8676002)(82960400001)(7596003)(4326008)(7636003)(356005)(966005)(47076005)(36756003)(336012)(70586007)(26005)(82310400005)(186003)(1076003)(36860700001)(16526019)(2906002)(40460700003)(107886003)(83380400001)(44832011)(2616005)(30864003)(403724002); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:36.9847 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 629752ae-99df-49f9-e73e-08da1ead15d3 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: AM7PR10MB3253 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=j8WJWuwt; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1b::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,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX This makes a number of changes: - Replace all do_*_image tasks with IMAGE_CMD_* definitions - Remove all implicit conversions (gz, xz) - Add IMAGE_CONVERSION_* commands - Create tasks (do_image_*) on demand in image.bbclass for all requested IMAGE_FSTYPES - When creating the tasks: - image_do_mounts is inserted automatically - a final chown is inserted automatically - variables IMAGE_FILE_HOST and IMAGE_FILE_CHROOT are set to reference the image - variable SUDO_CHROOT contains the chroot command - Create conversions on demand based on IMAGE_FSTYPES. A conversion is defined by CONVERSION_CMD_type, and its dependencies given as CONVERSION_DEPS_type - In conversion commands - the input file is named ${IMAGE_FULLNAME}.${type} - the conversions appends its own type, e.g. the output file would be ${IMAGE_FULLNAME}.${type}.xz - a final chown is appended automatically - Image types now longer have a -img suffix, e.g., ext4 instead of ext4-img, and conversions are appended like tar.gz instead of targz-img - Imager dependencies are set as IMAGER_INSTALL_type - Dependencies between image types are modelled like IMAGE_TYPEDEP_ova = "wic" - Required arguments/variables are modelled by IMAGE_CMD_REQUIRED_ARGUMENTS = "A B C" - Container types (previously CONTAINER_IMAGE_FORMATS) are now first class image types (oci, oci-archive, docker-archive, docker-daemon, containers.storage) - The logic of image-container-extension has moved to container-img - The VM image now has type ova (instead of vm-img) Signed-off-by: Adriaan Schmidt --- meta/classes/container-img.bbclass | 94 ++++++++- meta/classes/cpiogz-img.bbclass | 20 +- meta/classes/ext4-img.bbclass | 21 +- meta/classes/fit-img.bbclass | 17 +- .../classes/image-container-extension.bbclass | 83 -------- meta/classes/image.bbclass | 194 +++++++++++++++++- 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, 339 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..fa24a5e8 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,193 @@ 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_OPTIONS ?= "" +CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'cat ${IMAGE_FILE_CHROOT} | xz ${XZ_OPTIONS} > ${IMAGE_FILE_CHROOT}.xz'" +CONVERSION_DEPS_xz = "xz-utils" + +# hook up IMAGE_CMD_* +python() { + image_types = (d.getVar('IMAGE_FSTYPES') or '').split() + conversions = set(d.getVar('IMAGE_CONVERSIONS').split()) + + basetypes = {} + typedeps = {} + vardeps = set() + + def collect_image_type(t): + bt = get_base_type(t, d) + if bt.endswith('-img'): + # be backwards-compatible + bt = bt[:-len('-img')] + bb.warn("IMAGE_TYPE '{0}-img' is deprecated. Please use '{0}' instead.".format(bt)) + + if bt not in basetypes: + basetypes[bt] = [] + if t not in basetypes[bt]: + basetypes[bt].append(t) + t_clean = t.replace('-', '_').replace('.', '_') + deps = (d.getVar('IMAGE_TYPEDEP_' + t_clean) or '').split() + vardeps.add('IMAGE_TYPEDEP_' + t_clean) + if bt not in typedeps: + typedeps[bt] = set() + for dep in deps: + if dep not in image_types: + image_types.append(dep) + collect_image_type(dep) + typedeps[bt].add(get_base_type(dep, d)) + if bt != t: + collect_image_type(bt) + + for t in image_types[:]: + collect_image_type(t) + + # TODO: OE uses do_image, but Isar is different... + d.appendVarFlag('do_image_tools', 'vardeps', ' '.join(vardeps)) + + imager_install = set() + imager_build_deps = set() + conversion_install = set() + for bt in basetypes: + vardeps = set() + cmds = [] + bt_clean = bt.replace('-', '_').replace('.', '_') + + # prepare local environment + localdata = bb.data.createCopy(d) + localdata.setVar('OVERRIDES', bt_clean + ':' + d.getVar('OVERRIDES', False)) + localdata.setVar('PV', d.getVar('PV')) + localdata.delVar('DATETIME') + localdata.delVar('DATE') + localdata.delVar('TMPDIR') + vardepsexclude = (d.getVarFlag('IMAGE_CMD_' + bt_clean, 'vardepsexclude', True) or '').split() + for dep in vardepsexclude: + localdata.delVar(dep) + + # check if required args are set + required_args = (localdata.getVar('IMAGE_CMD_REQUIRED_ARGS') or '').split() + if any([d.getVar(arg) is None for arg in required_args]): + bb.fatal("IMAGE_TYPE '%s' requires these arguments: %s" % (image_type, ', '.join(required_args))) + + # convenience variables to be used by CMDs + localdata.setVar('IMAGE_FILE_HOST', '${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.${type}') + #bb.warn("FULLNAME is %s -> %s" % (localdata.getVar('IMAGE_FULLNAME', False), localdata.getVar('IMAGE_FULLNAME', True))) + localdata.setVar('IMAGE_FILE_CHROOT', '${PP_DEPLOY}/${IMAGE_FULLNAME}.${type}') + localdata.setVar('SUDO_CHROOT', localdata.expand('sudo chroot ${BUILDCHROOT_DIR}')) + + # imager install + for dep in (d.getVar('IMAGER_INSTALL_' + bt_clean) or '').split(): + imager_install.add(dep) + for dep in (d.getVar('IMAGER_BUILD_DEPS_' + bt_clean) or '').split(): + imager_build_deps.add(dep) + + # construct image command + cmds.append('\timage_do_mounts') + image_cmd = localdata.getVar('IMAGE_CMD_' + bt_clean) + if image_cmd: + localdata.setVar('type', bt) + cmds.append(localdata.expand(image_cmd)) + #bb.warn("IMAGE_CMD\n*** %s\n*** %s" % (image_cmd, localdata.expand(image_cmd))) + cmds.append(localdata.expand('\tsudo chown $(id -u):$(id -g) ${IMAGE_FILE_HOST}')) + else: + bb.fatal("No IMAGE_CMD for %s" % bt) + vardeps.add('IMAGE_CMD_' + bt_clean) + d.delVarFlag('IMAGE_CMD_' + bt_clean, 'func') + task_deps = d.getVarFlag('IMAGE_CMD_' + bt_clean, 'depends') + + # add conversions + conversion_depends = set() + rm_images = set() + def create_conversions(t): + for c in sorted(conversions): + if t.endswith('.' + c): + t = t[:-len(c) - 1] + create_conversions(t) + localdata.setVar('type', t) + cmd = '\t' + localdata.getVar('CONVERSION_CMD_' + c) + if cmd not in cmds: + cmds.append(cmd) + cmds.append(localdata.expand('\tsudo chown $(id -u):$(id -g) ${IMAGE_FILE_HOST}.%s' % c)) + vardeps.add('CONVERSION_CMD_' + c) + for dep in (localdata.getVar('CONVERSION_DEPS_' + c) or '').split(): + conversion_install.add(dep) + # remove temporary image files + if t not in image_types: + rm_images.add(localdata.expand('${IMAGE_FILE_HOST}')) + + for t in basetypes[bt]: + create_conversions(t) + + if bt not in image_types: + localdata.setVar('type', t) + rm_images.add(localdata.expand('${IMAGE_FILE_HOST}')) + + for image in rm_images: + cmds.append('\trm ' + image) + + # image type dependencies + after = 'do_image_tools' + for dep in typedeps[bt]: + after += ' do_image_%s' % dep.replace('-', '_').replace('.', '_') + + # create the task + task = 'do_image_%s' % bt_clean + d.setVar(task, '\n'.join(cmds)) + d.setVarFlag(task, 'func', '1') + d.appendVarFlag(task, 'prefuncs', ' set_image_size') + d.appendVarFlag(task, 'vardeps', ' ' + ' '.join(vardeps)) + d.appendVarFlag(task, 'vardepsexclude', ' ' + ' '.join(vardepsexclude)) + d.appendVarFlag(task, 'dirs', localdata.expand(' ${DEPLOY_DIR_IMAGE}')) + if task_deps: + d.appendVarFlag(task, 'depends', task_deps) + bb.build.addtask(task, 'do_image', after, d) + + d.appendVar('IMAGER_INSTALL', ' ' + ' '.join(sorted(imager_install | conversion_install))) + d.appendVar('IMAGER_BUILD_DEPS', ' ' + ' '.join(sorted(imager_build_deps))) +} # Extra space for rootfs in MB ROOTFS_EXTRA ?= "64" @@ -256,6 +443,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 Thu Apr 14 22:56: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: 1692 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 15 Apr 2022 08:56:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f59.google.com (mail-wm1-f59.google.com [209.85.128.59]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23F6ujud010368 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Apr 2022 08:56:46 +0200 Received: by mail-wm1-f59.google.com with SMTP id y11-20020a7bc18b000000b0038eac019fc0sf3320995wmi.9 for ; Thu, 14 Apr 2022 23:56:46 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650005800; cv=pass; d=google.com; s=arc-20160816; b=Hsr1MvDjv7iJNHsOmudMsH7kVTSefCHCeJYKWYzPM05U7wrwCm/j4ZI+ziaZ71r+oU lWnpqCg6HYkjn+cs8gSI0qcmU5q/qZDvqWD70muToymA4sJBmwkuOJqzgpUENQPH+36g dv5VPq0wXtE18sJTaEFsuZ+X68rWiZ0eCqVvPGU7QaUUaYh8IDIT304iJeF6vrPhrEdi rvap+Wt0WCApgzWU/UcscqAD7oO+bBOgmK6/WdvWRAngo3jIh229Nnxt/s0Q0DCQgTgI h8nFnVU7KgPjxql2nabfkMa3lSBZtXn2fW3YPcWWQbaDspvIh2vH4kxBcJX73Yw2JL+T IIuQ== 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=sixdbOna2lvypGiwHRGCir0SxFQmGiFyJVE+Cyfe7jM=; b=bardJwq4T13h1qev/GkLUp6zExmdhGDXWKaNs8duNd84nNlzSuMIk12BX+hhHwVokG /+mBovjQeLIOx+KOCfokLiWynArmhoWUtrIIaFv36sNb3Cy+gF3Zamu9j+O83OxNkL2Y nGc5YZEFzxxe14H2bPS2WWAsNt7loVIqn96a1cQPPtMM6jf3OTIp5dE0YQAZPPgCrAUm KCUxJEiSgMsMBqYSz1YuqDsFZ3Sq7u8EcjhUsu9ymy2urhMxOVzuWxYNIMv35KoIprHj MsboMuiYFzi9+2odeiy3bgHQ3XtJRln5ObNxrPQ4zcOy1pCk2yf6yL0W7YcvmqdhLRlY 7rFw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=uNI6t7aR; 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:fe0e::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=sixdbOna2lvypGiwHRGCir0SxFQmGiFyJVE+Cyfe7jM=; b=pbiLkjq4yB2HuvVQ76h0xSTfzicmAlxVcEP7YTGrHxYMGqrI0TAgZsuoq+aNjGa7EH sShI22Toh3PdmFFzwlO0UereFOfTG+23xUx9vaOJMGD8I7yjK7k0lcPniOCBPc27B112 pWCdLU5QpymfPYnifDLWGPwLW9nvKKlOyK08E2DhSaedxZ4nfXt/Y1EaauCijmvwa/aC n7HPmYrpOL4qlYaQ4jxy/JuAxmKy3v0B+1xYLvY1+9ZixX44Cf0CbHPykOKjzAuUdUPH 5HUD6ZJkf8Mii+m8srv5LYkxN9aYXsJ+zHUHqCrIJOm0aGoWYfCWGxzloi2NBiJ4L1m3 TzkA== 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=sixdbOna2lvypGiwHRGCir0SxFQmGiFyJVE+Cyfe7jM=; b=NlGZx3B+M+ga+aZ//imvQ8sbywZJc+rWvBtsQLgzZ5N0qPNhAWCIt9Z1VwJndKWbCF dPkqDQHW53wErs8Ff3DUOVZ5KnDfTU8hKYPkIN4t2hwAOlfvy/ul9TSS8nGIsoLpU+ns 8w9J50O/iQPAMkNAC8bqSW0lkPsMsucXQtZJs/1P3qsgaOdK4vRnEaX6hbJUbpGgf2VM GkPdyw2ARIGLszwe+OIiRJkCvKHrIm1wdOtQfQkmja4DXEAaM+ZiS6pL9gcrM4F6wrPb OBzr8jFh3OUS3jpGLkJ6kjN5XcVrAlMQGLPIUND7orNuJANPtR92k1yPPQRCVHywW+K3 oNew== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5315B14WWb6b9a8yP5TktEo8W+//qSiFGL8lodvlPY2RaFcj3vah ADmgzU8s9YAiUPwY4LKNh7w= X-Google-Smtp-Source: ABdhPJyAnxeQ1XgDmk1+knY1IlkMeTAT/rYp3cmGWik5xJDDKvS9R6DJxa/faGABzTd43Z6KHzGbtA== X-Received: by 2002:a05:600c:3505:b0:38c:db5e:a51f with SMTP id h5-20020a05600c350500b0038cdb5ea51fmr2018422wmq.62.1650005800718; Thu, 14 Apr 2022 23:56:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f950:0:b0:205:dbf5:72d8 with SMTP id q16-20020adff950000000b00205dbf572d8ls395632wrr.0.gmail; Thu, 14 Apr 2022 23:56:39 -0700 (PDT) X-Received: by 2002:a05:6000:178f:b0:20a:8009:7cd3 with SMTP id e15-20020a056000178f00b0020a80097cd3mr531280wrg.532.1650005799787; Thu, 14 Apr 2022 23:56:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005799; cv=pass; d=google.com; s=arc-20160816; b=uAQW9gey2oos+imRnIkGjqqBRnBnDHgbv2UCSgV/Ias4TrsXaqkaAem8HqgQ3t6ZPh 0MBFoTNQYdmjsb/sda7+6yksqnHwp3pX51gaAt+O2+d8rZgPdFttt/bb0Jsb3CW2875B lCtkjjOAoc1pVJLDD1UX4Oar95OYQ+H7fmF8bhlYSADTlKpQoU4vFjkas8IH2lTyqNul +jW76ydeSO1jxFQ/Nvz5F5TsWTz5fZuaG7JUMcAAy1KDEeTA3pqPPlEwckz5pAJ195d6 0QGTJiqabGZ6KqCqzd8aweYxMa/mQ4Csyxcf+JvjgCHJZxgiWsJo7XsFk2FvVlR9U9kA 60Sg== 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=m9v3N4LO0+XsFp7uHWGecrfHSgB82yeBSId+69RZA3A=; b=GhwJdIJz7yFf8a0cPjrXUiBoAwdxL/9i1LbZ1IYFYv+WhmlH6wboAqTC685vw9HYZQ LJjHHjs8JKVZxwB4lwZmXe59+FRqnruyUG1swUhqMnNhQ/cCzHqRnEtVip5KE8MetfS1 lBGXSxZcdPEDEigWq2S8tzi7DkkNrIpy64VGoaYLc8WOV8N8wrHrTcihDH2eH6Cn9p3E S0zawInbY0NfSC0Ofax2liWZ1effA1kKdXprSMyfPbJDmS6t45SUFdDyBjASC0OMvYZZ mMdiyMWfVQziv34Whts3fU2EPh+/W6HasWIwqYLFmtqllemxKugyWeFm78G8BMJTPLY/ AsHw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=uNI6t7aR; 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:fe0e::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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0627.outbound.protection.outlook.com. [2a01:111:f400:fe0e::627]) by gmr-mx.google.com with ESMTPS id t8-20020adfe448000000b00203d9be074dsi31097wrm.0.2022.04.14.23.56.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0e::627 as permitted sender) client-ip=2a01:111:f400:fe0e::627; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dFCzM4GcLQaYSrmakrTjDL0oeItPpkenNnntyVTklqYEB35DySCL8Ac279vJTT1zWDjLnA0daM6iABe9Ak9gVfynzTlU5nc8QlNkvJGhL9HrQ1YlyAuSREoOTGBRXVOnHEqFt/2VWtogzP9cs7XygbusgFxlwZ6EpNuokwVr+FgM0r5+Ff558oT7e2d9rXv9W1X3eVF+d+qhS81sB6K+SKsz/pNrikotgfXuYBiQTuKl39ONjyKzXjE1AiQgOrnQIYElfuMqWkKQvpsemuQ/3sOrXcM8IECyNBmdEI3Z/tMfKd0BZ0VrqFpU/hLGLaapaC84J/j9TSImrGGVr3b+1A== 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=m9v3N4LO0+XsFp7uHWGecrfHSgB82yeBSId+69RZA3A=; b=BF2JjKvERxziT54ZXNLoT+EZHwnwgLFDtUHRCf0mFyiwZepDHTETA/yERKphcA9JfddHb1kjHbE+X2wZqnAuSppiJ8q89uHuBuCunBHJr+sicacyZ35TkKV2oCYbNWmWbLceUQRmqSABQ8691Yr30+MjBNNHNSpQEz8Pe0aXTl6fW988W7A+YE7gUPS9nASjraDwlsdnn9x2BlC/lTwC6HSgdQQTeQqDb9zYHTu8Rw1leEBiezMfoeXcUnTt8YWqAG170cPNmtjRg3rdE+O7F2QHFatcLS3C5I6uPHP5XelYGGu2vXNfxy+/bUpc3NlRb4OfU8GLIiP93qRxgLjKoQ== 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 SV0P279CA0047.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::16) by DB7PR10MB2252.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:4a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.30; Fri, 15 Apr 2022 06:56:38 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::4f) by SV0P279CA0047.outlook.office365.com (2603:10a6:f10:13::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20 via Frontend Transport; Fri, 15 Apr 2022 06:56:37 +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.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:37 +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; Fri, 15 Apr 2022 08:56:36 +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; Fri, 15 Apr 2022 08:56:36 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 4/7] imagetypes: restructure files Date: Fri, 15 Apr 2022 08:56:14 +0200 Message-ID: <20220415065617.1910954-5-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-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--9.243800-8.000000 X-TMASE-MatchedRID: 7yIlCyfE1+bZY+nnK3IwnMGnCHwCMuTJElH6l1EPRNgItCy6ZX/lLxqD rPipLA7BoxCLfriDzziVIbfpsq9FzF0qMWNOsGgAG6Aor8mgxBIDI91I0N0Y7w97mDMXdNW3ELb qrOgWzyev/7fHaEp6ExqGc7het5hmUtTgmoNQjI1r7b8CsPPtQe+90yVxudOIEVuC0eNRYvKW31 x27U9QYi99T+uJIleR5wnn9PXAc/dMqWhw3u66AuHPYUUXef6kyu0fpXITlDQTwfDtZ0TwrOC1p 3r9o3NF33Nl3elSfsqygaZY7yrHzn0bwqPJDrnjcVA5tVNQEnRNWtycvYsXAPSG/+sPtZVkRiPT MMc/MmncbHvEdOZOM0GzU7CKX1sdZfimYRvSI6PRV8kT55Za7WFqPXSLpNdALfggThkKF7ZuJXM xOF5JsHVwUnE5fcdlo8WMkQWv6iXBcIE78YqRWo6HM5rqDwqtQxitkXat1SEQYPYSM52gtrcxCb xUPwvG2cUapTXbgRa1yHnm6Tw+oQ== X-TM-AS-User-Approved-Sender: No X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--9.243800-8.000000 X-TMASE-Version: SMEX-14.0.0.3080-8.6.1018-26680.007 X-TM-SNTS-SMTP: EEDCC5CC296AE0E494E1E9CBB2E654F123537E8039C5B12D00DDAB411E0E54592000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4359dae3-ff4e-4253-ccd7-08da1ead1641 X-MS-TrafficTypeDiagnostic: DB7PR10MB2252: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: X82Rma05qadHWMDwBq+7yDKHFj8WUI+FUQ8Fv+0zVXTvC5strxyVd3ibfv7VXhUHMVnMxzD4Z1X9Ly7J5I6XYBRS2G+JxRwjxbaekqQ9VQw0qc5Y0G2fZGav/FmJ71PgK1dH7FkaucNjF+p1vKPqcUqlCQ9DBaHzjmhwqPHm6HHjHQcFFojrOLvW7/AjSQzcHJSQf3HYwLzbDnfwZ2yKQH2rzcn5WGuvCLUzc0TLOeaXT9HBOiJ4DuSjNK8heAn6vNP1LhcxvDknZJaH6ncKvGaf+nZx1ySmjDg1M6Gv6C9pYATU13gAcf0ycoBeapltQm5gusk68YebJqWA0Oiv7Rr9DFxGreHUy4S1KiW70ZzwbbrA3Q30KQz6XRNWfm5J+o6xiqSEH4xrWb4OGo0YSBvgoMo+sxrsZrSiMire1IMAmIglINLFfDZt9jRLs4IS10V83u5cRoOmpJLsnvUNxSh/MOX1kzH2Dg0U1vBwbMHit8qBziW1glJtTK8jqFlBIEdI8dR3EN+YWApRSzCDAMthBzStPM00PWIxbiuVY0wMMLDr04MHCSX0+0PPafARtgP1Ba55AqiawKhP+yonS6cpPs148FeIa8bVG3r+49YppIgfVriU/twXshC3eQRCygZbqsfpf+/sJlhuWx+E2/3wyWnFS9YTXXZvb4lCDxjxuaL41luCYD0Am3Sa9z6yPG8qx0ddXOsjAUSl3WjS4ttxKIh1qlqq74dVxuY8kL8pA+YWF7o9cTxPQ2zntXzlX79jt38pXy7xOvxa8xkPi0G+5AB4lrILpGgN0W+PtIso+AGKiyLXjTGv3+Y6b5+8LnRkSuO74tmJiXgmhKRwwQ== 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)(40470700004)(36840700001)(46966006)(26005)(16526019)(36860700001)(7596003)(82310400005)(966005)(498600001)(6916009)(40460700003)(83380400001)(36756003)(70206006)(70586007)(107886003)(47076005)(86362001)(82960400001)(5660300002)(7636003)(4326008)(8676002)(44832011)(30864003)(1076003)(336012)(6666004)(2616005)(956004)(186003)(2906002)(8936002)(356005)(403724002); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:37.7114 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4359dae3-ff4e-4253-ccd7-08da1ead1641 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: DB7PR10MB2252 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=uNI6t7aR; 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:fe0e::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 Instead of per-type classes *-img.bbclass, we move to - imagetypes.bbclass for the "simple" types and the conversions - dedicated files for the more complex types: - imagetypes_wic.bbclass - imagetypes_vm.bbclass - imagetypes_contaier.bbclass Signed-off-by: Adriaan Schmidt --- meta/classes/cpiogz-img.bbclass | 14 --- meta/classes/ext4-img.bbclass | 15 ---- meta/classes/fit-img.bbclass | 22 ----- meta/classes/image.bbclass | 50 +++++------ meta/classes/imagetypes.bbclass | 89 +++++++++++++++++++ ...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, 110 insertions(+), 127 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 fa24a5e8..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,18 +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_OPTIONS ?= "" -CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'cat ${IMAGE_FILE_CHROOT} | xz ${XZ_OPTIONS} > ${IMAGE_FILE_CHROOT}.xz'" -CONVERSION_DEPS_xz = "xz-utils" - # hook up IMAGE_CMD_* python() { image_types = (d.getVar('IMAGE_FSTYPES') or '').split() @@ -272,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. @@ -303,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..5f9b5df3 --- /dev/null +++ b/meta/classes/imagetypes.bbclass @@ -0,0 +1,89 @@ +# 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_OPTIONS ?= "" +CONVERSION_CMD_xz = "${SUDO_CHROOT} sh -c 'cat ${IMAGE_FILE_CHROOT} | xz ${XZ_OPTIONS} > ${IMAGE_FILE_CHROOT}.xz'" +CONVERSION_DEPS_xz = "xz-utils" diff --git a/meta/classes/container-img.bbclass b/meta/classes/imagetypes_container.bbclass similarity index 100% rename from meta/classes/container-img.bbclass rename to meta/classes/imagetypes_container.bbclass diff --git a/meta/classes/vm-img.bbclass b/meta/classes/imagetypes_vm.bbclass similarity index 100% rename from meta/classes/vm-img.bbclass rename to meta/classes/imagetypes_vm.bbclass diff --git a/meta/classes/wic-img.bbclass b/meta/classes/imagetypes_wic.bbclass similarity index 100% rename from meta/classes/wic-img.bbclass rename to meta/classes/imagetypes_wic.bbclass diff --git a/meta/classes/targz-img.bbclass b/meta/classes/targz-img.bbclass deleted file mode 100644 index 74d34e29..00000000 --- a/meta/classes/targz-img.bbclass +++ /dev/null @@ -1,8 +0,0 @@ -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 -# -# SPDX-License-Identifier: MIT - -IMAGE_CMD_tar() { - sudo tar -cvzf ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.tar.gz --one-file-system -C ${IMAGE_ROOTFS} . -} diff --git a/meta/classes/ubi-img.bbclass b/meta/classes/ubi-img.bbclass deleted file mode 100644 index 92acb6f8..00000000 --- a/meta/classes/ubi-img.bbclass +++ /dev/null @@ -1,20 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) Siemens AG, 2019 -# -# SPDX-License-Identifier: MIT - -UBINIZE_CFG ??= "ubinize.cfg" - -IMAGER_INSTALL_ubi += "mtd-utils" - -# Generate ubi filesystem image -IMAGE_CMD_ubi() { - if [ ! -e "${WORKDIR}/${UBINIZE_CFG}" ]; then - die "UBINIZE_CFG does not contain ubinize config file." - fi - - ${SUDO_CHROOT} /usr/sbin/ubinize ${UBINIZE_ARGS} \ - -o '${IMAGE_FILE_CHROOT}' '${PP_WORK}/${UBINIZE_CFG}' -} -IMAGE_CMD_ubi[depends] = "${PN}:do_transform_template" -IMAGE_CMD_REQUIRED_ARGS_ubi = "UBINIZE_ARGS" diff --git a/meta/classes/ubifs-img.bbclass b/meta/classes/ubifs-img.bbclass deleted file mode 100644 index 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 Thu Apr 14 22:56: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: 1695 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 15 Apr 2022 08:56:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f63.google.com (mail-wm1-f63.google.com [209.85.128.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23F6ulYC010379 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Apr 2022 08:56:47 +0200 Received: by mail-wm1-f63.google.com with SMTP id n21-20020a05600c4f9500b0038e3b0aa367sf3541836wmq.1 for ; Thu, 14 Apr 2022 23:56:47 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650005802; cv=pass; d=google.com; s=arc-20160816; b=vd3Cn6T3VvnB48O5k0hzEpjnQEXRJPl4Z+2wZRQ4qKkOTIfIOeYYSG7mC+dBloTfqU b31Ay+ZaX+P9/Z0NokyuD6hKqHsm/T9bw+Y0iqu7skn+t8/zSkp5drhHUYcYBYl2mcGp 35ZGy8IuFF8eNc5PY3rWQ65gazilQP/e2K9Pz0sybDCARVl+TzbVKm9qzp7jMsvlqX39 LMp3EVyc+pz3B49EZ+LY1jcARneJNe7BO5jrayLZkHMk+PAjeMsfQs2Z2486nWipuOkx WReVPMFAe815M0rtqI2ixvkuzAIBnyegaKc0ZTz6vD+Hh97y1IPypLk2cZ0nGqr07T8o er4g== 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=KWGMaiq6zWHxUrdMUwUZzJaBkKy/DCmFkIgZqjbVKOM=; b=lyCJp3lkKHZtCwE5Qksc05ngaQqHaC/e3bhL41izjtTk72vx9Wtx41mA9y/JTpWuST J1tnOrNKHhmCt06a/Blrrq8otk3yymLecB3XB0PFYoE2APMbQaTLJ64QYYd1tq2f5bCL 1NLGOclmW6Uk26mGpggT0Q0Fqcc84QyqaVjDYk1LRM+ndVKjY8l+07Dkg2sF2sNhVu6t JlO8Fvp71BxX0vDi2K/rFJRsZYIFKjTAaR5sp+j2BhKm//cE7jdpRzOHfNIKUXxr0wh/ mWltT4y2i6S80N0dJAzisFX4lrJxfUpF331DxkA65pmf3nctXj2S9Wj7Q5S+BgR4Epj2 3fyg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=iFWSV+Ly; 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:fe0e::62e 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=KWGMaiq6zWHxUrdMUwUZzJaBkKy/DCmFkIgZqjbVKOM=; b=Ha9KzraUkxyhDviKtHwjLg7gCxID44X6/q9OkESdUCrxLlTgfZKN5/+KUxaXWaCN+N FnmfGuOg58grJySyc/WYbTru0a1omHzR1HIZg0g7gFEXJfUD0/7HOBEeHzgv0NL/vvPV 88c5Q8iYjFLEVjjumP/bc3zhIiDW5WXOQY3pVfFVJPM6swKsT9ImOj2uPecI8mYKAYum 8JPDdIZ5BQO3zrQBm9jAEXg3a4XOmobvIrzSYHeIAQ4SE+rJg5GyZ09io2oUaJRUbV6l rxBg0iz8fWUMEqhsT0YN8KP/Vsm/aHgqyv6k34Hi/m71CfxRF/VmPx4GzbWVMNNjZ0yP j3ZA== 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=KWGMaiq6zWHxUrdMUwUZzJaBkKy/DCmFkIgZqjbVKOM=; b=UE7ImoOysh50fylAQVd4rE+3t9Sx3X/TjiieqqrSTbyfVugITuF5AlZNOJ+GcUM89a bXdKZX/XFU6fThaCEdXzmyV6ANAFm+sa4Xt50bVb7HAphKthVtDE7N49nncnbSHtbNyS Do4NZwJm7KRJRa8ZEY3qk6vxtcKRmEllImcDDf9X7CgVFnx2OP7EzplDWqVAZF9R9e1p 1IzZ3MWs36o0SsPLjTXMpwsmP2GPtcArKxDFuqdXDArXOKy9kdPnULBW540m/RAFmcoI 7mLvMAVqmUtmkZMcimLodq+mXQpxbRIDUIHQRTesvWS1ZdJXqPwdGDWatgJOn5lPGpCZ R+JQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532J1tPciNLacooQirYzeKkihTlJj3mHipuZNSRGoNk/k61P0YAS LuAvmZcQ8Nv5mUlZD0hngD0= X-Google-Smtp-Source: ABdhPJwoFmMmX6pAXXGiiygWYkx2l4oErQ9X53jxjXgINaY3GntrgGaYJU0Xv6SiCcgkdLFD4ZxXwg== X-Received: by 2002:a05:600c:3593:b0:38e:a8a2:abe3 with SMTP id p19-20020a05600c359300b0038ea8a2abe3mr1995719wmq.149.1650005802084; Thu, 14 Apr 2022 23:56:42 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:f950:0:b0:205:dbf5:72d8 with SMTP id q16-20020adff950000000b00205dbf572d8ls395687wrr.0.gmail; Thu, 14 Apr 2022 23:56:41 -0700 (PDT) X-Received: by 2002:a05:6000:188d:b0:207:bacb:3773 with SMTP id a13-20020a056000188d00b00207bacb3773mr4509033wri.132.1650005801292; Thu, 14 Apr 2022 23:56:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005801; cv=pass; d=google.com; s=arc-20160816; b=qXvghO1lB258aWDUbBsUOHz6rBPPnNzmETADYyX2v0yu6e73QgGwv/ekfVa0p7HHwZ +lvAKclyMq99koSc/A+YFWL4cZ9P9ziRCg9RmKeOpmtuyFLpwL5mXoSxF6/s+yev4d3s OMcFNQ4BnXljo74H/HKaara+XkUWq7JNJSeAWq4JIoz6OiFqHt7/vY+ItQ/l7rJpjdiT re0RtKP8t1NRTesRQZagBQhPx7jTH2QhzrU/eDu5GQ/skP7IDs0FemnQ8GeyFKd0+y4h 5oorIkOymJbyFoz0pjCmGHZ90YQr45nGm9aVTQbNJ/kMkwYzg3F7XlaOnqdJZW3E33// lM+Q== 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=hXN74O0t88Pch+wCXwGalvi99eE8pytHhYKp6chD8rFQJREj/Ajfxodg15EH/g8Y+8 sxQeHZNaMjX6BcLDhsCkOgVEtSSylpjsOUnmya8LW6+PhzCykKm2oUhnJaXmW8E0aQGN OfYoLvZHg4RzMWn28mFVJaes20JRhVOHgs3u3vQ+q8vSEVqio2bVorT6YyNU+yQsnZ1x +GeyLE5qPjmHpxH5iAGxY3fCqX1/037CWHomtwhCJidQlhbT2SCi7KICvd7GrMG6pnkC XpdHCe2vdeb0mVBwTSrBBJW+kAeUUsa70YgJjtweuixEw+2wtvQFuCDh5zswuf9DWYHL yxtw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=iFWSV+Ly; 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:fe0e::62e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062e.outbound.protection.outlook.com. [2a01:111:f400:fe0e::62e]) by gmr-mx.google.com with ESMTPS id o35-20020a05600c512300b0038cac42709csi225192wms.1.2022.04.14.23.56.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:41 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0e::62e as permitted sender) client-ip=2a01:111:f400:fe0e::62e; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DhOpSd1N1QmteCjOIa6sDsw/TJLMuowHZu9fV9lTlEeW1MHzp01UyoKU5w8Y5dXz7vjYX31roQGOqDGyySgxeiyC8dagwcpv3qB3kYNb6sYmfiKLWQgvqaATGCGSMhDJ9pRjugy84eFYoRBSc6lT9LHEcGGLe+nAmo1JUy+iQwMvicrLcS3LAVG1Q+TZA83b6VaMou4lJcfF8S6P/gGsN1SuEBRVJ3+73LHr5l6o6LteUlFFOWV9D8IdV0PCc1JHkHSB2Rrdu6IkO2M6YS8Ulx7Vhpt2B/3vPg/WGx7ehXUPVurgc8y/nuPS8sk3tGXMsD2owulGof2x6Hqxgq+elg== 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=JO5XgVTxNO8BNUSM9EQzrj8m5rpuXhdMka4D/fFA0PZ7fhd49pRgyh546Fd4q+RUE1i/ccf+EQDS8uyv+GM4W4psCfHSwi3qUitdQdGYmeLi6Mo1zF2NqQHcpdTom1pS5WbG1he+qnb3u+s4SIF9gHay0eg0aeonhGLUxjsx42WIExPfpS5okUWsbvpmYIpybnubx3zXVNph8Z01djfVzD+abGDGtzwmWIyavlzX/osSkaMVpLVnEu+DP0zPuTk4xn0RMtf4054LiHkixlBwQ1z7OlzVCQqbwvUnEsjjFBznC4YEbhUcw+rwJrdxcEzzu6diJZfVwR3Z6XVz+yYDLA== 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 SV0P279CA0048.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::17) by HE1PR10MB1610.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:7:62::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 15 Apr 2022 06:56:39 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::46) by SV0P279CA0048.outlook.office365.com (2603:10a6:f10:13::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:39 +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.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:39 +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; Fri, 15 Apr 2022 08:56:36 +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; Fri, 15 Apr 2022 08:56:36 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 5/7] imagetypes: switch meta-isar to the new scheme Date: Fri, 15 Apr 2022 08:56:15 +0200 Message-ID: <20220415065617.1910954-6-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-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: 2B01DC81D5DC1297A320D0C41FBA86BD43918B55B86423117ACA40D485375F182000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aa2bbc38-ab7b-44a7-ef5f-08da1ead170a X-MS-TrafficTypeDiagnostic: HE1PR10MB1610: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: eeL8G0Mo76h6lKnTAKrpodfrWXADNaOfgpCHDiAtogLIYP+LL41rhz8LCQVc8nGlPlESVSGO/xbVks0XH3kVAqHKesEF04qzDzEpXvN1U62CFYMNYS68r2fl6dLWlWKULVKnGH/FluKtVbHKkRTsDaSUfB8bXW5C4qEjbZf8uHvXQhtk4Q9bT/2GppKG8HxIrQxiaGq3xNv/OYy/5rpV1Wp5zVtApESzavM5JZYOi6LaosnGwwNlzkWWBZtiZN8qwrI5j/Oc3jWqZjC5MoMI4v8HB8L6AK4lduAYazf5bN4dmxqx63Tn9GJnuE7HsJPnQ72MVCHj1isax7a9h80mRi7v8d84ti9izN/3opxdCrazdWzv4HGyhaBwDf3IiTp6YNrNsKwkDf6MTYYJcjQvvLsgBoNQa+nh8djgd/VzFqI9zbj/gXEGp1uhMllwMde59OGwzc+kHBgw+1FGzjSG+RiT61JNXpwnk6i7/nnjhFmjgIq8JpUTNa7raCq7elHx9sjEayCyiNjMecI5jMq3Hg3Vs7KL+Zui7xbJPpvo/REbN5d3zzXYSeNZLXvA1lNUsY/nQVWHMX5Q33kMscY2jOf3rojpOxG38mJzzUQ69PCDSz7fQGi7lLk71jMnbPUwabQUIzUwbH562xPGDlxbTxUn0GpGsBxf8JCFascr0yunlzMFuPKC4y3TDsl40LlmWLuyMyni1LqP6SrgzVHzIw== 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)(36840700001)(40470700004)(336012)(16526019)(956004)(2616005)(6666004)(107886003)(26005)(1076003)(186003)(82310400005)(36756003)(36860700001)(6916009)(498600001)(47076005)(2906002)(7636003)(7596003)(86362001)(44832011)(30864003)(82960400001)(4326008)(8676002)(70206006)(70586007)(5660300002)(40460700003)(83380400001)(8936002)(356005)(403724002); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:39.0281 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa2bbc38-ab7b-44a7-ef5f-08da1ead170a 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: HE1PR10MB1610 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=iFWSV+Ly; 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:fe0e::62e as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: INBOX - new image type names, basically replacing wic-img with wic, etc. - adapt custom image type rpi-sdimg to the new scheme Signed-off-by: Adriaan Schmidt --- meta-isar/classes/rpi-sdimg.bbclass | 2 +- meta-isar/classes/ubi-ubifs-img.bbclass | 11 ++++++++--- meta-isar/conf/machine/bananapi.conf | 2 +- meta-isar/conf/machine/container-amd64.conf | 2 +- meta-isar/conf/machine/de0-nano-soc.conf | 2 +- meta-isar/conf/machine/hikey.conf | 2 +- meta-isar/conf/machine/imx6-sabrelite.conf | 3 ++- meta-isar/conf/machine/nanopi-neo.conf | 2 +- meta-isar/conf/machine/phyboard-mira.conf | 3 ++- meta-isar/conf/machine/qemuamd64.conf | 2 +- meta-isar/conf/machine/qemuarm.conf | 2 +- meta-isar/conf/machine/qemuarm64.conf | 2 +- meta-isar/conf/machine/qemui386.conf | 2 +- meta-isar/conf/machine/qemumipsel.conf | 2 +- meta-isar/conf/machine/qemuriscv64.conf | 2 +- meta-isar/conf/machine/rpi-common.conf | 2 +- meta-isar/conf/machine/rpi.conf | 2 +- meta-isar/conf/machine/sifive-fu540.conf | 2 +- meta-isar/conf/machine/stm32mp15x.conf | 2 +- meta-isar/conf/machine/virtualbox.conf | 2 +- meta-isar/conf/machine/vmware.conf | 2 +- .../conf/multiconfig/qemuamd64-buster-cpiogz.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 2 +- meta-isar/conf/multiconfig/qemuamd64-buster.conf | 2 +- meta-isar/recipes-core/images/isar-image-ubi.bb | 4 ++-- testsuite/cibase.py | 4 ++-- 26 files changed, 37 insertions(+), 30 deletions(-) diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass index 010c573c..508c4bc4 100644 --- a/meta-isar/classes/rpi-sdimg.bbclass +++ b/meta-isar/classes/rpi-sdimg.bbclass @@ -3,7 +3,7 @@ # # Based on SD class from meta-raspberrypi -inherit wic-img +IMAGE_TYPEDEP_rpi_sdimg = "wic" WKS_FILE ?= "rpi-sdimg" diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass index 095719aa..7a917b47 100644 --- a/meta-isar/classes/ubi-ubifs-img.bbclass +++ b/meta-isar/classes/ubi-ubifs-img.bbclass @@ -5,6 +5,11 @@ # # SPDX-License-Identifier: MIT -inherit ubi-img ubifs-img fit-img -addtask do_ubi_image after do_ubifs_image -addtask do_ubi_image after do_fit_image +IMAGE_TYPEDEP_ubi_ubifs = "ubi" +IMAGE_TYPEDEP_ubi += "ubifs fit" + +IMAGE_CMD_ubi_ubifs() { + # we need to produce output (with extension .ubi-ubifs), + # so just create a symlink + ln -sf ${IMAGE_FULLNAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ubi-ubifs +} diff --git a/meta-isar/conf/machine/bananapi.conf b/meta-isar/conf/machine/bananapi.conf index dd3a0667..36cda28a 100644 --- a/meta-isar/conf/machine/bananapi.conf +++ b/meta-isar/conf/machine/bananapi.conf @@ -9,6 +9,6 @@ KERNEL_NAME ?= "armmp" IMAGE_INSTALL += "u-boot-script" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "bananapi" IMAGER_INSTALL += "u-boot-sunxi" diff --git a/meta-isar/conf/machine/container-amd64.conf b/meta-isar/conf/machine/container-amd64.conf index 1f7669ad..e24729ff 100644 --- a/meta-isar/conf/machine/container-amd64.conf +++ b/meta-isar/conf/machine/container-amd64.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: MIT DISTRO_ARCH ?= "amd64" -IMAGE_FSTYPES ?= "container-img" +IMAGE_FSTYPES ?= "docker-archive.gz" diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf index f822e24b..55343e9f 100644 --- a/meta-isar/conf/machine/de0-nano-soc.conf +++ b/meta-isar/conf/machine/de0-nano-soc.conf @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-de0-nano-soc = "u-boot-de0-nano-soc" U_BOOT_CONFIG_de0-nano-soc = "socfpga_de0_nano_soc_defconfig" U_BOOT_BIN_de0-nano-soc = "u-boot-with-spl.sfp" -IMAGE_FSTYPES ?= "wic-img" +IMAGE_FSTYPES ?= "wic" WKS_FILE ?= "de0-nano-soc.wks.in" IMAGER_INSTALL += "u-boot-de0-nano-soc" IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc" diff --git a/meta-isar/conf/machine/hikey.conf b/meta-isar/conf/machine/hikey.conf index 615d6749..7f9cccb2 100644 --- a/meta-isar/conf/machine/hikey.conf +++ b/meta-isar/conf/machine/hikey.conf @@ -7,7 +7,7 @@ DISTRO_ARCH = "arm64" KERNEL_NAME ?= "mainline" -IMAGE_FSTYPES = "wic-img" +IMAGE_FSTYPES = "wic" WKS_FILE ?= "hikey" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/machine/imx6-sabrelite.conf b/meta-isar/conf/machine/imx6-sabrelite.conf index 5be337f9..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 Thu Apr 14 22:56:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1693 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 15 Apr 2022 08:56:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f60.google.com (mail-ed1-f60.google.com [209.85.208.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23F6ulAk010375 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Apr 2022 08:56:47 +0200 Received: by mail-ed1-f60.google.com with SMTP id cn27-20020a0564020cbb00b0041b5b91adb5sf4382746edb.15 for ; Thu, 14 Apr 2022 23:56:47 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650005801; cv=pass; d=google.com; s=arc-20160816; b=VGKzrtpWrMBJN0pwVNA6KugpES7B7e/aBSl68LXK70zff77N/WwsbPKsGQYrlzOS3s XTZqrO727OSMPTMYZUN5tqg6VUtKg6+jyJlXN9UboaOBsWRxGgBnH+grkv7cWdUvuGyy IbQufnQBXRLSeHJaoX34de3PJgZQxYNGlbELedCjA9wKfTJG4z0lJ816Rp/HC/4ALABG zo++LjJ3QA5VFvBpb+VvDKS7Pfw6Q1TRkbtBkJhBTLzP8TAV7gIl7hsvWjEfE299tosr YHLcQS9UNzuB8VWCl/5l+zZphdE7jgBKIUfpKhvVBHpks+xded/Uib6jBIQ2WvL9RSrc v2bA== 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=gdDJ+i4oYueReqz1tFJhaxn3XGMjZZWL+SM7UCcQ9Lg=; b=Phg4a/qklbc6b0eFC5i/lPacYl+vqKJdtQiwIZ3ZgnRWhub6gyEf/46N4+jFiZIzP9 QSIqD0H/y6fDoIbJtGprnU/SPgo5w3C1uJRBTGhob3AR+EeQU+eiKLtMk64tQlOXtWqC aTB+JXs4vptktTt/3OD2aB0t++5kE9n3icWlCrXsFn19WddOJRnB1IrBKMcgwOZTN62w RiglZYf5pA5QbWaD9GSqcuMBvJtjq6xccATnypsEI8Bb2hDjqqgCOsWdN4azYeLXgSj+ Am6jhXQN1Z2UGNW35dvlqFNAyyY48Y0kP2M6Qn09nFRlkCZmEaxNYE1iERyVmnvALlkQ /CpA== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pbUus66M; 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:fe0e::628 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=gdDJ+i4oYueReqz1tFJhaxn3XGMjZZWL+SM7UCcQ9Lg=; b=iYbrBmsKrpNotqeegaBRta69PSGSr3jKz3Ix6wBVDU+xnL+p6d7oqzQlf69vtz0mfD 5OPYYUHouGwpnu6OybJI7SvJoJgZMoXRWiiZvuYbwVtjiJ+IWAx1UtWbg4ADrMuqI5zI 7Xg+RrawjLC85R4Ai8vfOYFj+/piFA1BKCH5Q+ABLMIzeuHggzTdFAdGu/fA6Y7ZhOaZ nyFbDT0iTyUBXPrp+0zv0foTHrQFWj2k1q8KvQMM+vniyg9sbskvThQCZHupN30F+eBv XOig0mW98Opk4q6lLww7DUaEiksnabbGEq/I5BjittdzAOlXxFipVqzfAhltSOnXPI4O j2Yw== 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=gdDJ+i4oYueReqz1tFJhaxn3XGMjZZWL+SM7UCcQ9Lg=; b=503afvx2bcPxyZywD+++S3bQiwI8d+lCJ8E79N6mOxVeOu8w4FIVgjJ/QFnE4KeAJ6 dB13Er6/xCmPR10aGc3BlSRvK1/9MQMprhexIvVOzwW8ZoyG/s4R7lga1n8mgQP3xa3m 9QM48RekEMhlLdnvP7bZNxyxhpvUqEwWrpBDnUTvQzJxxF9txYlca5it1slSBKUsJ2v7 tsOm2TNIUjJmgY1uZddqKRSyHKMTf7SWVLqTe8im1FC7LpVDyWiOlhXD5bjAaJrqmnVv ya2WIl/PCjzke2dUqyWBIaVI7pVUw8s2F7faGjlsW5MWroi0X25v0yJkaZD6kQ7aTi4S SCXA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532aUKuNo1xbbNnjpJCv4xGh0lWkzXaPHdp0E/avYD2cqBVmSl9g 5HCe1M1QLcZV7aQrdZRLIkA= X-Google-Smtp-Source: ABdhPJyh0XZ5ClqPUUCWSNRmh8QdujSFnbNNUkOHw6TH6Iq+pCVH/7MFKYxYLFUJdyZF3OjmRJTBpQ== X-Received: by 2002:a50:baa8:0:b0:415:b0bc:6353 with SMTP id x37-20020a50baa8000000b00415b0bc6353mr6990186ede.220.1650005801825; Thu, 14 Apr 2022 23:56:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:968d:b0:6e8:61b4:abcb with SMTP id hd13-20020a170907968d00b006e861b4abcbls278191ejc.8.gmail; Thu, 14 Apr 2022 23:56:41 -0700 (PDT) X-Received: by 2002:a17:907:7f1c:b0:6eb:c702:7f4e with SMTP id qf28-20020a1709077f1c00b006ebc7027f4emr4910840ejc.496.1650005800955; Thu, 14 Apr 2022 23:56:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005800; cv=pass; d=google.com; s=arc-20160816; b=jjTG3TKfx3jKavNw6m8e/UBBN3P3bqKgNwq+rP51ScubhNcWtERPOW36oaqmULdNs+ PDgGMnEfICyRdlq0Smm/sKcVpjRvWIGUWqk9aqbiexjCJV9BBueExfe43aZpQlQID1oj rHFffsW9rumE9NHkzHRZqoX7JHVU2scqQrAXRnUv65i+RUNnaIIvRyXZAgmYDVPOtVMl +9EnwgVPIP7gsOAq6b08T6ZOpRjWf+Hm9zlLLetM6Iuy78lc0Znvb8YqRlGpjvA22/oV YkVIPsM9L+zpm9rpRugYXKejeEKH5sX7cn3DLaolYm5ZmUOx79VRN1TgrXyXf/eAwMGX Ex/w== 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=gAz7vjLTmUQLC2UDaEU+E5q8KA+q/OZvEKtKCFFlLPE=; b=SxmNbuUit2fRXSCLB/7zXvbE6awsWB0DkXTK/bZ6ABUSvhZVD0R18xpX3RFLDrTUVw /nSv78FgPtvXht+zEKniaYNLaWn5QcZJ45NhSvLtJOa/59kuFrlib5LYq7Si+Ba7UyD5 v/c9MFNml89LDqqd57EPEi0F+J523E3GF9ozrQ72HQ78zdoINX63nG2f+AieUD1XU98l X8MKdiPDHwXOrPTQQJBHmpcQBGJMaJHjLaS1/fdZhR98iBXEZrUHWf//ispy6K6FXzou mvc4VpjamOQ3M1hVEVIFtaFH/abkodScQxPu6PeUGmAJ4DT6g/4qoZORbixOBAXe2j26 hycg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pbUus66M; 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:fe0e::628 as permitted sender) smtp.mailfrom=adriaan.schmidt@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0628.outbound.protection.outlook.com. [2a01:111:f400:fe0e::628]) by gmr-mx.google.com with ESMTPS id y16-20020a056402271000b00418f6042d64si46504edd.1.2022.04.14.23.56.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:40 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:fe0e::628 as permitted sender) client-ip=2a01:111:f400:fe0e::628; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BkRF4KDxYxZhCxo2GUcJN/irHL4b4h1TcKMu5X1r/HfGlCPzZOReoYXMW4a7kJPMFeCEtTFNHFgHNpNI6t/dgcIStZTtXMMlQ1wVGgzmOlD7jeCNEKqcD+7CdsHb5uy9jOvXuBKZefeFzDBwJzyw7/XO8g/fXvqQZVb+cbJEWGA9lRLvuma2d1QZlgHpkQAkVgq+FgSjT85zBvg+pX5AyIPjuJVofvFeQhTMUdhwxdKYr34bbPcSdU2bQDwnz/kep3MjRuucJ4bQnumXub+xSHc94rcNOnhxWdL5w8EmQfQw+6JT8azDHpzwzHaiDKFciw5zG1tuczPTt/iDQKAJoA== 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=gAz7vjLTmUQLC2UDaEU+E5q8KA+q/OZvEKtKCFFlLPE=; b=aQY5veJExM9CbdwOEdC+wTNBl8hwiWD5i+6u68YLORWR9h0jCyb1FkL0tcg0tV9tuswycFVRxJokQgT7TVvjaqbf4pIXeJ1wkoaS+MdgPVFzbDAnf8ho2DUDbO4W+SDrW23O7tdthCu3fTwVNnYeAi46U7dQ65MaoxMJQsuJiIQAtMCcRVLhSVXPPnrS7h38G7xFBtW/iTiPswdZ+rwVWl+WK8SA02NkQvKkE8fLQSc3TH13OhtPHPw+HPpK/0gMukhoHRyrEGMpHIwwMx+tPmiY930f23wKk7PJPJdBU6ujtbKP3Cy6P2nBvbHhfcvEBCB3R16VFgA8JQoKqdT24Q== 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 SV0P279CA0052.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::21) by AS8PR10MB5016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:407::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 15 Apr 2022 06:56:40 +0000 Received: from HE1EUR01FT069.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::b6) 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.5164.18 via Frontend Transport; Fri, 15 Apr 2022 06:56:39 +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.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:39 +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; Fri, 15 Apr 2022 08:56:36 +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; Fri, 15 Apr 2022 08:56:36 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 6/7] meta-isar: remove IMAGE_FSTYPES from multiconfig definitions Date: Fri, 15 Apr 2022 08:56:16 +0200 Message-ID: <20220415065617.1910954-7-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-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 dBJOsoY8RB0bsfrpPIfiAqrjYtFiQPpKhuXLMxyzM3QQRvTs/ojg+EXgaCyOUhuuZPqWf5e37cG 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: D19CDC7782DAA214836FDB10986B7404A0754FF501608416D0F044DB0F90C2592000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 706be52a-a2cc-4f8a-0474-08da1ead176e X-MS-TrafficTypeDiagnostic: AS8PR10MB5016: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: /DTEHTPSy12w8D64VZPsJAJdivB3UZm4jLbDLpqJIuBEl1uLJMTze0N6C2sfXvPTxwqXUfdoJa1myRB0vesnngt9vgxk0p2xdVm7q46HsUcT56Hq50/yi4iH1CVQTxuSItt3fXJo5FRHI00Gxti9IpnsYwA1bhbOvDUQ/FTUHZX1eAxTJLLDbX8MGFgF2L7pFf64tSJNn1Z/Okknzei2bz8+kyvPtjsHf/yMypgqITsimp5cJWdh3NihoP3tD5hFyiRYrCLBuKnDsMclJek7sdHFwIH1qHQx21Sn0tpcP9BgYDSKktCs2dyK26l0Vb+xkUBNrskZeYI1TWzyJAVWMEBmznsKiY9f3epVMcSVXSDY/x7EpXRVCpbdQJSvMhxvlDUJid1fyaLJqbTtX5KAgHyUPJAYePpp/olblPboifKUAbqObTftMeFYJ7JrFhBrCZGbPgeejRNm1nGUVZ2vlikoh+nsugDDJ79xtK9qddY+Lx/mvW7op/hvVsjU77RZ7sk1NhtGu698butzVqV2B5zok1bT54TLb6Lu0pIV2Q7L+sqgZQvHK1ctEGVcyj69dDYDKv4ksFKjkOpfDyVZcuBWl065+mLZs+0Yjrg6SU39DRc2tXT9cSf02Zj3BdIbrQGy4sMnaMLr2iy725o5deDdMIAUqHfjyKUg4pj+EogMVRZ6dSWylC/5XuBhpqxk 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)(82960400001)(86362001)(6916009)(6666004)(356005)(70586007)(70206006)(8676002)(7636003)(4326008)(82310400005)(36756003)(36860700001)(7596003)(2616005)(336012)(47076005)(83380400001)(26005)(186003)(498600001)(956004)(1076003)(2906002)(16526019)(107886003)(8936002)(40460700003)(44832011)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:39.6759 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 706be52a-a2cc-4f8a-0474-08da1ead176e 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: AS8PR10MB5016 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=pbUus66M; 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:fe0e::628 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 Now that we have support for building multiple image types using IMAGE_FSTYPES, doing it via multiconfig is the wrong approach. This removes the configs that are still using that pattern (buster-cpiogz and buster-targz), and instead adds the building of cpio and tar images to the qemuamd64-bullseye config. Signed-off-by: Adriaan Schmidt --- meta-isar/conf/local.conf.sample | 4 ---- .../conf/multiconfig/qemuamd64-bullseye-cpiogz.conf | 7 ------- meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf | 7 ------- meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 2 ++ meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf | 9 --------- meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf | 9 --------- testsuite/citest.py | 2 -- 7 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf delete mode 100644 meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 71ee8579..58f3e1a2 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -52,11 +52,7 @@ BBMULTICONFIG = " \ qemui386-bookworm \ qemuamd64-stretch \ qemuamd64-buster \ - qemuamd64-buster-tgz \ - qemuamd64-buster-cpiogz \ qemuamd64-bullseye \ - qemuamd64-bullseye-tgz \ - qemuamd64-bullseye-cpiogz \ qemuamd64-bookworm \ container-amd64-stretch \ container-amd64-buster \ diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf deleted file mode 100644 index ff491b2c..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye-cpiogz.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES = "cpiogz-img" diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf deleted file mode 100644 index 8eea112e..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye-tgz.conf +++ /dev/null @@ -1,7 +0,0 @@ -# This software is a part of ISAR. -# Copyright (C) 2022 ilbers GmbH - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES ?= "targz-img" diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf index 1badc889..5c8cfd33 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf @@ -2,3 +2,5 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-bullseye" + +IMAGE_FSTYPES += "cpio.gz tar.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf deleted file mode 100644 index 675d934a..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf +++ /dev/null @@ -1,9 +0,0 @@ -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2020 -# -# SPDX-License-Identifier: MIT - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES = "cpio.gz" diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf deleted file mode 100644 index b48b0a6c..00000000 --- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf +++ /dev/null @@ -1,9 +0,0 @@ -# This software is a part of ISAR. -# Copyright (c) Siemens AG, 2018 -# -# SPDX-License-Identifier: MIT - -MACHINE ?= "qemuamd64" -DISTRO ?= "debian-buster" - -IMAGE_FSTYPES ?= "tar.gz" diff --git a/testsuite/citest.py b/testsuite/citest.py index 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 Thu Apr 14 22:56:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Schmidt, Adriaan" X-Patchwork-Id: 1691 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Fri, 15 Apr 2022 08:56:46 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f60.google.com (mail-wm1-f60.google.com [209.85.128.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 23F6ujKS010367 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Apr 2022 08:56:46 +0200 Received: by mail-wm1-f60.google.com with SMTP id c125-20020a1c3583000000b0038e3f6e871asf3526256wma.8 for ; Thu, 14 Apr 2022 23:56:45 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1650005800; cv=pass; d=google.com; s=arc-20160816; b=DwZLrMKjoPcTEa4GvRV6eOAdE6BeixbX/SXsI618IQFW8SaaAeUqSh5szxkZDbHIDZ GRhg371OKjb06hkHC/TxI68D/vrR2NJRHYvKHIuOnnr0Zlrig7HcHuF1DlKumSavVzyE 1a/kdQqVRh6a4MId1h2JHcFQVCZHbNT5SUwrA/czcK50rZht2t3rBMWqvCiyY6XEKHeC D+AufOmtjCXLl+SGOi91pOpWGtJXTaJK13c41lXwcSBT6MVuuznac0Bxx4Zpn5qMIz/i B9ITzfYAWni1iAvSD6motlcg7Rj7U2M6ItlLRlky3oE1crHKpDmUPCfIAOviSq3JPQ4T DNXA== 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=fSZg1bylQDPawSEVSzhZ0OvUjAeDZhrJjeC+FfO8SFk=; b=acM1hCORA3ffLZdG36yskuT+ethR8QcSdAFAUXqryuhCppduC5oZ1apWs+1QSbEIQW AJn70fXhycI7r2SgCY4w6eoAGTyxFvOuF0P+DnzDeZJc8fvOnqRsL/38f9edOX/sj9L3 wKKlmofqitO/wDo7fog0M4FwZLYFP+SMF4mElOnwnrdcqusa2HJ933kphYyNnk6nxLV/ ZcKX2pUFtzRQQKYb8AHzQ6ng8miyA0T4tkrecIUSmLOJWro/ige0Dlt3rPu9c9/FU5De UkopEbGNlY1aXYMeWDtD5w0SC0JQuMcCkwrqDwibjUHlzohzk9nvlSXwkOJdSaA8oHsF 2Gfg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Y63WZxLr; 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::611 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=fSZg1bylQDPawSEVSzhZ0OvUjAeDZhrJjeC+FfO8SFk=; b=Q+9c/r5U3hMCbW+31TPaf6FPg2FPTwLbRTzrZCoBNfyw2PYGqNnBvbse3AbAylkXHC dYO3fjYmQCCujbq7op2M7OfFcjbdaq9JzbXFF4B9dWIdbSlgdcHrmm95+xUv5b+oHTu0 FD7tpA6oAZnIm4654peWT8eMqKW71ep5ELBWePZQXLUGVfHofL+9rZz5kPcWuLeSLuvh NgItUGdLhCbpYTOFiJBzYBEETcMi2EWsCApbNXII7XtrQdmhg9/n9emi/mLm24s7Lmox 5ekHTfCOX7GGNtDAstCSW3R6mrC+r7KbsawB4DSk/zYNmTD87oyWvwqWIq/i7KgJrNlg FAcg== 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=fSZg1bylQDPawSEVSzhZ0OvUjAeDZhrJjeC+FfO8SFk=; b=6x9DPiupm0IrkT3BOKO3VrsCjrmlsJojY4cIfeasmDB+vjrA2Qbupy7P/vPqQ0vZ+a n5A5mRunY9KWd07TduLc+ElYYD6CpZhTRl4BRyKGKOnTdVaFnhCAQdcZXSDU0cwtCd4O KM6j9z/8NuVF3G0G3lici7QKxS8qj5ntWQxRJU5h2YZA5XAhfSfOwqcoYWA5PIuMgWHv SbA24CF+dt3d1FABv1FH3978lgdKOWgHsB5XVXFIBh5NgdBSx8863DV9KqdlPC9+6sky Y5xDHtT1jbqDN9633CV2BMDjCX6+AyDc0xatnwwza2WuZUQCiPlaYUYeV2vyuaCe8LRz ACeA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532qJ7BgonQOCckgnhj3/NTfYrCXi+J4MDrRHpIP9QTSyiLKS7EE J3pbZS7h5v8gzu+WsDQT54A= X-Google-Smtp-Source: ABdhPJylkWyIPQe+gX2/x8mIRt6BweTpnwguL2eoErHn9ULQrlT4tGpe4l34ml9Z5aNn8BbwnwO21Q== X-Received: by 2002:a1c:4d04:0:b0:38e:bb87:89ca with SMTP id o4-20020a1c4d04000000b0038ebb8789camr1975346wmh.129.1650005800602; Thu, 14 Apr 2022 23:56:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4ccf:0:b0:207:a2b0:7a9 with SMTP id c15-20020a5d4ccf000000b00207a2b007a9ls397136wrt.2.gmail; Thu, 14 Apr 2022 23:56:39 -0700 (PDT) X-Received: by 2002:a05:6000:1c3:b0:207:9dba:1e67 with SMTP id t3-20020a05600001c300b002079dba1e67mr4624027wrx.53.1650005799668; Thu, 14 Apr 2022 23:56:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1650005799; cv=pass; d=google.com; s=arc-20160816; b=SOHeMNGC7NIHhBLnSmdlIOeJ9Cplp39zrloFeCNhAZlxgbn1IpkUW4dvQ2FGFHuQL4 dx6+XnkloThJ+KlmyvlnaTkJIah1xiqUD41zOZxSCWS8GfQoo2Qy4H4Jk4akjv+5eOyl mLSrDtycx/3X2YllvDeQ1Zw9Efk9oM9KR/xVWrQINHgdmvXRqYAehvcLCPJum8pizfpi mki68YP9INcEc/c7Gp48yUa5qeXVQ1j/cx/7k9XbGX+Umyi4/VqAvi0NPWsldkEBj+lj 6xwhFxBJW7XLLwxQ9qr/ZalPNqyBTu5grEYxZqmYRnaU+b6W1TUDkQX2ttVfZ5azknM/ 0u3w== 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=SFZdgnlY0XKPyZNRDthXSXJpZjjxuyz10PTCCYkzMjkPKYtwi6+d4/mhonGmTOttiW E8gLkuebm9TSC/hh6YFbwLGHogvrq/bBlWgvK+0ToRRPbREUrrk59/JL1yNDLdjhZIQc lJAj8chnKtx8WBge8Fj2/Slxy82nrfzzah9TiqP3NEYkMX02AOkqZD0esZWyFCGXTWwY BNKNeEUVHCwR4litO49V+yYKaZs5SndMf0pud/54MJXrTkPgiFiY77c99a9uQf2dq/7f eK2XA5adqVDUBmmXQgdL0cJxqpU06YTc3BRz/4kKd/6kn+FO7IYurCLCGXWTY+jH8puQ J4MQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Y63WZxLr; 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::611 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-db8eur05on20611.outbound.protection.outlook.com. [2a01:111:f400:7e1a::611]) by gmr-mx.google.com with ESMTPS id o35-20020a05600c512300b0038cac42709csi225187wms.1.2022.04.14.23.56.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Apr 2022 23:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of adriaan.schmidt@siemens.com designates 2a01:111:f400:7e1a::611 as permitted sender) client-ip=2a01:111:f400:7e1a::611; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LQR7Y9KdxgZ5fHI/R0hTSR2/LYib4F3yEi5HRw2tEAFKcv/U28EbYXPiCYGofCRJrEx9RzHnslaJXt8UCOP9DZjPLHhNv6GMzJ5WOz3mv7CHKR1ojLm3+/S5CyioMW/XYp5NWO2Dx0k9FnbswSwKy/lb5NhaEDoytlUuTWRBNfq43Lbl3ZJ39sp9zzyA5DtuLPnRl/3Tif1mDMTc3M09m8WCU7sOKaUFRd5x5UqAr/nc8uyD2ecTLgTqN0RQMdzmTENJwFk2O7hIPt1QHTIasUfIqdR06itcqmUeCiobnozM9MuFM5wCGEIInFIhKVXNMTN5gdKr8w1W22rc+AAuEA== 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=flhgQP1i2iKa4BF1bcgewzK0Ic2VT0R5Mv9icGwPYqNh21FBNsNmMj0JV6fi3ojF6kpmcXLbEidOT2Exx0N9w1TH/tmZRxWBxS4StY//J/xrIBj9a6gziXKRKTGobIwbiSUI5nrncRuBgxfY0KpVehEQSxkIIhkeyBN0T4Ie8Gy5qIT6/6KqEjclKHlac/9zitJQ3ih7Mo24ZSxXwtfiXtsFPeNL8884gF8WU5sGOiK0dEyn7MZ3XX1TC+xRV+DzDo3UmocxqIVlxuN58GGawdMKHP0laOoKGLnwKD0vkQJk9IIK/F8rBmLtrQA1lzf6da/g6chA2Xfm8bgQI2v8qA== 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 SV0P279CA0040.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::9) by HE1PR1001MB1098.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:3:6e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.20; Fri, 15 Apr 2022 06:56:38 +0000 Received: from HE1EUR01FT048.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::a2) by SV0P279CA0040.outlook.office365.com (2603:10a6:f10:13::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:37 +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 HE1EUR01FT048.mail.protection.outlook.com (10.152.1.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5164.19 via Frontend Transport; Fri, 15 Apr 2022 06:56:37 +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; Fri, 15 Apr 2022 08:56:37 +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; Fri, 15 Apr 2022 08:56:36 +0200 From: Adriaan Schmidt To: CC: Adriaan Schmidt Subject: [PATCH v3 7/7] docs: add new imagetypes to user manual Date: Fri, 15 Apr 2022 08:56:17 +0200 Message-ID: <20220415065617.1910954-8-adriaan.schmidt@siemens.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220415065617.1910954-1-adriaan.schmidt@siemens.com> References: <20220415065617.1910954-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: 5B3344FE26509010C8A11A5180C0B79BA50621F9AE30A264F4775D148B49EB432000:8 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b2cf5ff-e743-4b26-41bf-08da1ead164d X-MS-TrafficTypeDiagnostic: HE1PR1001MB1098: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: TuVoep9207heY9NraCuAPfd/VfFPrLwWGSmiRRwiXUcCUbH3oFmgHxnJYRW6wSz2mGS55c9FnL4f7VJbcMChcmdWKGXs9W26YZkA33dmaU7lGQ8HdGqN6kcjVb+q3TpOGwX+yyBk6kougv+mA04dpc6d0xBt6yCCTu3B6sZi134T/y+ouVNo8oiWH8d+3Xq9O7lV7Cq3NorHvK9eNbbkE1PWnf4TrP5Tn0Pd2gTRZH0GulQ2Cx5C+vVvyp04B2mEFosry1fpJ5saI0IQpmxvf8tmjrZyjWRJlU6vJVZR3gqXpIxSQjCx9KCFK8xcYiSa3rb5eNsdnBjrS/w96fvKdLQEZpOjYmyobhysoUQwr5cMxcYefz2zD7V+LSMN99hc4oDU4iuXCTH3VC0576d8pl0vnMCH3TnZEvTzef8vqZ52KfUK8pGFG2cfnjl4X1lIyPSjsKIKyuJuYNVlrVWfGRXPlh7qceoaC9tZy/fD2XqbHkR/qsv83nX/68cJe3bZ+nDGhUM/jKe2K88xLHbOcJorqBt6T6BBsEZrGOxOpMi80EyxbP0nU0NyHbJgLwy0qHLdmqVZ1uptocOIC62nqBjSg8Gn7g6d2b9P52G38RCI3G53Gzk8MEOjmfLJLonLMmqv+Y0Y4bnNBjyvAAgRneSCyo/BlLv7XqudLVHLIuokgB91m6kYO0jhNX4Uq5GONmG/aRrVlbRoC84udPs9KP889CfOKy83OHgnE7W/pEV9lQklQYzVxsCph5rRMnbpDjr9NitIC9+hUWeKqb+PFwr5Icj/ir2RcYYVUSpfK9voi5Ixwy3zUbtrqT+nQrWCvKQMfLAG5Vfk5B5SpyNStCCLe/V01okgz9Q/jHywAu4= 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)(47076005)(6916009)(40460700003)(966005)(36860700001)(5660300002)(8936002)(86362001)(4326008)(498600001)(82310400005)(26005)(81166007)(356005)(8676002)(82960400001)(2906002)(70586007)(44832011)(16526019)(70206006)(6666004)(186003)(1076003)(36756003)(83380400001)(956004)(2616005)(107886003)(336012)(403724002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2022 06:56:37.7902 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8b2cf5ff-e743-4b26-41bf-08da1ead164d 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: HE1EUR01FT048.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR1001MB1098 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=Y63WZxLr; 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::611 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` ---