From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7041981831189626880 X-Received: by 2002:a17:906:1559:: with SMTP id c25mr7793864ejd.31.1639589171547; 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-Google-Smtp-Source: ABdhPJwlLzqsT9jd8xOUW6+5Z2xAHR1a/zeVXAwYrstFV5aQR6IEKTA00SJsiesAAKe+ilKp1sA7 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 Return-Path: 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; 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 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=40RbBwFrlM1s/yQX130pgOjxmeub6+6Ojq/M65QNGnQ=; b=MNAZd5tTMH2TB/Q4b0h7k8ieDlKZleI5vhUnq4vWRVQQpmvjC8nwlLByfVCdsWAUoWuAOAAuUJJa9UcM5aStH9WufP4pt8YUhZnXBC2HG1i1UVrDkTq2Z6++UXEP3bj4VOBkDJ97SWJjkNnxm89kD2E62413fdU/nfV4DEdv7YIwk4qzag1okjKfXFLyWvjPsk+bPVUOFS1DgmBnVAiqXWg9c88mr0L+N/Do9adh15yPg9nSF3+ScSpn2nVb/CW1Khbk8oRLW+e9w6r8F/anl+Cer21cNyqDxpAx2q1k8uFt+dTJOTHXeg6bxMTn1HqjwRctXCTRm3nWnuR4MJ24tw== 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com 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-TUID: qhDeIJsDRMuo 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 -- 2.32.0