From patchwork Wed Jul 28 07:22:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 611 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 09 Aug 2021 17:08:01 +0200 X-Sieve: CMU Sieve 2.4 Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 179F808S019083 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 9 Aug 2021 17:08:01 +0200 Resent-From: Baurzhan Ismagulov Resent-Date: Mon, 9 Aug 2021 17:08:00 +0200 Resent-Message-ID: <20210809150800.GS28547@yssyq.m.ilbers.de> Resent-To: patchwork@isar-build.org Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 28 Jul 2021 17:22:20 +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 16SFMKv6032317 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 28 Jul 2021 17:22:20 +0200 Received: by mail-lf1-f64.google.com with SMTP id br20-20020a0565124014b02903a914ebbb21sf1190969lfb.20 for ; Wed, 28 Jul 2021 08:22:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627485734; cv=pass; d=google.com; s=arc-20160816; b=FLuW5Hi3rj2ZHWaxZygYvmXGfJKhjVLBkTj4x6H5F7tulx5c67WDtigi0fy3qYeCxv XwUs6WvS5YcVATEKgpttNf2dTsTY8v3xzsFI8XVe0HVoIviNOkVHVPsHMMxS4SGisZNd 3mc/4RCLCny5iTOAKvuj/BmE5V83oakdVCW2uvF7M8VnaUWm8V1e60/9NNdt5lw2vNNw 8AkW4I70SpDiZclLHY4+wasbFnWrP4mUDh/Wzz6hvq5KGqOITHM4DoUClkD8Qonvnu0A aEWPiEt4j1jldnxN8IJBV5V1qM3t7cCEs2/8REmiF14VC3KPiFrwQxYuYMA9ziuTHye0 BgVw== ARC-Message-Signature: i=2; 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=31tiU2yNnQmOb2MWzfGlatTO3gssULOy1dCXiS3Jve8=; b=dPKgH94FO3vy1XTPHZZR/arA23MUrbp3q5pGrVGzgwF+wAKl0LJ0jAkGO+ikHYj4R7 deMu0bb4VyBGZAl2dnNNy5qbtb+M/3TFEI/1qY4S4tCdHSnFhQkCt4Lc4fzpIrPY9vtm 9DwuPtGH+wQCnqqu8vAlQzhZBOC5NKCZynzDqlX+Bnk8oFJHeNCiEh6/9vgOof5Em2jp J32eqwMOXY1LOVZWC040S13TXBsvF6sflw0I4rABHrRtNYAjyxoVbkQS2tvrNNMbb6pO Hp3B+GulDxkKxFVn5P2I2rqkBTkm3+4Uc/zOzq4gr6PwZOG0mSkF/ZiWeXZVIDaRBrwA S+BQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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=20161025; 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=31tiU2yNnQmOb2MWzfGlatTO3gssULOy1dCXiS3Jve8=; b=p21ekXkxhLdT9ty6uh8xYE8Q1zI+4y78h62MQQktCJgzK5XwWoQbM1GJGnavHQeSEy PU+6aeA3gPQmablhFhULnQtxYCPgYSkZTkio+f4S4urgvRiXefF9fpnyVYHGC9h14Cz4 tKaxBxE87hATDt4vO+Yj5jd/6/CiEeSyH1SXgZiveHoQSVDnbgyOdKDJ+PoUSBofOl0y ajjWMy5rcoohxjEGMnPTCiakFerGJD0qv83Aajn0UgvvoV4MKgUPULKWbnrK3lLTFqaA 353ABtoKDVOGvgqK1eLEBI9gmJdQrE9sQuN/icg+YfaEdDgExIQ03qzgSb3wR1NOIkGi M8+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=31tiU2yNnQmOb2MWzfGlatTO3gssULOy1dCXiS3Jve8=; b=KfKCTjFOUDR0Q5jdV/f1boGpFW6mgO0blZhY8dh2+BVBax90L0LgFXDbnHRIJOItPW C1V3uTBnQIR1U3H0OX6LgVFiG+k8xjtnzsHe3Rq8EFDKnzzCMczTxfeyyteX1lx88fqm AwnbGfPQoVcNa3ZodkGnNngV/Xz/DzSaMDDY4VawckAf+RY3Kefo3BzH7CYF3b0x8tuj yE94NGxKukDtsRR6MBObVzQZ1L/dnirw/jHWz4WwJOZCwp3TKCQDUhdQmF6WuoXlEFva /+8C6c3dqUIpAcGxxQThT/w9F46t/tQ4YnHFAYiJ+thSjkFBQjUPcOuuR1K3itiYYtra 2wTA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532H2aq/T2rb3LBZRsBIjdN9nNHhGb+mV+USuEm8N+0MocikfzMh 2dR+p5VXKs0yv3CkwQTRCWI= X-Google-Smtp-Source: ABdhPJyj7lfmzcSR8clZJuXgp4IR/zHBp4oaFepJyEkWWXsbzESkqAogWfh8widRtgYCzuXaXiG3+g== X-Received: by 2002:ac2:560d:: with SMTP id v13mr105557lfd.518.1627485734649; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls2100657lfi.2.gmail; Wed, 28 Jul 2021 08:22:13 -0700 (PDT) X-Received: by 2002:ac2:47eb:: with SMTP id b11mr111503lfp.544.1627485733699; Wed, 28 Jul 2021 08:22:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627485733; cv=none; d=google.com; s=arc-20160816; b=ILWJh9S4x/OSDz7RD3Fhkzk7vxqBx+tptcC5NeyEjYMWpF+Qe3iHaMhS9D2CC+E3SK hO9IH8RxUDMUX+YYSvitdsDRSmmFCNnRhdx1XMyOA4qwXpUDCGxrU1LrR1/RfzENfFpZ 2rYzvSPlDjjuAzS83hQLRMSgA4MVP+e/yrNDWqVdndsdozuJswzYPgksrjDnMEaqw2lA V4ufTrQBt+u3wQGRYp/o5c31dcwlGtnQaQBB3HNEC0qNUAf/Zr6WmpXEaLNud0A3Gq7+ 2Jhd93lGmIbwpkjRREFb9VuuLeCv3IfD+e+50+OMDuQY1URxq3vGysJkd9SBzhEDDh/Y fJhg== ARC-Message-Signature: i=1; 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; bh=uU6qVCY1GUJohBTxY7mKLoLK2DMKQcgBBOkkj1Q22z0=; b=VA+vwPaj5tIc8eunHYlvvtE4o6frmB3V2rpvtuJM8jxVA/bgehWEpHtKd3EyYpi8E+ /tIxJJI06I8NDgwJoN+9L9ee/YdLW+D+I5BmzzC8EP/Pd06QrhP0hkXCelFg3PgAz4kk XUSGCe50BjR0KhV4+TY6SWYsrbE7e4c24CZHKKfvy+0bGriU8FqndUeR5NhxzmZGSGL1 tTXhp9CSpt+eVWaIE709dF6H1epEHPYHoDZAsWAaUiylMUgDR7kiXRpIWFZ9muupuOq7 iFAunoGZmHjmH2zjiyRLsOXm02j55MdxGMiEotNqA2ABG2HPCQMfrMzX2Q9oeRaCzAQt lW+w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id r190si13823lff.0.2021.07.28.08.22.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jul 2021 08:22:13 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 16SFMCeH032363 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 Jul 2021 17:22:13 +0200 Received: from localhost.localdomain ([139.22.37.16]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16SFMC2H022883; Wed, 28 Jul 2021 17:22:12 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH 1/4] classes: make sure container extension can run multiple times Date: Wed, 28 Jul 2021 17:22:07 +0200 Message-Id: <20210728152210.7089-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728152210.7089-1-henning.schild@siemens.com> References: <20210728152210.7089-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 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.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,UNPARSEABLE_RELAY 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 Jul 28 07:22:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 612 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 09 Aug 2021 17:08:05 +0200 X-Sieve: CMU Sieve 2.4 Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 179F83kl019094 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 9 Aug 2021 17:08:05 +0200 Resent-From: Baurzhan Ismagulov Resent-Date: Mon, 9 Aug 2021 17:08:03 +0200 Resent-Message-ID: <20210809150803.GU28547@yssyq.m.ilbers.de> Resent-To: patchwork@isar-build.org Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 28 Jul 2021 17:22:20 +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 16SFMKBR032320 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 28 Jul 2021 17:22:20 +0200 Received: by mail-lf1-f58.google.com with SMTP id i7-20020a0565123407b0290229c07c3305sf1207819lfr.11 for ; Wed, 28 Jul 2021 08:22:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627485734; cv=pass; d=google.com; s=arc-20160816; b=dKMBeH9kE3Stqp2c67ICdQRZzTWFWpwzExBw6hRXdmgkww9YuSTfxbPSS56uZj2o54 EB/KyClWKEkqkATZYcxWpID5j5pjV5BSb2atuK2E34rUT4DjkDB3ObcBCfJuffT4ubJQ fqTs5anH/hWVLuum6XUemoiTyshgJ0AvsnEfSpCknSJVLXHGkd3BR7xQbrYzAplM3Hbr Fnj85hfp1Lbf8ZLdnoqwWOKvtQ57E/d1/D8Var1emODfT1Tc3DyXXS3IAEuIARHTySjg WMrhVwK5kaeUKyIzx0aNVL90A+GPeS2JDlhAqscskfX35QJ4Cskb1Wn8lYBKuYYUZAQ6 K+4g== ARC-Message-Signature: i=2; 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=+u8ODO4m5hRxI+gatWmtEcyXq72/i8oivWzRuMBSnuY=; b=ybVxA/vr10VkCn3SNaThiRxZK+B3YYL+de8AjJUdsNoEACcwOBaf+EMb8pmxj6rRGP WwqR+jaoCqSOa+NO2O2H11tKqKYB7BaAQZ3Y1GmXsnk4GwMISGlR6pQU1evR/nhoRSoZ WAiTjbmyonc0xFCUHpN6YuqDmRlc9uW3BD/fLm5nKF7dPlF/VnwiXx48GfDp9K8oPC9T y3pOlflaCDul9u0gVdi6tGElaMWHVLV1zb/OnwTexLoql8G2YRa8PQFLJNiO7ZRrC4hf SibcwYKN5ZfuxjMNCwegl9EUU6e8Uc2dqzfglB/FIsAp0Y6ZdHfVXOw96yrNHl9lZ/pB vyJg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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=20161025; 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=+u8ODO4m5hRxI+gatWmtEcyXq72/i8oivWzRuMBSnuY=; b=qSlJBAQQnJ2847iPrG+ywWw2wUbtNu7e0Fobq7uBpGkdRnEbXBhyCpb8S+c0v7aZjV t69VmGQvZWuw6bqk1o76O3/dBCQ4M37BmK4xobLJENiLtyDmwocTKiuqagOnHnaZnMXD 6Tj0dfgzJni+uF6eynK5PFteQA/5HJiwe8dSUeI3zvrprbSS0WQw3XjJ56C0k7PIWXOE YTqS04f5SNhxr5huxKrdIT7e8GufqNmk9G5lhGKLtTTGq+ZYdut6fI2TFIVRv5dbvMvu 2Ae65ow2syLjZWFvnvKkQzdBb5MKkBVAPRILDlkzfc1LFzGA96cPIIdVRVTA4N8woa2X ryPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=+u8ODO4m5hRxI+gatWmtEcyXq72/i8oivWzRuMBSnuY=; b=VhGtKWw3wRZzItyR8/ATG4gVbjK4omSiYOg8104R0Z83IeNrhiq5jJ9ayoUBaLpPt3 uYiuJ3LsRLIYtjTg4d2Nh/TS9YMlHd75ol6eOYiZhvWOeFHcdpEWJXPuQ+UFTcWK4UXj nXQjIgeIPRjKCNGHEw+5jJQxfaldjGkqFqYJ33exDabIqdXZ39PjpIpP3jKMpkWq1BOZ BquhW4DMcXHorCWvIRl0FySGYWfVCVLKgxUpyM90Q99gUpThVFZiDP2kQY2Ou2NV01mK 0uVmYyASxKieoZq22ORpD03coRsOQIKnZdMvbV8vYVtT76HelBnjavqzxApaTuDxPkkE 4k/A== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532K1k/KGF0juoPiYcoazMOGwnfbnUPXva1WeyPuYSrg8l6jSfrG llwewEHBtXRQJU+KracOy50= X-Google-Smtp-Source: ABdhPJyBecp3n1b6cIv1bfSecCUdhL7JZkVwWOeQL478Pw20bhP0/DJNlI/CMRxwjPOKMjFadTircg== X-Received: by 2002:a05:6512:23a7:: with SMTP id c39mr76727lfv.603.1627485734748; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:4146:: with SMTP id c6ls2100669lfi.2.gmail; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) X-Received: by 2002:a05:6512:20d0:: with SMTP id u16mr110372lfr.356.1627485733956; Wed, 28 Jul 2021 08:22:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627485733; cv=none; d=google.com; s=arc-20160816; b=XPABKcY6tPBifu0ce9US+L2BI8jzFtEq5itAinzRLVhwbij6vCMjR9R4/t6FIrPXgD ZZvnJ+qr8+uY/HD1x93EEAMWm3op5Z5PDje0kPND1O3jAuMsFveU6h3+xQ9R4qFdBkbd BEQpqykc0ytLMU/kky0IVtuH9EYFubp1uiZ9Y2HCh4wI+5J1bDpbQaE05QSf/2t9aCgA 6pgHbgM/rluYBQ7EgBQZWVGKOloTan1GRvFEU4pXyouVH4UDQ3QDLsZs942+1YoghESL wMZocV/wYSGvqafXtsb51wj3SQIwgikficXiweR1/Y64X3qajYdP5wc0OOveK/RWtl5J 208g== ARC-Message-Signature: i=1; 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; bh=TPTUhZN/fsHUH0f6RLjF+rxpmRgPUQsN9xCaial/l2k=; b=yw1cvt2aU/RVHuho4dWkKMtRj2ahaZdZGgQJ16Pd8LjIRDGDOKwgAyUmxNXpyOIhWG bFuFGES4V3+YJ6tMXZnfE7KqZ1xXMrnQX/WWed8uZjyU8HUrHuCtp+aPhiKm4BCkqH5x qPrN5Hh7lbFQFQQFoAJ8BBnzjxjYJ6vZtLqrw8FMbJnhlw9nBdFNHIccIcamBvWTvyO3 60Z3U43URUBMb85Hu1DI1GmHzA98pnh9iy5EpWsMq6YiPyzZ4jKrQ1BhV/U3+j5221gN kt4xwhGvc5J2LmhZFe7FafUhAv5KGtitNiACB4wnKUbLrIRuKkZqkxO1mNLr+7Op4ATE cJ+Q== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id z24si15338lfq.5.2021.07.28.08.22.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jul 2021 08:22:13 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 16SFMD0c014036 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 Jul 2021 17:22:13 +0200 Received: from localhost.localdomain ([139.22.37.16]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16SFMC2I022883; Wed, 28 Jul 2021 17:22:12 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH 2/4] classes: simplify tag handling in container class Date: Wed, 28 Jul 2021 17:22:08 +0200 Message-Id: <20210728152210.7089-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728152210.7089-1-henning.schild@siemens.com> References: <20210728152210.7089-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,UNPARSEABLE_RELAY 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 Jul 28 07:22:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 614 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 09 Aug 2021 17:08:20 +0200 X-Sieve: CMU Sieve 2.4 Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 179F8I4b019121 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 9 Aug 2021 17:08:19 +0200 Resent-From: Baurzhan Ismagulov Resent-Date: Mon, 9 Aug 2021 17:08:18 +0200 Resent-Message-ID: <20210809150818.GZ28547@yssyq.m.ilbers.de> Resent-To: patchwork@isar-build.org Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 28 Jul 2021 17:22:20 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f55.google.com (mail-wm1-f55.google.com [209.85.128.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 16SFMJOt032316 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 28 Jul 2021 17:22:20 +0200 Received: by mail-wm1-f55.google.com with SMTP id a1-20020a7bc1c10000b0290225338d8f53sf1048950wmj.8 for ; Wed, 28 Jul 2021 08:22:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627485734; cv=pass; d=google.com; s=arc-20160816; b=a4H+hHTNrwiuw8rcrXCL4tHKqUOYxHSmI6w0cw5CyYaNH5h3/M/+jkBvBmP9cl69kl m8NipXbVPXnEHtvnRnorQx+ZyxCrZ/e0M/zR8n6OoHFfdJaZYbMsjf9ZUOsvBSudbvSY fMva95Uvh2m/+lwPv3S/Z5GBCj8uSQCHClOSP8LeD0t6jRhVSVJNvzOrhbRwpFC57VyV 0WGqzTUaBFP/pdd+gDuLuo35l17RKb2jMh+Hc2XM4yUXMuBbA4xA3acIj3czvND3Pysl KyOdbCXHDh8Icf6Cih9lf7Hds3P85J8SRms8KKCE8imZmgfB6xZ6cqslDQyG9MyYiPgn H4ww== ARC-Message-Signature: i=2; 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=bwBNCVL7e//3K6nglPs8I1mXlrNNP4OIH001EmedrpQ=; b=d9XFrmTAYVMdnJoDbSIU7hLqF2UoiTsp0oGZh1MM+wW6jP4pFytn07q0MMBJQs3yAk ZMlWvfjflg3qSG8/w/uNlLMeqA1uJC9LVIjnQJ3GN+qU/48bsLtIdOyoD7uyLzq1Q932 FcH+QOt1hEDIZ0/ZA67FnBG+JPoZ0pZU9CsBBc37Nw3v/84gjrKgamyLmEBDVFF926VN UnGBHsrh27Dl7X2jup7+FkZ9/DZwxL72eY8ATcxENg7AP2Tq0rV+H3sYD74yElP3qyCz pL7+neVXWMXNaQNV7luXhtWOUeRZMKqmFBFlg/k2KyjzXZdq+0ctM3iwSoqIK0B8sXAr K0Rw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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=20161025; 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=bwBNCVL7e//3K6nglPs8I1mXlrNNP4OIH001EmedrpQ=; b=rkyvG6mLdmgB4bnF/3BUYCAMcrSwzUllKuIfJUcS1wvlibYwKRtJkilVz0kBL0RlPU vQA0VsfUAJ0PTl5DklqVIapPkevnmqIbjkAyHMCoo7ErjHnUx4BHEt1eyL7WjjqDD2Zc +ggoSjODZDbJaRF3Tv8l83EMcwO9WZaum9lnP9cHe7eFRIKLc5O5UB8K2oClTbCTq47V DoFDXiSritaazMKIbO9g5mmVg9SmFuhgvowllgxfKblRGsc+rxl2DckYInV3rjeupiiK wYn18oIgptLKlcAhhgX4YkkGhixH0YIvisB9jIXZQzkjfcXuRRsiXQ08Ah+eEfr/fClK U2vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=bwBNCVL7e//3K6nglPs8I1mXlrNNP4OIH001EmedrpQ=; b=EYsiqQaaO0ZxROmszcXTkRVP1I3cMd/WAjsP6Px1ik0VQIbvWUyBWNFaKugKWT8P5v TMgrgqHv3ea0k+Sy9dn16qH28Mh2NnNxxPPu4dfxpgilAUVdtbEeD7Fg7QV6cFfF0npX TbUJHIVQaHAHFvFTggm9lDTfFCkHJ/itRXqMPPq/CPsMbyrb8ZhPMSWxtSWSKX80/rSW F2IU8Q0Lg38uQ8jlT8HfDOcxGQQsnl8i3qsxFMOgmw08hDTPyz22tfBhZCiapCwv4DMb zq2OD7WEzLVeeY4V9lyTKVnEHM3wTLUcz5XW6tiHkbwC9TElZCJdnImPXmciVgmAjHzi xZAQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM532MWv25w/7ULRY/S+Q/RK14lI/Ew1APhEEERJXSGGXq8hcyLQv8 JNNNZ6hm5cBTzjowuhUwsqQ= X-Google-Smtp-Source: ABdhPJz4NoZVz5c9fhdQkbwhj86dpjTCW2W/o3iEtoNa/sCHe42pZYOiv5YCulEDfzBsKTyeAzC6SQ== X-Received: by 2002:a5d:4312:: with SMTP id h18mr31476042wrq.170.1627485734804; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4dd1:: with SMTP id f17ls510516wru.0.gmail; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) X-Received: by 2002:adf:f704:: with SMTP id r4mr14774051wrp.389.1627485733994; Wed, 28 Jul 2021 08:22:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627485733; cv=none; d=google.com; s=arc-20160816; b=ASkVq8Mlktl7+M9sFvSW9LOtYtby2Dk59xlRm6bsAwco+ZWWGhiIpZ9rCFii7yDcxW eYT6AfOAD5wPqvJq+3pbri2Z8UQd9g+Y69Eeq26WRYsW6ICYFjSojD4bp4Je3mH6hwrm +OEXBHgsVDBV+wSX2/6/Ymt7qq6m0LF0xFi6zZJBe/fQD1CxzxwaEXKOISnV/eolSFWy Y968geVp9N8bg1ycZXEOPdaIu5gQwtQB2AtZ6fqGxnWnmFtQkCRPB4DaixDhYY2c1BJR Q7oSm/nxrrmlY+S/xbSYqaAghjblvFIFf5DhKEJgA6idSTcyFeuQa5Zm9NqfP1gXwlyw lxOA== ARC-Message-Signature: i=1; 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; bh=r3EpWeiwdPDrGdOnOlkBmzL18ER4PNpnx757bHY2T5g=; b=R6j2H4DGV/6e7UwyVtchZBY0o/AIaApGD5XlRo+4SSPaQVfYPN7QdMETbyDz6YH3Gv 2UZ1GrmjrfUWTyvWx+mxa6tbMTtVw1IHUj1jeE8SpIBosJKOy5sgZ/pHiHBcDBubYlJG REpFqBN40ryzDNHug35p20+zB65x+vUfqpKoezWcLQg21zG2uEflUMBSTsX5l3dCgZ3t Q45RMpDxWpTXjzCS3AkiDdTiMa1YVw1EONlSmFniJ+qicj9iLsRI7117UiVmEs4SDg4T gFEIp7pWb6bBIVxGRVjDDaTeeocg+Tc2FaxaRdeiNemBXQQqcFApX6j6GTzqkAm7n0X8 vXLQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id g145si390708wmg.1.2021.07.28.08.22.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jul 2021 08:22:13 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 16SFMD6A014049 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 Jul 2021 17:22:13 +0200 Received: from localhost.localdomain ([139.22.37.16]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16SFMC2J022883; Wed, 28 Jul 2021 17:22:13 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH 3/4] classes: allow more control over container image name and tag Date: Wed, 28 Jul 2021 17:22:09 +0200 Message-Id: <20210728152210.7089-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728152210.7089-1-henning.schild@siemens.com> References: <20210728152210.7089-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 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.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,UNPARSEABLE_RELAY 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 --- meta/classes/container-img.bbclass | 4 +--- meta/classes/image-container-extension.bbclass | 11 ++++++----- meta/classes/image-sdk-extension.bbclass | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/meta/classes/container-img.bbclass b/meta/classes/container-img.bbclass index 79ef3e8d756b..9928a58ef53d 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -9,10 +9,8 @@ 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..43b67f9d864d 100644 --- a/meta/classes/image-container-extension.bbclass +++ b/meta/classes/image-container-extension.bbclass @@ -6,15 +6,16 @@ # This class extends the image.bbclass for containerizing the root filesystem. CONTAINER_FORMATS ?= "docker-archive" +CONTAINER_IMAGE_NAME ?= "${PN}-${DISTRO}-${DISTRO_ARCH}" +CONTAINER_TAG ?= "${PV}-${PR}" containerize_rootfs() { local cmd="/bin/dash" local empty_tag="empty" - local tag="latest" + local tag="${CONTAINER_TAG}" local oci_img_dir="${WORKDIR}/oci-image" local rootfs="$1" - local rootfs_id="$2" - local container_formats="$3" + local container_formats="$2" # prepare OCI container image skeleton bbdebug 1 "prepare OCI container image skeleton" @@ -42,9 +43,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_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..fa15b588068c 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}" fi } From patchwork Wed Jul 28 07:22:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 613 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Mon, 09 Aug 2021 17:08:14 +0200 X-Sieve: CMU Sieve 2.4 Received: from yssyq.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 179F87T3019104 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 9 Aug 2021 17:08:14 +0200 Resent-From: Baurzhan Ismagulov Resent-Date: Mon, 9 Aug 2021 17:08:07 +0200 Resent-Message-ID: <20210809150807.GW28547@yssyq.m.ilbers.de> Resent-To: patchwork@isar-build.org Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3) with LMTPA; Wed, 28 Jul 2021 17:22:21 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPS id 16SFMK4W032322 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 28 Jul 2021 17:22:21 +0200 Received: by mail-lf1-f61.google.com with SMTP id y19-20020a0565120453b029032696702876sf1225066lfk.5 for ; Wed, 28 Jul 2021 08:22:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627485735; cv=pass; d=google.com; s=arc-20160816; b=Bj0yaRd63Pr8IEY7n/+Ev7H1ArQoPPRwBwbiP8eOgAHa1adhT+YxeVS8eyp+L+w/Af j1DwIE1IH8A8XhJSIczVS8M5Py30TvFhEfh1n5dPsJi5Z5unZNUuSkLBMrWIH3mbyyiJ 9vZaGC+0byDxtyfxwXMd27zjjMfhoY/x0kKBXgRuJg/z9czhR6qntfnt9O08QOAQUvm7 mpGAG1RJMZ8KsG5gV5h0O/AWz+dksFCxpXJPCf7o9pizQTzzV/uMBQaP3GGLd77NraVE +ASqqd3+5PgyxdRYSj2RD8le6VgUuNSarfv5gj1EtYd2Uz7n4/FjRqrHBW1XzFq8uU7b SxoQ== ARC-Message-Signature: i=2; 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=GYKbOtWkdT/W4ngsPsXp2I/aVXGgu8lqXoMoTrzGY6A=; b=l9OeTqcaD8sFrZYPLax7YhkbXHoA9U7ujXhuMTcsuOgWvgReW6xDb4MNqA/ytB15a6 MuNajBgiESbjRmTmVWxL/qIeX4BQZuEPCql3xN4l4IZszPT0CX5PhgIakZ3QcDIOloHN upQ4zXvidk8qJ7yPRXFMWq5oijDI8yHTfVMLIVjKUlXZutCyxA0T4Ewv5OMfzdmT99E9 1TMvz4tSuy166yB4AR4rWh4kQJPKJLqL0hVFAkCX/Qn/r8Cy2FakDt4YC5El07ivl570 v64l7Ad+Yf+iVzYnwnW//MnrWV/DDy7PUe2Cv2llabOibdzgWQ6EZ1qAfVzptd7oi0t2 njtg== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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=20161025; 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=GYKbOtWkdT/W4ngsPsXp2I/aVXGgu8lqXoMoTrzGY6A=; b=ZZnEbPGl5jHtdHwGkTl+6BOOLJG7PiIQJWiqnkejklau1jD4tWJeXUwPpEtwCIVDrF Peq27j55+c+PjHT2R3VN8n5V7BBhy0wA3mx/c04r0QQ/wEWAyfAQTX2knGKPe6U08oLe 67uNQ36mATwOaYpqXu7loWqcrFV4iwfyo67lkRIEHhNnjeMfhaoIHITnX/X/KCvhURuJ 5rQvwW81bFPlaWlgcfmDZ/FIARhU1j2IBCKOJ17sqZd1hRYzx7TppfZIlPQxTCGoY8hE oRjSnrObf4p8AYUIRNLpXwFZxsThUjIWqfButDcpoGwDrAQKPkxiLAkT2GIqdp0fqQUZ GcoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=GYKbOtWkdT/W4ngsPsXp2I/aVXGgu8lqXoMoTrzGY6A=; b=JXbQtgPUwgNKvDeHoQwKvzj4hL0vJA8dpDjJdU/klTatwzBsWiZuK8AVCnOhPmaSdV wReBZq56Lh5yrVMLzX2buruHkg4NUmgChORS98RIdhBc2i5hDK4J3C0mqXw274boQskA Eqk9nFDSUwH/Di/UZksrMemhfxMOOEakzKqhW93FIfwzTMOlYGrCKVxsmh1sxrkSnxA0 thAeTqKXU2a+sxNwrMkGAAPkRzlhnRJ7NyARZi8UdQtc9jyZyxZgzcs1tkxpAD1FmhDj 7CzGf//ybQFrglOUgxvD8oXNHpURJx4ROCg73aCJDK+S2xq5OTCWuYs5WZAS5bFw6TBV EWnQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530p/fjNfIim1/PGho81sIiw28PiaKihWEpFX/X8K4moKryEixlc zwaBZ6zwDn71oyDyOy8hEGs= X-Google-Smtp-Source: ABdhPJyKtHnS87VtFPtHFxSp72d9dRmRFZpJ+o0V8L1zednEBNqHstRP7XnDaiDvIPFRNPx7VnUzrA== X-Received: by 2002:ac2:4890:: with SMTP id x16mr101851lfc.15.1627485735710; Wed, 28 Jul 2021 08:22:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:b4b3:: with SMTP id q19ls447898ljm.0.gmail; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) X-Received: by 2002:a2e:81c3:: with SMTP id s3mr243717ljg.214.1627485734732; Wed, 28 Jul 2021 08:22:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627485734; cv=none; d=google.com; s=arc-20160816; b=pYTYbi0M3sUDoe43WxRZJBZuCExjiYzsHqBM/3pp04p7oaaOEU5V2tCfh4krXrlZ2A +XU+U4ItUz4xIDLii/r56mQY8LhMt1eH/QW6/ybygMg+O+cZeM3m1ZDZ41xs26j4Ljrb toIPqMh6yrQWdL/2q3eTIuBZLZ1MQu1RSpseB28llfyzAHrYf6xHAI345mATi8G+KzvO QOcmN+HWKAsR4Re2ZIfW0bzeveLDwIcX5t4qrtEiaahQ22eTKRLIvI21VWzCmkQ3nJr6 8mzqEyH/w4LGQCX4/kEWBl6a5F7CxLGjnN0V8/KzJDUqupML2NR4eWgyWiGNh6SjzfZq A1TQ== ARC-Message-Signature: i=1; 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; bh=EnEg75bRG0tD2YPjQli+mnPVwFoBCfClUiaP61syduA=; b=XjDz7fnmRaDJv8+AEJ8zlAlWl0Tg8XJjddvFCu1BZTbuqOhLxEsrZh3r+fFoCTvMdc xXKbYjh0JN5/kbS9OZXgDH01RFL32cEGBSm6By9966FTR/7OKeKC9Lj6QxH7rP6sOpLI 9xadur4wdGzZ9NWjrUHz5W7+44L1AvYqq4htXAvYkdOG1PqaHYaxyZ0n78DSqcV5jcCB hM1bCo7pbrtLoGnoOHbQU/vyf8OmgAUjw7UQm6hUK05FpQqKxnqJHPcfDY6yORUCMoUn J0urkOzkXnDXX1p8Bi7jp7T4CFjxNbhpq364CtPXbqQ4JKTwTTNWFys/9lcZbfFRmgLt z2yQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id v1si9529lfg.13.2021.07.28.08.22.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 28 Jul 2021 08:22:14 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 16SFMDqJ032250 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 28 Jul 2021 17:22:13 +0200 Received: from localhost.localdomain ([139.22.37.16]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 16SFMC2K022883; Wed, 28 Jul 2021 17:22:13 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH 4/4] classes: fix comment in container-img class Date: Wed, 28 Jul 2021 17:22:10 +0200 Message-Id: <20210728152210.7089-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210728152210.7089-1-henning.schild@siemens.com> References: <20210728152210.7089-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 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.8 required=5.0 tests=DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,UNPARSEABLE_RELAY 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 9928a58ef53d..edd0e7f8f932 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[stamp-extra-info] = "${DISTRO}-${MACHINE}"