From patchwork Wed Dec 15 07:25:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1183 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 15 Dec 2021 18:26:08 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lj1-f191.google.com (mail-lj1-f191.google.com [209.85.208.191]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1BFHQ7o0009581 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 Dec 2021 18:26:07 +0100 Received: by mail-lj1-f191.google.com with SMTP id a7-20020a05651c210700b00219132ab503sf7307943ljq.12 for ; Wed, 15 Dec 2021 09:26:07 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1639589161; cv=pass; d=google.com; s=arc-20160816; b=U9lvRPzq508BIUYfOFNf4dkmIWEpo0j1IFfEEb16oehRhS8Z8HpGLOKsxiHLaeRyzp hfNFcatmxHHG+oO0DaU5tEADeKkCAYvuAmo4HEALlrBIguxqpCW0SNyuuYOZqyzTg4J+ 3yQWrk05L+t/i4I1KWNXc9+ZpkyMquIfkBHKjUYQ/a+KhzqaGDjAnduJD8kwjgyqYxFW xrlzmJgrqAV1Cd8Hicia1RVx92jQfiU7xBaOi/BCtTiUIMTGmqYzS1VLG5nsr92/mQrY kboCzr7PejyWsc/cxMUTtr+pTOHv110aZWkxMWaA3TKta4+QtENrGcHobbL+XE5PetYX FGTw== 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=7PYFdPw9ABsksT/1Dp2KCdRzE2/EtCm54xYGuBmcmMc=; b=MoYi6IceE/4gwdJ2h0ok00caG2jDRoCfrwjrpFTEbGLMcwIex5nDJuhNaRQEl05aHz MbWLlRAUgL9ePaJ1wEGgGVM4yscH2eJYE+CFi7ZI5BrefzljHjNnIv4S8UkKVqbVigyx A0WQe+j2PDyhEqlwsD2KjmMYCzvj1TBvnKdviWkHL97ikZGBtlUzEFi6VgTUy/wVvPWR aukULn7O0V5anKo5Bhl84m6AlrCe10QnsqWxLhSHMicQBxHnPigfixt1odog1coB3X43 sjSIcvaLZptxijXr2aCAKxDN4+nVTezlmvBsDcq+g8hvwAIRSsxfj3qTma+KyV89r0cD bGsQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pLjFeGWK; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.3.42 as permitted sender) smtp.mailfrom=henning.schild@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=7PYFdPw9ABsksT/1Dp2KCdRzE2/EtCm54xYGuBmcmMc=; b=YD+9slYmAvly3pdqPYtU6HKsRP7kX4SI0p4Z22fyJZEfES0PoSLlzaPhHJLr8sbMDD 9PTnGdbRpg6OEXz1lmKP2F6+qZ9gNCn6ttMp/B+OU9P3f1YmKy/q5XCfs1kvWzC90J2R UUm+5X19Jq1xvJGzdJrceZB9wIql9GlLPaJ3myTUjbn/mZ2m25QAkzgq7iOX5YTtlKWd KL/R/mdoD+VA3119mz01miKSxYtk4qAtcpQ2SBgrULlpdjSKGWog1ovvvDq2GQmjNLxS zdOq2F4G/72yIBSl1/VXXGgbybfc4F3QiSextzS7BqdSyaF5YqubuFfh3Qo1TxUrIBvw +XYA== 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=7PYFdPw9ABsksT/1Dp2KCdRzE2/EtCm54xYGuBmcmMc=; b=ATteW7yLAaeaO1kUrSu4vxX1cRVz8yi6KcRd9SsdG3vEXiFzfTA228o8qGpK5lRHEY Hkqp6nY+7+FhZugKU5MumTkAWtlLLNWJlH8e5vOqK0mxszVTFFUXkBF/0k7GevXRdpQv fLKAun+WB3+cSabdYA/Ll07knTKxe7Yb2QN4o5IHaPl+CfPpFZp2aT3qam/2L7L9QDTP xgShojOwuqlfXk7yW8YgjXEOJQGUK1OTppiRYxHlJcor78aRfuqF7BmkaIFsY6HrFgtz 5oW04NPJU4d7R88lIU1QbTVKeH5/R+H5b4Ivq/1TqxkinGxj0nc/aNMECtxp0Vk5LJSm G0KA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532EuLuXSQDu9U4dvgEH1seqm5jMNNECjZisKiZnxQyEyRq9JPKF 7YdjSUmOCHLgjIpgs4EAkLA= X-Google-Smtp-Source: ABdhPJyRl4eyj14FKREEsLg6sPvw0rV+JKboMMCgJBCAAdu6QfAtIzBRsK9g0y36Mqm+ma/IJC7s/w== X-Received: by 2002:a05:6512:1506:: with SMTP id bq6mr11029813lfb.444.1639589161825; Wed, 15 Dec 2021 09:26:01 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d9e:: with SMTP id k30ls610225lfv.1.gmail; Wed, 15 Dec 2021 09:26:00 -0800 (PST) X-Received: by 2002:a05:6512:1289:: with SMTP id u9mr10676465lfs.273.1639589160726; Wed, 15 Dec 2021 09:26:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639589160; cv=pass; d=google.com; s=arc-20160816; b=Nc+4nqJ9nS7D0HqdtBMp1H9uz/s8erHpap/n9jBDuc3H8KJ1eO9o4wZOeR+rcz3iXO GPHfHRFaDOnfblhDEgIEt0iAk95d7YYD9SsLSR0fH9T2E6qLWD5iGB2zkad2gmeLwZp1 s25cWX7lqjHRuwmL2iO59Tge8LqFUEa9XByVlThb70v9/ouR2RY+/hYfj0p6KHYWwBRJ 6NpoxFy+xnZAD+/dHtYG7+s9k71sBVc00XLgc/av7XL9ZNdyq0bOvsSlM8kiTbjvR6It yT1NtT0YvdNqzc/9BQuiG4IQBHLpw/hwTCMRy5g8NCoX4uZjRVr7TpcqosuOwx0jSOO9 tw5Q== 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=sod0JhJlhG4bl00GWN7LMMEks7XsezhhxDgRHQYiXYo=; b=tiGWsVL5uoQe6KkiBBGPa+AIBoAizNCf01N0ge1uN8rYEpRVcgwinDco4Oj6nZJJWq Gr8p2XRAmXAFg9wnTWApbzC9928z7Sn+WZ10pyv4L0MkokY0CegVdRJKDGex+4dQoY64 wWT46UvpaH8Nc83xAlAIIt7lGEI5xaeA5lGWlXM6EbfbO7iJKbcIsBpzVL8G7uASHlM+ cr7z3Gp45F+j7HIxKVEVqL4zJV5XJcjQKEsRzJn85XxfwvDYZELptAk+BFNMWeeM2z9H vgeTdSZPzeRrZXt7xRIvQ5ZUyuYdr/+N9ek6U71ubmSKjsMmuO6EphfVsOlRxDKOiL8D bwlQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pLjFeGWK; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.3.42 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30042.outbound.protection.outlook.com. [40.107.3.42]) by gmr-mx.google.com with ESMTPS id k26si114855lfe.10.2021.12.15.09.26.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 09:26:00 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.3.42 as permitted sender) client-ip=40.107.3.42; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RbJOiTpVLHP/A2/ZGsbFWh0+9leRpdnfFscDZFycTdsKuK3G7MJo27ynz6HSkWDnvVpWxTl/HRnB5Ezjw58nCCIcLX24ldWVKT29bpa2I+kNrjZMBvjJjB7xhsY+wQ3BPgJJFz+Syux941/JZgHJoEmGaqFHdY033D9YOy7vlqyMJFz3WK30TiTKUw9h37B5U0AaZa92q1KkHQrutTESo72evB+jIpZwoaOGdIh6bFJfOVV1s/RVYfy4eKOFnb4d78S5N9ZBDwOYe8AXhnoVPbNZu5Fk/6Vv0whkLV3/hxP3m4l0bu/OIYPvMguzndvI8N0ioLFuroKR3hgX+D3q0A== 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=sod0JhJlhG4bl00GWN7LMMEks7XsezhhxDgRHQYiXYo=; b=OEyfc7u6uDbdvpkutF2G1hKvIAHf+wMdNIpVQZwmSJMiJZd31uZEZMZUxMc7GmVd8+HMXRrO6owAEZKCFQdF63Z/kxaE9aRfXds4LymOCX/10771+WP7oVG0oGp41JoCdfZ4Vas0DCOE+5Ywhgo5MQk2GZ15QjcwhOMyvklFWJudKy+7SqyfEBYlmsBWUtTAzgoGfEggzPRwG/HJlXeXBhBbm+XN0WR0H9WZMwcb8HvOIxMSSTNhnFp4qx4eIMNerzAxDED2Mf+46QskqSE9+27I9XlHquobqEhgLBjweqeJKzCzpdIa8JU9pkwQne2vnuFFUAk/v3Gogi0baWfmZg== 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 SV0P279CA0051.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:13::20) by DB9PR10MB5163.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:327::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.17; Wed, 15 Dec 2021 17:25:59 +0000 Received: from HE1EUR01FT012.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:13:cafe::b) by SV0P279CA0051.outlook.office365.com (2603:10a6:f10:13::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Wed, 15 Dec 2021 17:25:59 +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 HE1EUR01FT012.mail.protection.outlook.com (10.152.0.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 17:25:59 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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.17; Wed, 15 Dec 2021 18:25:58 +0100 Received: from localhost.localdomain (139.22.39.210) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 18:25:58 +0100 From: Henning Schild To: CC: Silvano Cirujano Cuesta , "Henning Schild" Subject: [PATCH v6 1/5] classes: make sure container extension can run multiple times Date: Wed, 15 Dec 2021 18:25:46 +0100 Message-ID: <20211215172550.27153-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215172550.27153-1-henning.schild@siemens.com> References: <20211215172550.27153-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.22.39.210] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6ad18fea-4279-4c16-66fc-08d9bfeff5c9 X-MS-TrafficTypeDiagnostic: DB9PR10MB5163:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ClCg7pmZrc4O6uDpOubh9lxhyE0f8DNPf0DoHl4aY0Nett0NnFdxSC3WYP344MduIGBR019FzAOmMeOY86SsCb0OrXRVORtJtxA9IYO1rrAH/NL+BXi6RXsmyKs7adcHXqxZkCxbV0tenq0AKKmc1Wkih1mhIGuqThKnEmaGw/lId5pqkxECjcenHWSP6nyvaYcjKItfE6/XV7yYJ4ipc0i2BSOEHE7YpIRkSXeegOlWQV7w1PoV0Aso9LBV+TXwCRWq3ow2M9VYk6g5VU7EKOzJVri3kT8jDii+ZC14eFCc30nctk5XECz9arkeNVIiM/OeZoxF9TsT6GYQnBpP4oE60lV88n+XmeDu6//o0Qw22zg/h+kFZ67cHV6UdeMGx9dqPwx6KE82tIdrbpkVrNRkHXIrRqMAAvEuEFsG5jhp+V+aW6miSUfsU79l9UN6x+X4G2XQnnBJYQchM2v0ZBhCmdY+/nz1lXUaIwun16gLjlIN+gsWMZGNt+IiIPZHSZ0SxnlYkXdB/ZTSvCeC7cFOYoth7lEneQpTcEU7/Uy8c5cC2AU1YGLa684WTn3a2qN0ScU4/W8+IZaKx5sGyP3gIXMQ2iLukK2A0u4IjdABdBK7rakI4MoMFrv3kgtMtt0Bq+7//gGMLejiCOcJKwU/RYaD95Qwzk9/Mo7hcY+UKAnmnQ8uLyDG5fDX6yotZYQWdJIxLh+KPQj5NFwgeKKSyd+bKcbkpmfF0KG8nZ7gw/eNaSX3vF3e/KtLchrVmNS48z6WACnBZeoYSztdxA== 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:(4636009)(46966006)(36840700001)(40470700001)(36756003)(1076003)(508600001)(4326008)(6666004)(7596003)(2616005)(82310400004)(44832011)(83380400001)(336012)(8676002)(36860700001)(40460700001)(86362001)(8936002)(16526019)(47076005)(2906002)(26005)(82960400001)(186003)(107886003)(356005)(70206006)(70586007)(7636003)(956004)(6916009)(5660300002)(316002)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 17:25:59.0404 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ad18fea-4279-4c16-66fc-08d9bfeff5c9 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: HE1EUR01FT012.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR10MB5163 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=pLjFeGWK; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.3.42 as permitted sender) smtp.mailfrom=henning.schild@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 If the container extension fails somewhere in the middle, it could leave things behind resulting in issues when trying to run only that one task again. So make sure to remove stuff as root and remove another possibly existing directory. Signed-off-by: Henning Schild --- meta/classes/image-container-extension.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index e26604a04f06..6537fc693265 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -18,7 +18,7 @@ containerize_rootfs() { # prepare OCI container image skeleton bbdebug 1 "prepare OCI container image skeleton" - rm -rf "${oci_img_dir}" + 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}" \ From patchwork Wed Dec 15 07:25:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1185 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 15 Dec 2021 18:26:10 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1BFHQ9iL009587 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 Dec 2021 18:26:10 +0100 Received: by mail-wm1-f57.google.com with SMTP id 138-20020a1c0090000000b00338bb803204sf12897299wma.1 for ; Wed, 15 Dec 2021 09:26:10 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1639589164; cv=pass; d=google.com; s=arc-20160816; b=eOImFkEOE/lY8z1E+TYVqDcA+KaY84aygjz1waOrwkveGr74Z2TxkEjIbge6NmXAHW pyAwMshH9RRovQrpJdA5HYm9auXUSYLI/EYE4tJNkeQaUdHFsGarYmeq24kwysIc1NOQ HnF5oGYAy7zeaiYRGFPbS+MSGruh5BD4HARgTGhtCYwRITkR5ouLcyRFCTiQpSh+dfGL 6RNd7tRJhCJREFLVu7E4T1TJMEXENgWfEpPZvYxgb1FSJkF0fDIsE0EHg9ul8TNEFCQQ bB5jXFjtHynegD3cHO11iMX/BK/E2uCWvyip1nUi6is1tKXB/+4I1HuljBu1R0zjH2+U kYtw== 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=Wt8e6cVWJJbypvQP3H4gVl8uSFQZheBpSAmPnHsnw9k=; b=dchxOQiiL92xkQ8H1HVLNFIpQBVsqoyvg5LZVmg0HgpUZvjEF0sDqD1HdobGcI6iCh Gp++3YuDYsbFyTNiNk6fQZ+B5zwVTcb6MqJ+bT5y01JxvIra+8LD2jQmwgYKtTKdDGWr pSXFBh6JqwB5+E492KAehffJVDVMYysJtFcEPXOAw/GPfcUnSOYHOnVosDQm05AkWGCU KoaoMZDM7CW/ODv1xNBe6RpDUomyEtWkKgVT9HJp/UdrZguByrQApowISxiCuOTwMJV3 EIO07y6phPjDkwhNBq3A/7/OIwMoV1/QKyBPYQcOZ2ZM3QUktsbRZJNlkOiF3B5lp1WM FZrg== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YNoaZCbf; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.14.50 as permitted sender) smtp.mailfrom=henning.schild@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=Wt8e6cVWJJbypvQP3H4gVl8uSFQZheBpSAmPnHsnw9k=; b=aU1cFTA7pYR9Z/iWBojVGW/JELQx8SRNj3931iGCYRafm/QFzTISBfXChDXnHcki3R ObE/GW8CNjaVdKTW0M3KcxBw8rTP6w+uZ456o1xGpWQCDz9dSLT0uM4n7Pc2+DTyBwlc YVm0gVPDPOVFbipUBE/UoGTCT7maYs5Z8+ObzgqS7FXfUWi5+4GdldKzgwDMk65+7yhO s1vFVFLtG/w+z9YZIFr9Rc6+CnqtS33FVJUU19JXg37C10PLewqUbbEfGBsEiHlbftfa x5mDGyaSqySnnmZ827hOjYTU+I/RCxIIjTDhVWjWBDxA0hp7oSZ/J7unSRlwawkfpWma ZSzg== 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=Wt8e6cVWJJbypvQP3H4gVl8uSFQZheBpSAmPnHsnw9k=; b=5tox8odrPFInxf3xPBbx/5hf6Wn3qlnVSjLHkXdmPOvtPU7WJdYpO5V8w1isQg1MKR 05tOgAiZdcM03uDABcBws8MMH5Y5Kt1jr1ZXKFa8fz+VaRDorKIlYG8FStMQTztyCZh5 v+wf9ATPVWEI1urNTOh0WD/QKoyvR7somyZdgaMbYBARD4gtPUupwF0dfqs9u2ov8a3L GeX2tz4ZRu3mcUN+JP4QKlWb6eEttyhK1GuhP3xJZqpZJRbeLTawcUCYBZt/GRKulB6W aWxrK6ukX1VjMbfYgJOtXmbMMGAPAJhGAizn7SeivErul+4YORITXo1SWpnJYIZYpcK3 hMQQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532tCVLmIuvlMzfUCA+YSsbn7V7/Tx4IJV50DNb6NNc1Bf+E0lfl BeFgOaVvhUd86VZ4vKLqk2E= X-Google-Smtp-Source: ABdhPJytp8Me8vGc3VUKZsexqWoMFYeOIyLkn12cKdCI27Kjt6/vc4YrAilNRe8N+6pPom50D+CmXg== X-Received: by 2002:a5d:464c:: with SMTP id j12mr5375917wrs.150.1639589164513; Wed, 15 Dec 2021 09:26:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:c90f:: with SMTP id f15ls1235798wmb.1.gmail; Wed, 15 Dec 2021 09:26:03 -0800 (PST) X-Received: by 2002:a1c:a783:: with SMTP id q125mr951801wme.132.1639589163561; Wed, 15 Dec 2021 09:26:03 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639589163; cv=pass; d=google.com; s=arc-20160816; b=hu2ERdCSxojNRRWq09eXW5kFg5wpuQiMv4JGQxpFvlt+pZw066SAhF8KSZEz9DfuMj ndDXJGbSols2hrB9o9CWbZrU0wJ8H1iaW9IRpg6Y6tS8jiP8f/JOn06Gfv9M7tqQlF2v obUwBl3AAHnOniIO8UWbERqodMgn9wkruVGu7ARcHdQYmmQsCWUzyNPvqxkpAJqWVcPc JCJCtEW9PxA2UNwQFyk1WFFkhrRTlWnUnGIlTZBlNdVcnZ/dnaN85BfM/8X3KVXHEh3J YP/WMeecG+h0z0NxETexYO4QaOxw2j8Sr7wKVg1eC8VdL2tft9BQ/DZSCtgAluRf1ZZA V73g== 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=e0FvhrGm7Lhw/IqyonUBbytKMNhtGoqHSJ+l9U1N0EY=; b=hb/F0GDko85FIWkCKf9Rd5a68IVem7ykOMSswuNpxObJ7PegUJoFtgOu1aIUVAlvYL EUG6AC2mgh7196hbyXCfgVmLEo40wMQFI4wcTp0HKy1kwK/pdaNFZLuBCYPRb4acXcnI 5LQAS3iqNeZObU3NheE5YzClXDRsUO46s0DERLDV0hmY07rFFB+RjAs6Ugl17b74s80+ 09ItEcwaDlGjqc1r695VlcrJomZx5ATfA/pMpYS+ODHhTkvX/Wi/1wY+tljHwYMzbkwX y0Xja0aJDb0ek0VG1jr03rX+DSD8mKpFznWUbZ53QKwOJx9dPGfgCZ+6Na6mhj/6vVCp J0Vw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YNoaZCbf; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.14.50 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140050.outbound.protection.outlook.com. [40.107.14.50]) by gmr-mx.google.com with ESMTPS id i12si190465wml.2.2021.12.15.09.26.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 09:26:03 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.14.50 as permitted sender) client-ip=40.107.14.50; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N1ngCPeSpyJJEI2dobvEEafmFL1S6Q6e///zRxtND0IUrHgDemGMOyMV3L2Zmel0VjlaE/CMGQAPK1BqJZ6Wbe267nCn4JDYKcgkY0yz6B93rnXsKZ2/YOE3o+yRKJadsUh/XMPFSZjLbGaViuoYjPT6Fe6UbEiIpbGWmezsBoUSZDVPK6K7jcnDLWqVfe5XPq/ORnOnOBpZq+cIM0/MEfn8xThTIQtfcFIUwwzuJLwS7l0/NtIqGxvLDNXa0rg4l37uALna4FKW/eJhRybYXluHNTe0BpGfjXONGOpiQZzLRtE3RdNQIeGqk3kfszRcZDjn61XeUaklhfh1nRWuPQ== 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=e0FvhrGm7Lhw/IqyonUBbytKMNhtGoqHSJ+l9U1N0EY=; b=JFpafGejALDkd9T0e9ltN7cBIiW4U8pXOui3MGmwLG7sL+4Zg1MmvmR9/zAxBlMVf9/KCATSHlD01B7hA4gkfu/A0MribwPTF79nEz80JynGwtet24MOrD8JRqXToGnxyHwW4iGblsBQJ9SBmOy3FpVNy50WgyxotUVE/tr6O5665dygprtZiKZX+0cC7CMHNw7+JXgE39Pl5eJt4MCVoOOIJvlhn+MoxBn+3g8HI54IWC8iHLnws45N3Vn83KgoiWRwO9YpTYWDk8dMcc406kr8Nqf3mx1/GbObwyq6k4rUeHSVao18ah14UXU7z1I9f7foe1cckeUdvDF5oMIGPA== 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 SV0P279CA0058.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:14::9) by AM7PR10MB3573.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:139::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16; Wed, 15 Dec 2021 17:26:02 +0000 Received: from HE1EUR01FT061.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:14:cafe::28) by SV0P279CA0058.outlook.office365.com (2603:10a6:f10:14::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.14 via Frontend Transport; Wed, 15 Dec 2021 17:26:01 +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 HE1EUR01FT061.mail.protection.outlook.com (10.152.1.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 17:25:59 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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.17; Wed, 15 Dec 2021 18:25:58 +0100 Received: from localhost.localdomain (139.22.39.210) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 18:25:58 +0100 From: Henning Schild To: CC: Silvano Cirujano Cuesta , "Henning Schild" Subject: [PATCH v6 2/5] classes: simplify tag handling in container class Date: Wed, 15 Dec 2021 18:25:47 +0100 Message-ID: <20211215172550.27153-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215172550.27153-1-henning.schild@siemens.com> References: <20211215172550.27153-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.22.39.210] X-ClientProxiedBy: DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 03ca5e62-6f27-45ef-3b47-08d9bfeff60b X-MS-TrafficTypeDiagnostic: AM7PR10MB3573:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HfIW5F+GkjtmC4sfn8C/fW0ii4ufTv3tRQOV+BFpXrn1ZEMy/2sJgcMX8LbELB7No19Z10nNi5dx/+8x55ljE5aOds338eRGRV7GWuSkCozI8wbZgHp19aDApcN3Vzf+efJQfgT9RpbXHDTUDB2v3d4TNMIN+Yo1RsLK3lN8n/iZYHKeHQqA8wJ0VU1b/T/cn33bOhCFHrMP5Rpit9XOcyqegKh1/VlQcn0yDRzX41/pAQWcmiG32jnhGdRYzP02NvR0+L/bjT30fFLhYyCie8s9s/eED/B6CGmcUDioYrg4kNImTGiG4sulUm5b3aIm/sDBnfh2FDyJit/mb4nA/aW9KNgqQzMZtEcZRQTi/8ldB7BywzyGt1AKhVL1d81Nub7PpBgiXriUAqxZ5Pa8RWD5b224fXqk2yW5HNBghyX2nalcMmPNR5wiSdhvcPgwZJI8y4JdnX9BUFI068n0K4xnuqhYUjipPCYaW78m6E28NmSxUjqrCj/tUjcsmILB+609I6ihH/85yvffpwKelYlKSSsM0IFUhG1vJNY/3sCXezL1GyY2K5FZT55ZSvm+0YCHQZJpCzYIBXkoQuv7l41N0J8bAwSKdfa3YQ98SEWM4lqhZNNiFsLK/DC6tMZJd/iJkn1WEFrCmzxJPQIWCBroTh+dl3v6upkt+rNmCh9xQKwMkthPwCzDyxk2wqahFgqANvEkbQCiusnrqLl+eajh+CnPW8JowSHdm/S0bxOp9GTs1t7i3cirKbcITz3kuXe2mJhOZH0c3tM9ucRR9ah9Fj2VBQo/CcSoux7ssC4= 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:(4636009)(46966006)(36840700001)(40470700001)(70586007)(82310400004)(356005)(86362001)(47076005)(1076003)(44832011)(26005)(82960400001)(107886003)(70206006)(2616005)(83380400001)(81166007)(956004)(54906003)(40460700001)(316002)(8676002)(4326008)(8936002)(186003)(16526019)(336012)(36756003)(36860700001)(508600001)(2906002)(5660300002)(6916009)(6666004)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 17:25:59.4874 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 03ca5e62-6f27-45ef-3b47-08d9bfeff60b 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: HE1EUR01FT061.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3573 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=YNoaZCbf; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.14.50 as permitted sender) smtp.mailfrom=henning.schild@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 Call the variable "tag" and use it in all places where "latest" was hardcoded. This prepares for another patch that will allow chosing something else than "latest" for a tag. Signed-off-by: Henning Schild --- meta/classes/image-container-extension.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index 6537fc693265..0e70ba9c1405 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -10,7 +10,7 @@ CONTAINER_FORMATS ?= "docker-archive" containerize_rootfs() { local cmd="/bin/dash" local empty_tag="empty" - local full_tag="latest" + local tag="latest" local oci_img_dir="${WORKDIR}/oci-image" local rootfs="$1" local rootfs_id="$2" @@ -33,7 +33,7 @@ containerize_rootfs() { # pack container image bbdebug 1 "pack container image" - sudo umoci repack --image "${oci_img_dir}:${full_tag}" \ + 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" @@ -49,14 +49,14 @@ containerize_rootfs() { case "${image_type}" in "docker-archive" | "oci-archive") if [ "${image_type}" = "oci-archive" ] ; then - target="${image_type}:${image_archive}:latest" + target="${image_type}:${image_archive}:${tag}" else - target="${image_type}:${image_archive}:${image_name}:latest" + 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}:${full_tag}" "${target}" + "oci:${oci_img_dir}:${tag}" "${target}" bbdebug 2 "Compressing image" xz -T0 "${image_archive}" ;; @@ -69,8 +69,8 @@ containerize_rootfs() { 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}:${full_tag}" \ - "${image_type}:${image_name}:latest" + "oci:${oci_img_dir}:${tag}" \ + "${image_type}:${image_name}:${tag}" ;; *) die "Unsupported format for containerize_rootfs: ${image_type}" From patchwork Wed Dec 15 07:25:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1186 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 15 Dec 2021 18:26:16 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f55.google.com (mail-ed1-f55.google.com [209.85.208.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1BFHQGoj009633 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 Dec 2021 18:26:16 +0100 Received: by mail-ed1-f55.google.com with SMTP id y11-20020a056402358b00b003f7ce63b89esf4017249edc.3 for ; Wed, 15 Dec 2021 09:26:16 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1639589171; cv=pass; d=google.com; s=arc-20160816; b=b9Yvr0PVnA4slqXItzKw3hebSd3uh1KGJtZqCBVEb9YF7I2E3pnh3MT1fwWHmY2iW5 +4H5UA2sCN91VSDxaJMgWrGlPEXROC412enGd6/9WfPx6a9xhb452wMHP7lAaNGzySs8 Ch6Hrbf7IMUGKRKui5Ndz0gcdhSfl8tv3UIRphNpEZYICI4U6P/xgThSR97IZ+NINcw7 3E6Y/IUM0I/h4+3nn3FFxyhBRoAhVb63ekJgK54wGjX7UcPB16cr09NgIcsZ0YCcosCj QeivvWpxk/dAAVqQSDJAFISbT5TIQA8DwEWtjWK/F7N0IcOs8LTYCZdtKxzBpZ+5zDan vUEQ== 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=0Gk0dYz5JHvUaY2sFdJyjqKnqdfqr0//kmV3180k1O4=; b=gIzzUj43hpgGHejGFW1dbeCuXU3aOojY2XyxKy4dOqH1Zh1pZrSlMfkXzKpSf7YGFe ZSeIkJayNBmFPrrL9bWkJ8Uce/GrB/p7ZF0aC0aEZ6T+JyPrfGtmQICzuKtN4/Fhn+64 lASnQFxHfqgs2193MyUD22Nvj+sfu+Pc2eGQXy5COCLy8yDM4ATTGksGjB+r05yJGXri 4s3oWm3HVK7vScyytUM8w2Bw7rZHVVulEUGUbJijq4dplI2gAh0zLcdw/YmvikU4z3+a 73pPq5mIqml5ITK2zVKKhG8eItAOp34cYXp6SvPwMCFsSc8NgDXeU8F7iBWNLd104Ft9 l6hQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EIosbdAw; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::606 as permitted sender) smtp.mailfrom=henning.schild@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=0Gk0dYz5JHvUaY2sFdJyjqKnqdfqr0//kmV3180k1O4=; b=eBV0vLiQyVAyHCA/lW9eO8k298Whdau/iIeYkwT070ENVaIbUJgrNqQ//gWLjtTEbB O4wY/rZj7blY0L/k8FQqTNDoCn1fCatVmou+Q92Z3/FQPm5SymNdPeFLpUnHOw3fKwPn joYN9ey3826RyOYAjfgduc7mqCEO5pAaM7ysXdqKCKvMRpZbRMoQ8G7sBCNH1RKhnJZv vC1iO9XQqLDgrrcvfh8sSGoljarjcJtnJ6FYFpvZ9rXvMfI/jlYzT4/3f/Mpgx89Ixoi xwCSWAllg/NpD8wfKG97hqFfrlAFg54u94BqGvYL/T2dL0/+aD36tdAS81+7uozYRhKO lCKA== 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=0Gk0dYz5JHvUaY2sFdJyjqKnqdfqr0//kmV3180k1O4=; b=YZZ/ma+I17SB1N92yw1csyEPk1PwYjhVh9F8bwXPNtT+U++ZzKxZUGt1chmuYc1O2C +3f4fgPBNYf+DMpqzoTv3/zMXOnXmIQ2vvABuQpYucUCoYmaTrdzgvFiliZm0Ee/SxIb 5+t//PGG2Zowsgg1MqlWayvMU967CXApEurEuS7bSOLIxLGJ7NcRnX6yaQMHvdI5YQRZ N6dXHqQzsT/as+q/MT37U3lpcF/tTgg4AWwQliSv5r2jo3MQpF0KQceDPymPMDwpe0vs 54RK3w0SSF1wPlf2SntPU5UwexIegpS7NSpWfKfYeCs6Bf8EXvj+VUt/TowEUjjslmLS 1jeg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530C+cNS23Q65BrBjRt/qUQas4bUDPd2M/tbe7quxyZphvQV6rhB o7KpdwyY3wSjVhvvtyObo+k= X-Google-Smtp-Source: ABdhPJwbszf9OAZYP+zQcBXh0PpgBrWQPYcSpl6CEF+rt15R8jH5GttOjWLE7FCnin+Z1HN/KtXMZA== X-Received: by 2002:a17:907:7f8c:: with SMTP id qk12mr11751061ejc.169.1639589170811; Wed, 15 Dec 2021 09:26:10 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:d10:: with SMTP id gn16ls1162567ejc.5.gmail; Wed, 15 Dec 2021 09:26:09 -0800 (PST) X-Received: by 2002:a17:906:31c2:: with SMTP id f2mr12092708ejf.341.1639589169862; Wed, 15 Dec 2021 09:26:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639589169; cv=pass; d=google.com; s=arc-20160816; b=bbr/j7xPePRsZ5TR8rs8FdLJIuHQsmpbXO63mOH1eMtgBTtTSzfxEV/Q0JY4qAv6yl 05JjmbJy4+7uhRFTqoZ5fAAo1cdFXwYcUhBAuhftfsGR74xt+hzZaGoi1lZMjW8SYib6 Hk8x8XeyPHWilvN4hvWQ2sHhk11icaYPyQzi7p5Fbi8YLX8B/TazubsUIIx9tkEF6RV9 0zkKnlCUGVG6pMaRsSDF748T+LNMuwFrR7W7Ozk412DCoMEeN23JkXgBvZpO3lMSuLHa yIljx2iTZBAZ+ElaXUPRV/1EEAuxMqDI0kdKf7cIriOm3AAz/p4+2hkJkcQ2zMjakMBi Pu0Q== 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=gZ5mPWJr9TG56ceUHl7mcsXpAXSqKCnIif+OP7ajHbs=; b=ufKNVVAzf93e6YAze842YZg2MfHE1PcXN/c4s4zZtD/HpwRb0yTk54rbkge7KXf/4n xyFautJLA4iO0KSenGCjfJwN+GHvJfUDDvXqJr02lfPkAD2wJ2Hk52rfSVs5/RTR4egY yAC/GRT6bTL6Q+K71AZJIbRm1KZKYMZUz4N1YZjLBR/ORaHkLT9RPESskRkguIbomF+q mI4Pkrg1QPnE60ht1ZlNOe5if+0YN3AsWgVsEzCIUs1Md0/THR5UNEfYlXfuf3v6OqIc LDtRrdOtArMF++XjZTwkMi1vobLov6yJY/cFpTql4kcsSfM6/z7Tcf6X3xIJfzaMheHi YNsw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EIosbdAw; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::606 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0606.outbound.protection.outlook.com. [2a01:111:f400:fe0e::606]) by gmr-mx.google.com with ESMTPS id bs25si99198ejb.2.2021.12.15.09.26.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 09:26:09 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::606 as permitted sender) client-ip=2a01:111:f400:fe0e::606; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e9JAbfPKRILTyLq2lwp4f84uAO7Gl6rtCVqyHvxlGFHVeCewWOK0CysKn+yCSA/gwFKOCHuX4Vo2p+xxaphwUONYnB0KcmbC01ReX7Oy9gxTyzKdH+h2mDCwFEw9m6fUENaMk3JjTStoNfSxVmqIYzNuT6CDfAAt6jV3loLQtLUqolAovtKW3EFWVw1Lr8wLABgqxE5i8W9OwmG1aivKyq95WvBS6T8WRkZ0Xd1b0QuhpKSqhqZ5AlQ33tcqSWNdQJ4XBHBU1WnW7vv89AUDO2go8T2VOI93k/HgrYy9SJdukgcAuM16Xzt+GHeGTUgX6+lKeoTJQCqGNsZThXnZJg== 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=gZ5mPWJr9TG56ceUHl7mcsXpAXSqKCnIif+OP7ajHbs=; b=i/IZiUewh5JuwODTw3uAf5itZ2CVnMCpoAiTyOqjjYLGWqxyN+I784l8iEF8ViHN5sNvzTn4sEJR/9ERTKN7FZxBCShcq2ixsm4zjxl4zn2q+OrLjgPYDn19vjilIdloTgxcG0+y9Xo1d6p3QitVAtyxHsDpLN+4baBDNuNYVJpKtCUtKWGCr0Jwe1Z4UlossQi6ZxpB1esj24f65++6JnrI23Tk8ShcvjcHGXS2VwuO3ZPAL7epzfUTYM+2GCqzuU8bS8wUXrfkJdS4QEsP2uj58jiAbhmXA7U8VDpT77YZFcyq1SFQF0Dy2zja9IuHFnIJWcTxVi+wAFFG/b7NcA== 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 AS9PR06CA0165.eurprd06.prod.outlook.com (2603:10a6:20b:45c::12) by AM7PR10MB3159.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:10a::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.12; Wed, 15 Dec 2021 17:26:08 +0000 Received: from VE1EUR01FT049.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:45c:cafe::91) by AS9PR06CA0165.outlook.office365.com (2603:10a6:20b:45c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Wed, 15 Dec 2021 17:26:08 +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 VE1EUR01FT049.mail.protection.outlook.com (10.152.3.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 17:26:08 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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.17; Wed, 15 Dec 2021 18:26:07 +0100 Received: from localhost.localdomain (139.22.39.210) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 18:26:07 +0100 From: Henning Schild To: CC: Silvano Cirujano Cuesta , "Henning Schild" Subject: [PATCH v6 3/5] classes: allow more control over container image name and tag Date: Wed, 15 Dec 2021 18:25:48 +0100 Message-ID: <20211215172550.27153-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215172550.27153-1-henning.schild@siemens.com> References: <20211215172550.27153-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.22.39.210] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6d23ed00-9e20-46b9-ee65-08d9bfeffb4e X-MS-TrafficTypeDiagnostic: AM7PR10MB3159:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p59PPVp7kqmEkV34YvbpauHjGCgelw0mQuyrJHhT63yNK4AvixCvH+NB3Cg2qJgjKdt7XmB3tIU4YGkORvIOKX5DxskOB0WSHOm/YDlq7DGmxFHQwXdkfecuMeuirp5nPmNuBpz8yR2hhhDJCQtBc4VHv2KRYV+ZUc1QGmOnQQJm7nrD69N818YCTPm/A2NYncFtmcSFbipaJ/rY3j6L5aeEO1TaYR/+scKoAk0CCjzZJevsx/GTYOEZ3MesUglUvWNbmTSqSyEo1mKBX5rnewMvJHTkchepf39qRD/KaeAMf2i4zlD1nKkC3aLaBviejxuqsHxR418l9zCIehtnqV5zC7xqXYcqksP8MoN+bVO265AzOSHer1DGpT15T1htdoFhZYFbLkuYAxKQErZAECPVCP+taXrLD6PTOljioaLBHYPvYkUgX2C5RvXi77RUi+GAzH6T3GXmgGiYt+RtLASu2dTk/h5zQKzO/EHgq/doW2TjhSaLlnnMbXQhrB78VOSmYa3921s29LIWA0C0aVmRNfjO6UtwMPtE3Nqr2RMmpP9ABLJ7lDb6M+vhQum3N2FOytqDSjCppuhfym4WfaURjNjUt9Qp0/1PCJwbyfI1YK1X3Z64oHLmp2gqmLeNBNXmGUt1Qec8U6Es7OQayMxh+os+WXFD1dObYpZ8XoMwoeCblNL9ICSPd2s+pc8Q+3gIR8K7Nuw/qpZKevhpd+Ryf+8J9hV/T4eg3adDiuzpmMV88Nj3sXCdhIodB3p4+OZvP2lWcM6eanTTn+tChj5ZR5qf8zk79bgqkZ5as+Y= 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:(4636009)(36840700001)(46966006)(40470700001)(36860700001)(1076003)(508600001)(86362001)(5660300002)(16526019)(186003)(4326008)(83380400001)(82960400001)(44832011)(70206006)(336012)(70586007)(26005)(956004)(36756003)(2616005)(107886003)(47076005)(6666004)(356005)(40460700001)(6916009)(8676002)(81166007)(316002)(8936002)(82310400004)(2906002)(54906003)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 17:26:08.3444 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d23ed00-9e20-46b9-ee65-08d9bfeffb4e 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: VE1EUR01FT049.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR10MB3159 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=EIosbdAw; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::606 as permitted sender) smtp.mailfrom=henning.schild@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 patch allows more fine-grained control over how the resulting container will be tagged. Where the default name will be PN together with DISTRO and ARCH, and tag will be derived from PV and PR Signed-off-by: Henning Schild --- RECIPE-API-CHANGELOG.md | 4 ++++ doc/user_manual.md | 8 ++++---- meta/classes/container-img.bbclass | 4 +--- meta/classes/image-container-extension.bbclass | 12 +++++++----- meta/classes/image-sdk-extension.bbclass | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 55836258ce49..b3e6a2af199d 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -306,3 +306,7 @@ When using the plugins it is advised to name the partition "/boot" and to exclud The variable is renamed to get closer to OE/Poky variables naming. The old naming will still also work, but with deprecation warning shown. + +### Change default "NAME:TAG" when building container images + +The "NAME" used to be rather static and the TAG was always "latest", now the values are derived from recipe variables PN, PV, PR. diff --git a/doc/user_manual.md b/doc/user_manual.md index c81c6e466e40..eaafd6a9d708 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -305,14 +305,14 @@ bitbake mc:qemuarm-buster:isar-image-base - Load the container image into the Docker Daemon ``` -docker load -i build/tmp/deploy/images/qemuarm/debian-buster-armhf-docker-archive.tar.xz +docker load -i build/tmp/deploy/images/qemuarm/isar-image-base-debian-buster-armhf-1.0-r0-docker-archive.tar.xz ``` - Run a container using the container image (following commands starting with `#~:` are to be run in the container) ``` -docker run --rm -ti --volume "$(pwd):/build" isar-buster-armhf:latest +docker run --rm -ti --volume "$(pwd):/build" isar-image-base-debian-buster-armhf:1.0-r0 ``` --- @@ -1139,14 +1139,14 @@ bitbake -c do_populate_sdk mc:qemuarm-buster:isar-image-base - Load the SDK container image into the Docker Daemon ``` -docker load -i build/tmp/deploy/images/qemuarm/sdk-debian-buster-armhf-docker-archive.tar.xz +docker load -i build/tmp/deploy/images/qemuarm/sdk-isar-image-base-debian-buster-armhf-1.0-r0-docker-archive.tar.xz ``` - Run a container using the SDK container image (following commands starting with `#~:` are to be run in the container) ``` -docker run --rm -ti --volume "$(pwd):/build" isar-sdk-buster-armhf:latest +docker run --rm -ti --volume "$(pwd):/build" sdk-isar-image-base-debian-buster-armhf:1.0-r0 ``` - Check that cross toolchains are installed diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass index 8fef52a7195c..4e0fe0efb484 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -10,10 +10,8 @@ do_container_image[dirs] = "${DEPLOY_DIR_IMAGE}" do_container_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" do_container_image[vardeps] += "CONTAINER_FORMATS" do_container_image(){ - rootfs_id="${DISTRO}-${DISTRO_ARCH}" - bbdebug 1 "Generate container image in these formats: ${CONTAINER_FORMATS}" - containerize_rootfs "${IMAGE_ROOTFS}" "${rootfs_id}" "${CONTAINER_FORMATS}" + containerize_rootfs "${IMAGE_ROOTFS}" "${CONTAINER_FORMATS}" } addtask container_image before do_image after do_image_tools diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index 0e70ba9c1405..b8cf85a5c256 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -6,15 +6,17 @@ # This class extends the image.bbclass for containerizing the root filesystem. CONTAINER_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="latest" + local tag="${CONTAINER_IMAGE_TAG}" local oci_img_dir="${WORKDIR}/oci-image" local rootfs="$1" - local rootfs_id="$2" - local container_formats="$3" + local container_formats="$2" + local container_name_prefix="$3" # prepare OCI container image skeleton bbdebug 1 "prepare OCI container image skeleton" @@ -42,9 +44,9 @@ containerize_rootfs() { sudo chown --recursive $(id -u):$(id -g) "${oci_img_dir}" # convert the OCI container image to the desired format - image_name="isar-${rootfs_id}" + image_name="${container_name_prefix}${CONTAINER_IMAGE_NAME}" for image_type in ${CONTAINER_FORMATS} ; do - image_archive="${DEPLOY_DIR_IMAGE}/${rootfs_id}-${image_type}.tar" + 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") diff --git a/meta/classes/image-sdk-extension.bbclass b/meta/classes/image-sdk-extension.bbclass index 426b92595554..052c1b580451 100644 --- a/meta/classes/image-sdk-extension.bbclass +++ b/meta/classes/image-sdk-extension.bbclass @@ -80,7 +80,7 @@ do_populate_sdk() { # 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-${DISTRO}-${DISTRO_ARCH}" "${sdk_container_formats}" + containerize_rootfs "${SDKCHROOT_DIR}" "${sdk_container_formats}" "sdk-" fi } From patchwork Wed Dec 15 07:25:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1187 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 15 Dec 2021 18:26:17 +0100 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 1BFHQGve009638 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 Dec 2021 18:26:16 +0100 Received: by mail-ed1-f60.google.com with SMTP id y9-20020aa7c249000000b003e7bf7a1579sf20773104edo.5 for ; Wed, 15 Dec 2021 09:26:16 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1639589171; cv=pass; d=google.com; s=arc-20160816; b=dz6PDpp0qsigQjW+TFunO7K1i/eW3T4NzFx97rUiFM1GdRIlwlP63QELRduP+s2fn5 Ph5QXs1aFoaEzV7+Rq346w44PPZeicqVbUJf9nqbWGgtge3DNCrPbFC4s8aw53fwdkrP RnX4/pKHSPce1B3mnqi+C+QtvTUdwVa1H3acEZX+HL/Kr1m7bDT3fK5e/Q4SsotEVcWv aQ35nnP0/77C/gZOi77ZXdcg5DlkwFS42AgKQBuS7C1K03S1xJQX4o5Oy/+Tn0uNiAJH vRU473CeuUvrjXhpRWc/qudD+wzsMCs0Zxtkg20+lLtpEz3AP8EY0nY+s5qN9cA99S6f n0EA== 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=JvoupJHpsu1XcSWQP05Nat4+AYRz2R/9/cCNifQ4/ig=; b=mpIF2LAzTolLnM580Vhx0XSg17u5fAWC6Ojlo2SmW6DNK5nitOjkPm2xowQDk82px2 ubQp91RwTW5jNVyHvLGFO9WW2HQGnKWOh2B8av+A+tNlvXJ9KdC+HHWT1qjHBI2s/LnW Y0ydeqYWrlRfY8DIX5kcoHFYE1cYip3lvhyCiSgr36USXVRdPLKQcK2lY1eHr2NMDapW P9MY+JXl98lJj6ZqYlRcTqwSrAKJO1825boGPpWSGNM8rz+AldhOrWqkcPiAoYEXaToo QSUYOeUiAal6pi6j31gEjzKL4WQNpqT+O+v4s86f3iG34H6qczZn3OWOBJ5IR2deHNvf JkKA== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MNAZd5tT; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::611 as permitted sender) smtp.mailfrom=henning.schild@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=JvoupJHpsu1XcSWQP05Nat4+AYRz2R/9/cCNifQ4/ig=; b=VWP1QVrzuLfV6eNFZMZnudvmJes7EYFB0aRYisP2uBRJGoddhhlK0E0gC6bOb8TYgh z1ofz0ZlM0eOFxWaMd/IzyafdFMzDVaf3fuk4D5kGv3kyGQM1W5SQHeqNROOuKdmaoPz 5/rVwrlCUExloz0/drkX6l5jJvLqiJ7Jog+wsuJg8in7uqOTNdbgVh8e3dt0axrIELdH tfkdLYz5UK7I1dKc1Tw7+786kVvh8ALVu94CNlg2jwIMkcZf++LwoKR0Fy7f0y6weXmt zvs6NmtA0Q8s+KatZsoYtir6xK4nQCQnhHq6MzsZvZcAjlvvcfO02a3M1mzbmpt6UM+f sXrA== 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=JvoupJHpsu1XcSWQP05Nat4+AYRz2R/9/cCNifQ4/ig=; b=71SkVfytariOE0LD6BLwOVgaz6p+M99TVOW7UXzJi+H2IvRmxJS69VDgeFVwULEScO eicBIknqM8HJxFLqShLK4+gnAgDl37j33rccGmUwWx7fnEJ4IUFWiljvNJhX9vhQbPBM ShwpUd03zCujbQKpfc9ueelBczQItp41WbxQahFPCJZtFHmrgoH2uYTuw9kGi2ii2igp TPtNmd87Epw3ryMCgEZ8SzF7WmE0P+HF7tOQ5rsRMFBF3aY/00NQWfiK5qDvHemu2lJV xLHo3JKRwa3uUOXVCqGY3+xvJIh8to9AGxQBZLyW17fcLkLIriyWmd8V2jXrFkBc96CR Ialg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM5320hwBuCCGUd3oMahg7khh8We2h+thDYUcO2iI1cN1gMOMAXOtI LSdcOeUbLKBc8/G4FSzpsa0= X-Google-Smtp-Source: ABdhPJxel2Dc6spHKUYtSZYQKpDPU0T6iHyg/yBC7eSqZCwyepFc4TaS+XGFBz8w/LTLrkyjkm9GfA== X-Received: by 2002:a17:907:a04b:: with SMTP id gz11mr11870384ejc.68.1639589171438; Wed, 15 Dec 2021 09:26:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:7f0b:: with SMTP id qf11ls1159163ejc.7.gmail; Wed, 15 Dec 2021 09:26:10 -0800 (PST) X-Received: by 2002:a17:906:1e05:: with SMTP id g5mr11991282ejj.552.1639589170452; Wed, 15 Dec 2021 09:26:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639589170; cv=pass; d=google.com; s=arc-20160816; b=os8eCOsvsMoo+oIOdvufFIMeV1OZK0SVX6umrCWikKNBCpvLn8hnxjxeKSPAAVp87x jN015OKjI31LLFvyesMXHRCU1f5vFnuFPUfnc5KJJjnyx8dWjbZvREm2hzgC+m5tNqsA 9i5weYqM+y3307ubfsyuzDTnRkGs5X/JR78AVAgJQv6djWmygDOXT7FkVclP3fBBLyKd e5lNRggG/xKtNs2m/HqC2hgCecS8q23m5s/BSZGI5k/tckCJEogIhxTAm21jNJxN60Qo Wit/ZLT08S6IixiOM0T+uIRZG/mkI+/orT7IT5xWO2Q9h0NW+/cZ8nVMd5fOV+jqV+kH IvJg== 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=40RbBwFrlM1s/yQX130pgOjxmeub6+6Ojq/M65QNGnQ=; b=wz1dqBQ77Le3ElRmaKl1fJ8CLQqiJFxqz8Rq7U+sD7gjO5U0Zdo4meIEilD2BMOEcb 3v1HORgOMy2cKE625rUI+rZWZjUpEghFBHPtNDZObw9KaVdU3sM/6DPKgw/RZq/aIn6e j7W9V/ptVfwD2PZse8o9LOIx9JdIPPwtr1pdU88S7Y4X/hFLUZZMmVDAfi6Wv7Jck8TN wd0lHTgekZ+DVLOwZiy9dKZ9ysg0VAt1XkO8/lAz+JTE3Slt2XG1sMHws5neAwOIDs8k uSMor7FhR3NzV4GhIN0M5SijXvq0sDToSAn1ixZWXO1lLhBdnGIlVG4ljDDSj+3ly3z+ hA+g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MNAZd5tT; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::611 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0611.outbound.protection.outlook.com. [2a01:111:f400:fe0e::611]) by gmr-mx.google.com with ESMTPS id i23si149557edr.1.2021.12.15.09.26.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 09:26:10 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::611 as permitted sender) client-ip=2a01:111:f400:fe0e::611; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mg+RxUtQ6b0nQomsLoNJVa6BFVVA3KfF2txy4N3HmJh7nAiIoPxD4ijrvzCX8CuPjSkwrppjLZQZVeGw9F7EGHFP0Rrl245XnImIgXLIyGFRfnKsgQmpR3RI2B1W0SK8RhkOhiwvLRgiaseG5UXxspgp06+NKMmncuhQEEUf7oC/DDAi21fbPCAACBbJljo60avNHfLZ0nDED7JzMPYk0/Zp9bp38alPhlg59BF2qb9gk7XCqor1HIOP3qmGM7fn/YCgLIVgNqhkZcgFEfr7BVs1unlPb4LyKB81sA+TVTpMl+ckNKpjM1ERKZuupX8ErRU/VYmAREY1modreffQQQ== 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=40RbBwFrlM1s/yQX130pgOjxmeub6+6Ojq/M65QNGnQ=; b=kmPURaJ6eB3TRMGFB5Tg0w5rAdMjoYr0NMj7eJaYOPYyTcPIT4nwqgP+RbX9H4mxs3R3tkP0+N+aTzm2iRkNYbn6M+6UpUcolOV2/lYMrzdbK4LgMV+AfTZOxPPkRfuiM8mbPcQxJ0h24eEOuah3RXDEvliP9PkGTptztTK2vxdaTeL5MH3o6Dz78pzKyT2b1DK31Jb+Ldx9p0QCnrLEvo/88rXxi/asAOvBs2jOq2zJS/p57P5bNn/XkJYy1jydxBKuF3hwq+tyXcsvtFlrXlpIhLO+m/Pbpxkk6FlNJ5mkv8kP71Xrt6TWt3utyr0/DiC/osbmFH3Pf61PdRBX3Q== 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 AS9PR06CA0330.eurprd06.prod.outlook.com (2603:10a6:20b:45b::9) by PRAPR10MB5156.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:27a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 15 Dec 2021 17:26:09 +0000 Received: from VE1EUR01FT055.eop-EUR01.prod.protection.outlook.com (2603:10a6:20b:45b:cafe::91) by AS9PR06CA0330.outlook.office365.com (2603:10a6:20b:45b::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4778.16 via Frontend Transport; Wed, 15 Dec 2021 17:26:08 +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 VE1EUR01FT055.mail.protection.outlook.com (10.152.3.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 17:26:08 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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.17; Wed, 15 Dec 2021 18:26:08 +0100 Received: from localhost.localdomain (139.22.39.210) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 18:26:07 +0100 From: Henning Schild To: CC: Silvano Cirujano Cuesta , "Henning Schild" Subject: [PATCH v6 4/5] classes: rename CONTAINER_FORMATS to CONTAINER_IMAGE_FORMATS Date: Wed, 15 Dec 2021 18:25:49 +0100 Message-ID: <20211215172550.27153-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215172550.27153-1-henning.schild@siemens.com> References: <20211215172550.27153-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.22.39.210] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d121cf7-264c-4c43-905a-08d9bfeffb7f X-MS-TrafficTypeDiagnostic: PRAPR10MB5156:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3dbcL+OAmEUlNhyF08PD16ZfHUx6gaCacTszAvjm0fcaKysl+bNliB/lBdgpgiQ/BolHzTTn7p9/M5xxlR9GrRAwxO1x/FiKVDNgXYjf5vZCl2Hd5sWJX8AgzRsJqr6VE1sYi9schkdpV2z97SZkv1To4NXAoFXORo2rwzad4z/dITQHuF6mp2N0/SSh6W/BHVBg6EctWagkyYfwh/ILMkaGSf9TzhON86R4U49jN/Ch2566h8/XhjhE4KCcPvabjLbyGr00umjRJRJx4gUsXdVO8FSCx9pe5efuHNZfTL163A4R1HlXsZZ2FGAN9LRaGmkaEsXSisT8d9xIP6hRoShkapBfaf9ox5x9XvYaUzlCHu0NgunJVRJ8JTxqPdVi/1E1f8FOE/H0ydwEs+WkCBusmhqd/7OwSQ7adtheAMpBvj2Gd22SHVseleuwe4sz/X1iYB4IuWWywNsSVYruT0JCTS1Yo+wH1/E4jS/SH1RUsPR1akDigs5DarydzOnC2QdAaKaoDA/w5bZo4vBKvenYv8EvMjwhwd2//sWIopOrFx3eu1+67/Vjs717B/XAPXBLR27MA1wEwxQZMYBdGMLufyGK9IAf1hW0c8U91tLt0qukHg9lcwOWBJIItsGMbPAn957D7XX8aJlVP8HtcAxSmxgxWji47VKlUlerIlgRw7HMDWf3h1VZhM9btQMcvWypBAbTgS90BN7s97UYKe8dYxjCkmL3FCCSSAoojYucvgnw56JbGKr1vraAlHpfqxAi5olk9eu00s+/jiI8rB8Sky9blc99KvmO0jUMSNtfJ4/tNcDoi3WMvQP4IBgC9qOt0Ag7WaSDM8rrtvYSCis/TzpfnQeu4rjx0/n0r7JG3n/L7vISrRdStYRkQqqM 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:(4636009)(36840700001)(46966006)(40470700001)(81166007)(70206006)(1076003)(107886003)(70586007)(36860700001)(44832011)(956004)(498600001)(2906002)(82960400001)(82310400004)(8936002)(36756003)(2616005)(6666004)(8676002)(54906003)(186003)(86362001)(83380400001)(16526019)(356005)(5660300002)(47076005)(4326008)(40460700001)(6916009)(336012)(26005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 17:26:08.6697 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d121cf7-264c-4c43-905a-08d9bfeffb7f 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: VE1EUR01FT055.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAPR10MB5156 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=MNAZd5tT; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0e::611 as permitted sender) smtp.mailfrom=henning.schild@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 brings some consistency with other image-classes, that image class variables are prefixed with that class. Also fix the docs (where the trailing S was missing), and mention the interface break in our changelog. Signed-off-by: Henning Schild --- RECIPE-API-CHANGELOG.md | 4 ++++ doc/user_manual.md | 8 ++++---- meta/classes/container-img.bbclass | 6 +++--- meta/classes/image-container-extension.bbclass | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index b3e6a2af199d..3bbb42a9a701 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -310,3 +310,7 @@ will still also work, but with deprecation warning shown. ### Change default "NAME:TAG" when building container images The "NAME" used to be rather static and the TAG was always "latest", now the values are derived from recipe variables PN, PV, PR. + +### Renamed variable CONTAINER_FORMATS to CONTAINER_IMAGE_FORMATS + +The meaning remains the same, just the name changed. diff --git a/doc/user_manual.md b/doc/user_manual.md index eaafd6a9d708..caaab8ccfc02 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -260,7 +260,7 @@ 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_FORMAT`. One or more (whitespace separated) of following +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 be imported with [`docker load`](https://docs.docker.com/engine/reference/commandline/load) @@ -282,7 +282,7 @@ 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_FORMAT`). +`CONTAINER_IMAGE_FORMATS`). ### Example @@ -291,9 +291,9 @@ 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_FSTYPES CONTAINER_FORMAT" +export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE IMAGE_TYPE CONTAINER_IMAGE_FORMATS" export IMAGE_FSTYPES="container-img" -export CONTAINER_FORMAT="docker-archive" +export CONTAINER_IMAGE_FORMATS="docker-archive" ``` - Trigger creation of container image from root filesystem diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass index 4e0fe0efb484..e26895a92b1e 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -8,10 +8,10 @@ do_container_image[dirs] = "${DEPLOY_DIR_IMAGE}" do_container_image[stamp-extra-info] = "${DISTRO}-${MACHINE}" -do_container_image[vardeps] += "CONTAINER_FORMATS" +do_container_image[vardeps] += "CONTAINER_IMAGE_FORMATS" do_container_image(){ - bbdebug 1 "Generate container image in these formats: ${CONTAINER_FORMATS}" - containerize_rootfs "${IMAGE_ROOTFS}" "${CONTAINER_FORMATS}" + bbdebug 1 "Generate container image in these formats: ${CONTAINER_IMAGE_FORMATS}" + containerize_rootfs "${IMAGE_ROOTFS}" "${CONTAINER_IMAGE_FORMATS}" } addtask container_image before do_image after do_image_tools diff --git a/meta/classes/image-container-extension.bbclass b/meta/classes/image-container-extension.bbclass index b8cf85a5c256..cdec46334370 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -5,7 +5,7 @@ # # This class extends the image.bbclass for containerizing the root filesystem. -CONTAINER_FORMATS ?= "docker-archive" +CONTAINER_IMAGE_FORMATS ?= "docker-archive" CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" CONTAINER_IMAGE_TAG ?= "${PV}-${PR}" @@ -45,7 +45,7 @@ containerize_rootfs() { # convert the OCI container image to the desired format image_name="${container_name_prefix}${CONTAINER_IMAGE_NAME}" - for image_type in ${CONTAINER_FORMATS} ; do + 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 From patchwork Wed Dec 15 07:25:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 1188 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 15 Dec 2021 18:26:17 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f64.google.com (mail-wm1-f64.google.com [209.85.128.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 1BFHQGGr009641 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 15 Dec 2021 18:26:17 +0100 Received: by mail-wm1-f64.google.com with SMTP id k25-20020a05600c1c9900b00332f798ba1dsf14943478wms.4 for ; Wed, 15 Dec 2021 09:26:17 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1639589171; cv=pass; d=google.com; s=arc-20160816; b=lLj1B49pcO/OTzJZA6Dleru/c2Mwvvz51cyYpz7jkBzWqoabemXvG3i6H/Yi5aSHZo WC4/oL2c7aitZMeeHQdEbLPCfOwAsZdi6q/x5W67fT//gSPeJy/dtUm8wj7+Va5/bW0Y c85Pu6SUw18YpqLNvDpZ/vZuZDReyWlgxLYRqmF5W9y3DDSfUrBA1WthmUOxWAQSFbTK dYyFDCE7aTfcfBolZduyHHrz/uf3QVy5SwyNQtm9bfodz7cWxbg5YPaPM1lPytbzSDN3 kVmXMWX6vZFdd69I/KPvyNNuF7GsP9Sf98S2BcgSt7B9KjFniYNk3XnAR+n0GnbnQGKM qPug== 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=K+2WHBP10H95FRArfFLyZKIhth68Jjih+nQ7KtoB0oc=; b=xN2ggpjq10u8TGwhqnHlPs65bXop51fH3hHNbbLzJyFpeVt9slE5KIbpp90bAWsYm3 8hyMG/iWCUkXWEKGFkuwgdsq4AXUyJvukvC8day0UHqky5b7k+2R7XqINjk2FdYycQsy 4uSUMf5kZfZRehS6PvaYYV1iej06yT21yRrHAw6g8nBCEt9i2cJAHL6IWETsZLrhxmhw I6y5JBWNP+ns6dAq27MCvNTg+dBb7337IQmZLYBXvIcTKMlKdsyZLlHwaW0k+A+Vj1+z 6m3N/MjLB94VVmnbL+VDUKqnqf7jXq7ZkU0iVqhkzx5U3RmPMB9QMZZxhl/LrloinN1V +m7A== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=M9mWTze6; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.14.41 as permitted sender) smtp.mailfrom=henning.schild@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=K+2WHBP10H95FRArfFLyZKIhth68Jjih+nQ7KtoB0oc=; b=gMyucOs/rcy2LOUNd4/BZVuJO80Glosk5QzRx9LCAHGzE5d6u0R4M+PwD9EQdP9HCg XoqtN5M45LStAkOw8P5R6yxucJsB+AmXNWougeiqAj30PFZgkwjKc9inrFp2h6QXStdN uiVsnZn7TIhDX7N+vyUDtQCvVJWNxG2tnkTPLe5eTLzeFyWqib8iH/9YLTyL+TDGoDr9 6bHqhE3Qg8fsCvDbQjnAa2eHpi1EkYSn3VwZwSwmyaw301IFkKcYZXAYNexpFUny/7Vj bIwBbXKXYZ2761nORlXIG5olyyrhnAFQ1zc91NzKNpcFRGsRMWbQXhn4Rfn4hl6RWi8C BFPg== 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=K+2WHBP10H95FRArfFLyZKIhth68Jjih+nQ7KtoB0oc=; b=OnJClMc+Q54NxmzehXl+6KqCMm/ERMZ057GHdiLyBoDR7NdnP9RGJ4IL1t4pzlUOVV jg4XJwLx4toJ/w0HesIjbbfy6YlBki3CaienxGkHK4i9Me/VDCFQfrDbmhNd/H3SjFSX IIzL3Yb4u3s3sv5Ze2k67nB0zxT2pt+AkeaJvYHHz39uWJP+nGgwt9pW/g1PnuCZVZOX 03bKahmHlIdolhEcesDgr+MWqya5/Y2GEzo2PZx4WQcklaxs98mFE3nJ4aagivZZamDi 0Tps+e3tA05xzCIH9y9i38TLMmA2BEPusej+ET2th2FvKH1GRxIdxk474WqlYqq8pMUf 5QTw== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530Qu6hLN9IQ9zu+tUmX0C9L2gU3f4dIm2OCwMehTXR2S7sQ3oi1 WXg/6aY/t1VrGM4YaZxek6Y= X-Google-Smtp-Source: ABdhPJzwPECqaYHVjR+X3SGpaAFVz7msVCktdbTSktEopkolxH29t22NeRb06kmIhcVMXXk/hzdfvw== X-Received: by 2002:a05:6000:184e:: with SMTP id c14mr5205381wri.499.1639589171590; Wed, 15 Dec 2021 09:26:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:a4cc:: with SMTP id h12ls1975758wrb.2.gmail; Wed, 15 Dec 2021 09:26:10 -0800 (PST) X-Received: by 2002:adf:97c2:: with SMTP id t2mr5250004wrb.577.1639589170680; Wed, 15 Dec 2021 09:26:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1639589170; cv=pass; d=google.com; s=arc-20160816; b=NcreQmJk4EW6q6otfzFM+K64zlDNOzh+P2A5O5TKH/+SCUHgJZ4b6Nl4lUR/c+1DRt Odn2QWSHiiysP9+uXRvREZDSywq5CQRlgMoFAFhLUKpSpUXzdbaS/Tlwwe2a8Zv5bZju UymU6WQ56cg/v+Zj2GBoeW81NLpxoU9AHyrg1NTpLgehO3DCMtv/c8JMkS2P825bWszO Y9TWrw4xRaWlH5uOFkJUXAARQR04/aOipOznWBhrrvQzDJr08oG7oCQdZT/SxyQARPFf tGmimZVyPs1xVwj42u1PuoB88CaJE2O/qMdYcUUKZUJ5W/o67oXj8f+V5VWkaxzy/3st GVpA== 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=J4cKkslxtxm2QvQnYQNXp4T4HIlXh7vcDNG+sybPT54=; b=naUy88KlQvFnnkTfh/oGKZWcgtBpQfPWl4TAr/EbwiUrvNTnOUhIerZSifB9j/njXn pNikOXqDnEp4nZ4yeerW2ktmw5DnhJ8MFI2nMiv3t1elo2sZ28mEEP1k8+61kmiIT/R/ 143m+hG2toLz+2iQIAuaMmg6j+oE91pLXdUNZeLl8NwqNqskrB8yXTNVrBnt6gYaFFP9 uhMzJ43vPA3/7nv/p6BblBUePZ/p+B97tjAcAgkEix7NpSBySd133fblxUUdYieQNK5N FWd18dLJUYKTzq8eN8rdeO3gz7oFBW2xTQlWxlPtF6WmSIXUGJMwu9kCfTBP1vk6j2uV BUMA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=M9mWTze6; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.14.41 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140041.outbound.protection.outlook.com. [40.107.14.41]) by gmr-mx.google.com with ESMTPS id a3si123111wmq.0.2021.12.15.09.26.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Dec 2021 09:26:10 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.14.41 as permitted sender) client-ip=40.107.14.41; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jPn8tk14rJnNHhl5EvDEVA4rfKg+0L62WkZKNQ8U0HLe8WK2Eqxdc2pNYx0HOJURtGiU78p7TiX/dY0dLb+pjmGiqyyaIZRcgOZpL9G5q7Ryz2kfYtutLnOQzpwIBWkWMGdukC5ux01ImM9GUylhUZA1luGQV/zrPje/BDBEzyDM5LE8Lo0HNSvZXWaogW1KA1VAvwyDf1LG1slNCwA2CLzrm39sdSHUAMtLze1AEMt4HxScMWFTTY2aUzM2PogJbjh7Fvc/NUZYDnPMsxMxGaUVHfeMABj9D3gk6bEekEPCWRjdYHyHvP3pYMmw0vr6ezCN8jV3a70bI/QmSHU2vA== 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=J4cKkslxtxm2QvQnYQNXp4T4HIlXh7vcDNG+sybPT54=; b=UwGJHLTjrMAsYiv6JC+41V6I/XeapZYNmvOqTPP48LpR07tYIk/z63sUTLdqta5hMGV81Q7I2hjdwWATrt6BaUmKZH/RsvvAD3ARSxqpPTH7jP1v4WYsazLaRxY3JzW7ntUibNwpZ/LIVNuf+iVaxBZL7uabjtXVKEJ1iBofjAsWrVhXvtlvbzPe96fljh2HTR//0KgCyW4qy4VD2LwlbI2fQBLHq7Rr0R/OZ0mOlj+/RH8BfEM5OkgV2EwmuTnGEyswatewzFkE4P2vAubrlhwdZDGx6ozhjV5Hua7cxnPBiHNNhxJpNM/v1GSh6t+cmR7X9xSDwkyN33R/pMpHkg== 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 SV0P279CA0035.NORP279.PROD.OUTLOOK.COM (2603:10a6:f10:12::22) by VI1PR10MB1710.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:802:32::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.21; Wed, 15 Dec 2021 17:26:09 +0000 Received: from HE1EUR01FT037.eop-EUR01.prod.protection.outlook.com (2603:10a6:f10:12:cafe::80) by SV0P279CA0035.outlook.office365.com (2603:10a6:f10:12::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4801.14 via Frontend Transport; Wed, 15 Dec 2021 17:26:09 +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 HE1EUR01FT037.mail.protection.outlook.com (10.152.1.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4778.12 via Frontend Transport; Wed, 15 Dec 2021 17:26:09 +0000 Received: from DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) 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.17; Wed, 15 Dec 2021 18:26:08 +0100 Received: from localhost.localdomain (139.22.39.210) by DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Wed, 15 Dec 2021 18:26:08 +0100 From: Henning Schild To: CC: Silvano Cirujano Cuesta , "Henning Schild" Subject: [PATCH v6 5/5] classes: fix comment in container-img class Date: Wed, 15 Dec 2021 18:25:50 +0100 Message-ID: <20211215172550.27153-6-henning.schild@siemens.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211215172550.27153-1-henning.schild@siemens.com> References: <20211215172550.27153-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.22.39.210] X-ClientProxiedBy: DEMCHDC89XA.ad011.siemens.net (139.25.226.103) To DEMCHDC8A0A.ad011.siemens.net (139.25.226.106) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4cf0d033-e430-4946-6033-08d9bfeffbe1 X-MS-TrafficTypeDiagnostic: VI1PR10MB1710:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OPqu2tp1ppPCzzbQ95ODiuedwEsgFMNXT2LV6pxEMmBnipiBqq8rQc3H5SE6zR5hZJ+TfWAWQvqYWsf5I/hQ4+4XZ0/YmQYOkrqvAHzQpJpqSqUPC5EhSKHsn/QgIWRPc/wEo9tMfVhbGBp6wQcNzzlrob6qVwYR8rTVaPjzkbCcJnGbps5WdWmbQQulIaKesyP9bKr5qjaT4YRqufHPq5TULKgonUuQu8Br1+4cihUyzIje370wSUf8rUoIZLSUsLv8fC9IYFz2KGWwfygd4/WutJNhQgi8UwHSHuULtMaSJ0j9hGwAVmZp/g+F1I4cP9Xg7+sI5iuzyFq66FK+mhEWCnzcS/OeRUds46TtYNNCPXL+jSdyDDya94X30aNKuWF2rZy+ubSfchOZTmfJGfd5UYkNu+00xm1zY2GsmqWLC8FGv9yI/sBB8U7OHcJ4lokYDR4JGvsHAMwoIw/h/VT69lae2L/obORCY25g706pqHrImwJnEdAhXh5G6XPgkExIAXW7RpwtNz1enBmmZR5UJzvjcPwakU6NecGvpkBZqn3QQlpaX14Kbnw4xtmzi8MQ4gpBkKJnvz5C/YP/mvf0NV56Dj5bdwqyECv+MtHY8fy/T6uBtE7LT5xqSIdj3u47jG6jGhuG7axUG2c4ecwNTxVEdPy1iB504OCmdGWXqgTnnQBe2Smf39BWeLGM+ZIWq5+0FA1ewzqLR8gNaXLRajbC7NHOVtpz594TaQTILb0Lv6K+CuAZ1Nc4Y5xYQmdnuXvfo9zlwxk3Zw0cCA== 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:(4636009)(36840700001)(46966006)(40470700001)(70586007)(4326008)(54906003)(8676002)(16526019)(70206006)(82960400001)(36756003)(107886003)(82310400004)(2906002)(6666004)(5660300002)(1076003)(40460700001)(316002)(6916009)(186003)(2616005)(26005)(956004)(4744005)(47076005)(508600001)(8936002)(336012)(36860700001)(356005)(7636003)(86362001)(44832011)(83380400001)(7596003); DIR:OUT; SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Dec 2021 17:26:09.2638 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4cf0d033-e430-4946-6033-08d9bfeffbe1 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: HE1EUR01FT037.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB1710 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=M9mWTze6; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 40.107.14.41 as permitted sender) smtp.mailfrom=henning.schild@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 The task name is in fact a different one, the function sits in another class. Signed-off-by: Henning Schild --- meta/classes/container-img.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass index e26895a92b1e..322889a9eb03 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: MIT # -# This class provides the task 'containerize_rootfs' +# This class provides the task 'container_image' # to create container images containing the target rootfs. do_container_image[dirs] = "${DEPLOY_DIR_IMAGE}"