From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989998000320806912 X-Received: by 2002:a05:6402:550:: with SMTP id i16mr18960324edx.177.1627906620300; Mon, 02 Aug 2021 05:17:00 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:3b4a:: with SMTP id h10ls3983006ejf.4.gmail; Mon, 02 Aug 2021 05:16:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcjeR3zuG/5bP+TeIYf871930NrGGEBvLFFS61E3Sp9/Cf+b+TllZrjikO6rx//mvBkiXJ X-Received: by 2002:a17:906:c08e:: with SMTP id f14mr15037958ejz.380.1627906619297; Mon, 02 Aug 2021 05:16:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627906619; cv=pass; d=google.com; s=arc-20160816; b=fAj3iZXftoytSBZuFyvDDmsss3/hi7qUYATX7XZ00jtDReaeRxMWr03POw09Y4KhX2 u1ENZ0GJzP/DKfb7pnH4tUdHr/9yiCeXltyg3tmol+bCCFDd2ROhx+vN6YDQrORRplUu Vj3hY+8Hzf0xlK6zKXnkXpHJnjRB65uH7NYh8Ko81WzzcqSlndQbAftkTJmzrgNY4twf gqOH9AlFJaOZzTBbXamv1vlv+X1NimOrWAzDO5JNcbSPJEx6uApMt8Le9x4cs41h9gj/ tK+l8xWhtdLHWo2B/Ky/69aqHBThZQ53EvIYMPsDENr73lBmfufgXB3hfeHgwvFTKfO9 Afpg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language:in-reply-to :user-agent:date:message-id:from:references:cc:to:subject :dkim-signature; bh=DSAPg5HWbN5+QyksuySIoRHH2o7u53ypCrdGCZTo/HE=; b=uhlpbQd2wcBKOcoP2yrxtPINejLJH+Cj7XiCsKOMhzA9LocAVUm603SeJYGGk6uBzZ kYyTPWkicbDYOUxaJAmuNTmQbmMEJLx5O0QFD3DcTPVTbLSAvICGYbZY/u4qxRwG3L3j wfYWJ3le85TXquOFxN7YNW4JsKXY5Kk4PrszJTjwTUrT1QNuawcTrtSYXfV1triolLmc oA3nFGuop7idYZ1Q475Anrsd6gN8b0JiU9+S3ZDtiW118m0XDBKk+Ft/hAy0t3gZ2tOk UNCiX8UBU8/jDQRy8bTbUqaGK2z05yXh/+auv3qEMo4ms3TgiRLOi2eNi0fLvvQtvdpQ Inyw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=a2rxEh9F; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 40.107.20.84 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2084.outbound.protection.outlook.com. [40.107.20.84]) by gmr-mx.google.com with ESMTPS id h12si331847ede.2.2021.08.02.05.16.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Aug 2021 05:16:59 -0700 (PDT) Received-SPF: pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 40.107.20.84 as permitted sender) client-ip=40.107.20.84; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=a2rxEh9F; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of silvano.cirujano-cuesta@siemens.com designates 40.107.20.84 as permitted sender) smtp.mailfrom=silvano.cirujano-cuesta@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=eVxQIh4u3iK5Ayc4IjP6kI07jCmZ4i9b7G9SbB55qEjPjddcjzfkSyzMwocdM2IPjR5Zmaou6Zcun126Ic9p1MIIHP2hWssh/i7Ng5PM+B6ZPI3PxiyssUs0XdHSDpH3xRxf1elQrGW5xpydzgKT2xzPcge13DeEIfoa9dnlASuDjRCNtPyUPl/FYDSlVCubV4EPh0TT3+T507Szc4xp+pm17+yuxz0wslrKtZEH7zqblSmGMtDi4GURWysVZxwZ1Kz/7twfsIG1hu2+fVnDrRM1d8ap7LYr4qkmE4WwzTvVQ2G1yelkUfqjYI85WqbtKkKNOmhowGBlOAqY/YzKrA== 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-SenderADCheck; bh=DSAPg5HWbN5+QyksuySIoRHH2o7u53ypCrdGCZTo/HE=; b=g8TM5TbVNKPz7PaCRggof4nil+nDdRpvt++wD+0Ym1EiWmsUsrN5ugiUr7nbAJkvALbagEsRmDmvZBnvogZSQOhi6O0/qK16NqNBXLgG53vXurcjHFAQK0xVlDWJOTFF28GK+l5YetuVSu8XJSTkqCgnzVsAYMG40OYSzPSF9SYWcfrTSSF+Oqg5PtaUH1xqYWje7SAgUgJKZDKw1jhytd3fwCIKUT+mQ+929g1LScVddz4UVfODgsNQSzTa1xrsk7GxfgyKApoJq5lxLXbXyqRhA+AdJ4+ERf6pO3/xsrDnHA1Ll24MwlzJOglAgLYOIIhhf2YsnNe53Ubo/SR9/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.onmicrosoft.com; s=selector1-siemens-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DSAPg5HWbN5+QyksuySIoRHH2o7u53ypCrdGCZTo/HE=; b=a2rxEh9FWfm7sLjMefNOOjqxwptTT/tVCcJMGSpvTcMQIri45dJjroLibgfrDFsylrlNXXmza9EfLp0vAkSN6ah7mnVM9/XAyeFxlH/ERq6wbgE/5YpB3kcv7nR8WOk4eiOv126a1QmJlGKBNgIS4FJw5zie/Ck/5Knd5KfpIxM= Authentication-Results: googlegroups.com; dkim=none (message not signed) header.d=none;googlegroups.com; dmarc=none action=none header.from=siemens.com; Received: from PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:ab::7) by PA4PR10MB4336.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:100::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Mon, 2 Aug 2021 12:16:58 +0000 Received: from PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d6e:ae99:c95c:83bd]) by PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d6e:ae99:c95c:83bd%9]) with mapi id 15.20.4373.026; Mon, 2 Aug 2021 12:16:58 +0000 Subject: Re: [PATCH v2 3/4] classes: allow more control over container image name and tag To: Henning Schild Cc: isar-users@googlegroups.com References: <20210802084041.1320-1-henning.schild@siemens.com> <20210802084041.1320-4-henning.schild@siemens.com> <20210802124517.493a5feb@md1za8fc.ad001.siemens.net> From: Silvano Cirujano Cuesta Message-ID: Date: Mon, 2 Aug 2021 14:16:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 In-Reply-To: <20210802124517.493a5feb@md1za8fc.ad001.siemens.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-ClientProxiedBy: PR0P264CA0169.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::13) To PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:ab::7) Return-Path: silvano.cirujano-cuesta@siemens.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [IPv6:2001:a61:3b25:cf02:6bfa:48c3:3d22:d916] (2001:a61:3b25:cf02:6bfa:48c3:3d22:d916) by PR0P264CA0169.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.18 via Frontend Transport; Mon, 2 Aug 2021 12:16:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d8050045-fa07-430f-6a76-08d955af6cc3 X-MS-TrafficTypeDiagnostic: PA4PR10MB4336: X-LD-Processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Q460e5VMzGaMZzIZ5p7wgQsYHlC+hHmfwke8nF2K25FKYS0u5D09WLcASJVJ1K+4A+ZJteozdcqBqGSXpUNbXMhJdRM78eIAzGIcBKatO1dFDk54bW8CKj3dg3jHjCBtKQw5ckfGENNTfmU934ACsg5XrBjEdGD/VJIryK/0+ZbjT4KA3jYBOofTK/nQYDpCpvF7TpxqcS+2naoVkECmjFmfAjOVMDJzBnpPVChuQD3QvXjdULyAXviRFq6VyDMVt4ptP5CLVv37CS2gZV+Tijs9HTz843MIjcRsi1kNBs33h6TEz/c6chC71VPFW6ixooxkMXuTcDDA0Bv60uZuOETm0qOPfD+0mwt2+E+E+cDO9CFonGjU3VGHifYc73BTGKXzP+PEY3VI6d8aiDn9KlgpctWqT5y2kjh4NCDQrezJRr5mvB9bLe8GFzbR8FLDGAgPOwcEl2hBeI8Qzg4f+0JA5R7q8vHFK6+qEim9Y3hUFlIn4edcPjnQe4lQRkHtci5lmqQvB94V/CcY6hQVxHbS6Cs9CVpByPwGk2LwkQqnACdGtda+ynx55fwljCdoKVE0e+5LMtFxPoxKx+ScGIEamIEXj+jxp7kcJZE25/ufkx6A45bfvbk5NsCquEsYqU7rcQIofgeHtiicQ3pHqeltT9hrghYj/EYY+JxmuQwVtPvhNLw86YcIR3Ih5nxCHZ1qUr/RRRsn5Pxn+vqMIb0FeUNX7uAFS4lzi0iNgsU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(346002)(39860400002)(136003)(376002)(396003)(366004)(31686004)(83380400001)(186003)(8936002)(37006003)(6862004)(66476007)(6636002)(2616005)(31696002)(66556008)(4326008)(66946007)(8676002)(6486002)(2906002)(53546011)(36756003)(5660300002)(38100700002)(478600001)(86362001)(316002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cWZEV1dpUmZ2R0MwZ1o4VURVSFFhcGtTc2dIeEQwRHZpUUxBNkYyN0liOGgz?= =?utf-8?B?ZTdRbk9kTG4vUU1tM3hRSXhPdkJKQy9UUUhvREpCQnM0ZWpZWjhoTXdzL2R1?= =?utf-8?B?VjJtYUdnT1RrQU1SS2NLaDhBSjgycDZ6R3h5TU1Ia1pKajZXSjFjYkROSzRV?= =?utf-8?B?NkJXRERvRGhOVUIzNm5KU2JTRk1MdmNiNXVoQXFTaVhSQkkrOTdOUnBnTWdk?= =?utf-8?B?d3kxYUxoQ3FWZEV5dFRJRWo3dnRHY3JWKzY1bDQvQS82K29tcVJ2UmlNSFJi?= =?utf-8?B?Unpzb0RoMXhja2N5VVo3TFVpa0l0SWpRdThiTDhudXdiR1hKeExvMWM4dXM3?= =?utf-8?B?RFpsc0cvemFmNE4xRTR5Wm1hT1oyT2dOWGJYWW1zTWJySFFtVmFXdFdjRmdl?= =?utf-8?B?RWZ5Ty9KT3BUSnYxbEp5eUpuTUlwaUYxdHVyWHFYcDVLeW9NOEdRekUyNUxt?= =?utf-8?B?OTZ2MVErcFJLYnprb2hYWEN3KzIxRjhxTEtQdkx5UzhoM1hHUzkxYnBaYmdD?= =?utf-8?B?OUNOZm13VmgyVjNQTzhqY0N3VXVYR0UrcUtxODlPWGxIaWY5a0FDU3k0VG90?= =?utf-8?B?SWtWMk9penBCcDczV0VvTGtYRnpnazZzNVBJV2FnSXlNMDU1UnFTOVNVcERs?= =?utf-8?B?QUt0TTd6MkpLaWtweEpLcXQ2T2xxS2Z0TGt5QnJhZm96SnRBc2h3SFVHRWhE?= =?utf-8?B?UmFxVU9ZYkw5U2RhWVI5bXdGK3oyaTQ0NHlRUkFXUnErdjZNam05VVFWNkFJ?= =?utf-8?B?Rm1qVjVMSGRGVEVtbTQxU0tjdFVTQWhMWmluYXNkeStvT1BVMGNnMGVIYm9Q?= =?utf-8?B?cmI1Wmdia1E5c2hTUDRlTEt2RzR3V3kwOGt1bnB5RFJQaU9YU3p0VTRBMWgv?= =?utf-8?B?Yi9nZE53S2RQdjJKZG05K3laUUNIUEJieUFRUmMreDRGY1VxV1d5MUtUZlZI?= =?utf-8?B?OVFIczhYeWZhSm15KzBXV2c2QndCbWxkMnFhVW4zU1FzakpYTUhLZzVGVnhX?= =?utf-8?B?bFlWSGY0M3NGUDdSQWZDbktGSU4yUGRGVEJzMUEybm9rUExIVWJnTzdGTld4?= =?utf-8?B?UFg3YlZ5NUVqdVFEVkhUbUlSMU4wRmhjMEtpMEhFTWhBMzRFK0VjK2xWU1BB?= =?utf-8?B?dHBGYVpGeW5UOHBOUGx3aEVLRUJnMkVESG44V09QOWhabWZBeURxb2JTU2pQ?= =?utf-8?B?ZU1QUllPS2pTOVluc1IvUWhGQm02cW81M0NRaDJ0RjFMR1dia3FPNnVxVDhF?= =?utf-8?B?REZuM0h5Ry9KdHlJeWNHWm4yb0VseE5zYzNINXFEKzgrdlFKSHhXeXRwMXQ5?= =?utf-8?B?all0eEV0cXJvTmd5ZDVyUVpuanhKVUFzc1E3WWhmaXhOaTJ0YlVFU3pEbW1V?= =?utf-8?B?dTg3ZnducXJWdCtzMnRNZTdMQ0NkMDJSci80TkdzS1J5RjZJLzdUZGtKVU9s?= =?utf-8?B?TmpVVXJPLytLMUJUaC81TnlXWHhGVEQ3Z2J5S0MwNUF3Q3VXWnNxVncxQUEy?= =?utf-8?B?TXFLbm81cVFaQjBYMWo1TUdxbGlhVk9yYVBtT1lJSktKS095OHRVbFpVZmF1?= =?utf-8?B?d1hzT0VSUTNpNDJveVM5bGp6SC9rTWl4NUZUNldRakNrdkdlQzAvdUNZczVm?= =?utf-8?B?VmNtdjc5dUh6M2ZSazloVnJSbzdrN1dBU2FlOWpTY3lTTlZxNDhpQzkvQ0Uz?= =?utf-8?B?YmRiTFB6eHd6L0tuUzdqcXYvUGVNQWhzRG4yN29BU0FFTTVlNElYMlBiSm9Z?= =?utf-8?B?MldjVHhTQTRtSVZzR3RaMC9GUXdVRkZ6Z0Rhb3VSZzlDNEtmZkFWTHF0TUho?= =?utf-8?B?ejhaMlNlK2FwZEgyTmZLQ1EvOWJRcWo2RDUzbHNlajVUWTdLSVpPRHZ4S1Fy?= =?utf-8?Q?oSr6V/OSsxWlF?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8050045-fa07-430f-6a76-08d955af6cc3 X-MS-Exchange-CrossTenant-AuthSource: PR3PR10MB4254.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 12:16:58.4200 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: CYi/ZTL/MWfkHJ+NE6i7W0RgbDAjXocAmAiurjkSkib41Yr8d3KD3EGZ6GvGxZ3wIzlidSWc44SFgrwD6oB26Nuo/M61xA4HQ2cI65DvTYy5RQ6k9DA/hf+thLeoYY3y X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB4336 X-TUID: RKMnJ2u5tssm On 02/08/2021 12:45, Henning Schild wrote: > Am Mon, 2 Aug 2021 11:44:39 +0200 > schrieb Silvano Cirujano Cuesta : > >> On 02/08/2021 10:40, Henning Schild wrote: >>> 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 >>> --- >>> RECIPE-API-CHANGELOG.md | 4 ++++ >>> meta/classes/container-img.bbclass | 4 +--- >>> meta/classes/image-container-extension.bbclass | 11 ++++++----- >>> meta/classes/image-sdk-extension.bbclass | 2 +- >>> 4 files changed, 12 insertions(+), 9 deletions(-) >>> >>> diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md >>> index 806c2914f13f..284583e28120 100644 >>> --- a/RECIPE-API-CHANGELOG.md >>> +++ b/RECIPE-API-CHANGELOG.md >>> @@ -292,3 +292,7 @@ Migrate your patches so they can be applied >>> with "git am", or >>> Kernel image name for arm64 platforms is vmlinux now. Image format >>> was not changed (uncompressed executable) but now it is named >>> correctly. + >>> +### Change default "image_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. 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}" >> >> These new variables aren't documented anywhere. But they should, >> right? > > They could but probably do not need to. There are many things in Isar > that are not or not fully documented. But yes ... the documentation > probably still needs updating because you documented a lot. > >> Additionally I'd rather use CONTAINER_IMAGE_TAG (instead of >> CONTAINER_TAG) for correctness and consistency. > > The strings are inspired by "docker help tag". Where the one is > "TARGET_IMAGE" and the other is "TAG". But i will rename > CONTAINER_IMAGE_NAME to CONTAINER_TARGET_IMAGE because i will have to > touch those docs. Docker was first there, but they weren't that good naming things ;-) IMO all those parameters should have the prefix "CONTAINER_IMAGE_". Silvano > > Henning > >>> >>> 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 >>> } >>> >>> > -- Silvano Cirujano Cuesta -- Siemens AG, T RDA IOT SES-DE Corporate Competence Center Embedded Linux