From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a2e:8e96:: with SMTP id z22mr3587122ljk.117.1628179045075; Thu, 05 Aug 2021 08:57:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:a592:: with SMTP id m18ls991100ljp.11.gmail; Thu, 05 Aug 2021 08:57:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzn0kUOL+YqEYDK6oYRKrW4kL3w8pncAAaRRGybbEBI+mXn5oWYeUYm1Od5N1oaUeF3EtPn X-Received: by 2002:a2e:85d7:: with SMTP id h23mr3669408ljj.279.1628179043975; Thu, 05 Aug 2021 08:57:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628179043; cv=none; d=google.com; s=arc-20160816; b=y+oWsgAWm9MzsRRcFUdHBrdRr6vWH2iR2bXAsDtRxWThJblx0vTO947A9u+2FyC4Dh LEhntFAu+FhIQ83di38bgMASdCi221LaMEtIXEKAIpC7cmQXfz9/2LcVUurz+FuQHAjd uCm79Eerbn+VqG52crkLOHtL4qT1rmplvkrVRecapfCyvtu6tVNRzFo7egJkSUQ/r97D wcXeTr7cAipxF9uOU6qD5mILJSV6Fe+F7jAud1OHQDF8kh97KXjFLeyd8hcXOIAj4KFC DSH1zKYHpseLgUF/5tYLp4t8ws/aXb8V6aXPXW16FOmdwki6WV7BBriIIjwNwN5XCAPo 1mmA== 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=6faTC7a09qZVTZMdEkgbOlupo/AJd8rctyrM3Z0MdAg=; b=OVABTarGi4zBko4OTtbPSig3qRAB7aC/95JEsEHI400eWFIYL7cQjviRHzZQpx2au6 zMd0eqn3zd7CER+fwPKdW2ERhxmCyPR0hKuKO8WK5ZvVe5LT0dYlztOcK4RpaBrcASph 6kQ2X0tgGDS5ETtxGBa2ROXFOIY4xscP4pm+SydIBpcMH8yHKU4H2iNQnip2/HEUKc1v 8IlL4r1urKCfg8pjHSGNZUl/ZjDyOKkmQIXNavYNq9xeziQahoy3syHXt6HXRP0lCqox YJyNuyIMhKTXyzvkP/66kg0VOouvWnHgdHYiMMLhMB9PjqCbLYE+SWgQ0Y1vM8LjFA9s z2Vw== 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 Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id x17si258729ljp.0.2021.08.05.08.57.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Aug 2021 08:57:23 -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; 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 Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id 175FvNQ9010772 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 5 Aug 2021 17:57:23 +0200 Received: from md1za8fc.ad001.siemens.net ([139.25.0.59]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 175FvMeE025489; Thu, 5 Aug 2021 17:57:23 +0200 From: Henning Schild To: isar-users@googlegroups.com Cc: Silvano Cirujano Cuesta , Henning Schild Subject: [PATCH v4 4/5] classes: rename CONTAINER_FORMATS to CONTAINER_IMAGE_FORMATS Date: Thu, 5 Aug 2021 17:57:20 +0200 Message-Id: <20210805155721.11872-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210805155721.11872-1-henning.schild@siemens.com> References: <20210805155721.11872-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: w3pVAAB6AUuh 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 a698eafc8843..d60588e55e7e 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 "TARGET_IMAGE:TAG" when building container images The "TARGET_IMAGE" 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 cfbc5f2f3786..8040a991f280 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_TARGET_IMAGE ?= "${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_TARGET_IMAGE}" - 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