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 }