From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a1c:9ace:: with SMTP id c197mr16102760wme.170.1628179793306; Thu, 05 Aug 2021 09:09:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:db90:: with SMTP id u16ls801939wri.2.gmail; Thu, 05 Aug 2021 09:09:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwjbqiMYMcrp6pbY/n+RtJK80Y4tE94Vagu6if6ciRo7QR4bT3DBEmdv9Slq5D4yCnSCNbF X-Received: by 2002:a5d:4f86:: with SMTP id d6mr6097278wru.271.1628179792436; Thu, 05 Aug 2021 09:09:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628179792; cv=none; d=google.com; s=arc-20160816; b=OF+QzJcb6RL48aOzIZE8Ec71d8O5UY/qRfR0pXlgZiRSw7FeBjLqYekTzg1DyyV9qZ yVSF+9Sz916OANSitKZ7ilhlKnOvz0w/SpsLFML2iSSV83mokaWk+mvdUfdkabOe2m8O X8SmM9JzlzZFfm4nmz06If4oZ8Stm9SkuItU9YcHdlaL7majSSmpUHORwATZvZoyNrcf XQVR6KSlKpbQKu+k0rphiko/Nx9TfINxMX3qdrbE1vu3dA/SOWPbK6wepbF1KoVtQTFO u77lgwRQqt2fN1IyxCA8Boo9cb4dUR58zh+j+4tdJJ8G0FwTvUnSUZUq3jBdAkdKPTh6 Og1Q== 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=Kq7C0Q5cw+rZh6HDYmdtEcVnGNsgmxlXvWtazxScc/M=; b=DuZ7D2skbQtyoe7L7mAU5qzWU2XbOT9JSHcyqjB2FZmJHt8Jqu30BAdMGzj3lxCquv 2rI6FyiGDyMIk/PiUREQEqga0YeQpLNzALbX1KS0NfJ0sJ0VEQWyJZpVb+mjU9P0iacl Ajhhme4YSHiP8yHNuP1U+kzs0xC+GTxNIo+HcqA46zmLc6cDcvhSOpdVwtoxxkXLyykS e28gBIuEZ2YAKiiqEHQmXD9X3hZsTB/oJzvBuBbSIEU1Ghllb9bPJJjF0vFZfugzAdZo a9AwpO9MseQ4Cp9wFYCdLv+iVjo8VD6QecHfN+/mHyGVWYkF9D5ZUDnBbTRhR1KJIy/+ B8zA== 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 Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id l7si358941wmg.1.2021.08.05.09.09.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Aug 2021 09:09:52 -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; 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 Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 175G9pOm003335 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 5 Aug 2021 18:09:52 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 175G9pQU002372; Thu, 5 Aug 2021 18:09:51 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH v5 4/5] classes: rename CONTAINER_FORMATS to CONTAINER_IMAGE_FORMATS Date: Thu, 5 Aug 2021 18:09:48 +0200 Message-Id: <20210805160949.14790-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210805160949.14790-1-henning.schild@siemens.com> References: <20210805160949.14790-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: soxe1NpH/SPe 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 27240c577f88..a965f6b3c06c 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -296,3 +296,7 @@ not changed (uncompressed executable) but now it is named correctly. ### 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 e5c07bd41fc5..e000a71d47f7 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -255,7 +255,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) @@ -277,7 +277,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 @@ -286,9 +286,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_TYPE CONTAINER_FORMAT" +export BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE IMAGE_TYPE CONTAINER_IMAGE_FORMATS" export IMAGE_TYPE="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 9928a58ef53d..174502ddca7a 100644 --- a/meta/classes/container-img.bbclass +++ b/meta/classes/container-img.bbclass @@ -7,10 +7,10 @@ # to create container images containing the target rootfs. 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 f4d648674b0b..a5ffd3aab56a 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}" @@ -44,7 +44,7 @@ containerize_rootfs() { # convert the OCI container image to the desired format image_name="${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 -- 2.31.1