From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 19 Nov 2026 18:08:36 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f57.google.com (mail-wm1-f57.google.com [209.85.128.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6AJH8Z7P019874 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 19 Nov 2026 18:08:35 +0100 Received: by mail-wm1-f57.google.com with SMTP id 5b1f17b1804b1-4b9fde3044dsf17220265e9.0 for ; Thu, 19 Nov 2026 09:08:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1795108110; cv=pass; d=google.com; s=arc-20260327; b=LzxIdKJslRqhU3mwLYmnxjlngIFMTfNKQgj1Fr51iVMxmwI1UmiLtuHfx22wRDDUOf 98RuO6Hx0KTSayEsiRqxc62DLZp3jcVwQ3x7vxG940Dn1NtPOhBWL4HrES4WMrvFW5uh Wsrth7AIn1OTxdpEQWaYlf8bmXLdrZRbbBM3gXEy2Km51aJ6iXuUm8pTAlTX7VUqqb2q v3c7v/XdkLyRvtMFAG+UOfzFszVzbFGs/nAk6v/kpMX1jAOuYA61NdgwZgpt0dQ4PYRI yaCADYzEU336c2aXXYHeDj4qY/9FhTK4HXzShjLoxQPwRlP7MDfSUnqiI9VYfS95f1KH 0HCQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :sender:dkim-signature; bh=9Qu7Ueii54VDGSKhiL9BgeZMSoQAzMaCOaOhPsttzH8=; fh=Fqxm7PnQfuW+Av6M1Ln2Iz08va2oq/vjIvF04xPzKGA=; b=iozEDYOBaWmUIcsmqiCGof98HbW6eOwyDZMdaVhX82EKS1CqwGcAkZojlkJjTnG+gd AYVTe0WPx0Rai/4y8AOTJIVORUl/l3hpjs6SE6lIXn2S1du2S7KNJ9AT5GoXqae3fxCw TiMDjQpu3ZfvskPSCAacs7sRVpqfyhLZZk7c9itjjbwwRqM7BPLpVZUqv/rswQJFz/K8 gjrs5MoRyhruKHoNFB9f+ciSU2R6ADCUWiTXmnOzsIyPQtT20Pw7ZHo2Sb31PtPjOyJL jZ18NYvjGVsnmZ4RCwH7NMwtZaGBgffONSsUcsS8lUQDariz2ZJ2MUx+pQO0YHoboKUj iNPg==; darn=ilbers.de ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20260707; t=1795108110; x=1795712910; darn=ilbers.de; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:content-type:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :sender:from:to:cc:subject:date:message-id:reply-to:content-type; bh=9Qu7Ueii54VDGSKhiL9BgeZMSoQAzMaCOaOhPsttzH8=; b=eVDV41k4Fp7FCUJzApEn/ihjJBbUrg8OUR2hNce4NOlvMYeWdGWoShCigim1QRg33S t42JPv9L0crTvGoaflA0CP02LP9L52gHWi1tg081Ve131JUutd9MUB+GaOdEQAQN4p29 e42WgVejrYwl72SmesD1nEjThp5U9UTs+bfLJJwneW0hIUPhCB5R/4Th2Xb0QSERPXI9 ZjgS7oACwmG1dDlJsPjxtXMnQ9h0/2wEuYDpkMJBbwUUNQkePQu3V91lS6Lam9d0bDCy KjBseVZkSDPO7iYTecV05cUdS3ZwwaF3u3+pakg5Be2jy5iYMd74PpejVVWjPIiYKZGa EnlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795108110; x=1795712910; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:content-type :in-reply-to:from:content-language:references:cc:to:subject :user-agent:mime-version:date:message-id:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to:content-type; bh=9Qu7Ueii54VDGSKhiL9BgeZMSoQAzMaCOaOhPsttzH8=; b=ZM3CVIDz8Iy6Wr2h1MoCR65k2g2s9HFXNwJ/I9g3BDPOH1sfWMpWGHYs5xxS5VrucB HYagzs65jEbxu16/hCBFhrEmdEGL38V5s8wtu4RR2+OJORglZhLwzXps8ImXVj2sQvBj X1qbceTcpoJjIC+25g7xzxN4tgSgM7++309CP0TnG/N74J7sRLSZ6wHr6W2nggqAhlT2 jUdhK1wErKh7og8AG3JQdElTVl+zSPTCWVpgRX0neD5wQiWX9dfJoeNDd8MI/soXI6t2 53pG+ghDJTwQFZHzEX/3GOoAr5VAOgWGeKYboBtTnqJFTatQFXL9pje4YUJZBoFXTTOp AblA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AL+hErF8uM018JYGtvw8sgGUSkUU7R7hf5UhzUDAIglS+tafaAybGbcTXuNPkB6e5AxAaRz3bcCb@ilbers.de X-Gm-Message-State: APuU4Z9efTbnOO8nuVXYVzJq26jZTV29oeh66tAo0/KkqifeEDt5zdWg oRao7vf3D9qpKe6P0xTJNpIHPu2gdd4tkBRskNqsP+I7y/Rv39am/DId X-Received: by 2002:a05:600c:6298:b0:4bb:6375:aa41 with SMTP id 5b1f17b1804b1-4bb88934652mr2367265e9.27.1795108109841; Thu, 19 Nov 2026 09:08:29 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="ATskLddiNv2hdSvnDwp9DHngwMKdfYXtLYUALKxSHIEY7k5w9g==" Received: by 2002:a05:600c:1c1f:b0:4bb:662c:ba79 with SMTP id 5b1f17b1804b1-4bb830d4f5fls10999815e9.0.-pod-prod-06-eu; Thu, 19 Nov 2026 09:08:27 -0800 (PST) X-Forwarded-Encrypted: i=2; AL+hErH7A9Rh0h4bcdTEaGSYmR3FBRm049mbWncugi9vLd6bs6tt7G0a9LU/RQfaeIgbINv5pPO8nshiSiAY@googlegroups.com X-Received: by 2002:a05:600c:190d:b0:4ba:2bfc:c8b5 with SMTP id 5b1f17b1804b1-4bb888267aemr2491005e9.10.1795108106735; Thu, 19 Nov 2026 09:08:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1795108106; cv=none; d=google.com; s=arc-20260327; b=logbcUqUKqvGcRZy1TS7QpU7QckmaHvBrLy/3pDVIefyDumC0CGakDV0JNsR96lUSP KPRHnVVw04BcyStAX/wCwyQacDZ51r85F4mAdYQMPYCYx9n5sL3eqUmyX9MNQIH40gkO lzU0Mu73mSluS/2Ev0nCPhvajGvyqNzBykRFldGXUBw/AdCzB1E1RUQPgZK+dAjjcp6V xHI1dqQ7Xs/LE+FHsM7dJIkecHzhubrX6zVfxH3nz7Keri2XkIZVGiZYaGVHKv3CqzOn 9cQwmaUnFu5PC4jcFF5RnRWkD3TG+aFa8TLkXhEfzndS2E38A7aM61TRbKhfYXqThm3o nIwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id; bh=XOv7Ke9p+eQnwZM9UPtZyRNxjNZnQWDDbRWiYVwjE+Q=; fh=fPs6cKs64UGy0S0/eiVtiIR6sPJWhw2OEOdI3HcTzyk=; b=GyORWaS/1Ss9O1VcuM7nwmn36CxhR5XAsWF3gt43y7EXpzC6R+hRp38Y4VoShwwC8N 5ox+FWjhslbfFHm5KehR0jG0fzl4p6azKrYo3qssivei+lvxiWPEPPpWlvRXkMwpE8Y6 te/6ATIrySvqtWPlntJ6puw81OYwBpn/pa1HB12jBcFtmX6GH64HTkcVX66RWBRK2SMX D4WOqHLonZuvzw+cZ/2gXTRNJI+8mLo8ct2nMs7k8E0uS4VT42EBRBnyIFGjWw41vXEJ R+FloUA74ZL3L9+MQP/6YHktfE0Q4dSGC38yetgUximIPeD5eIbm+PKvmxvctODk88aU K0vg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-4bb84e45f2asi248575e9.3.2026.11.19.09.08.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Nov 2026 09:08:26 -0800 (PST) Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from [10.50.8.38] (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+deb9u1) with ESMTPSA id 6AJH6OsM019773 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 19 Nov 2026 18:06:25 +0100 Message-ID: Date: Thu, 19 Nov 2026 18:06:24 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/1] Revert "image: remove unrequested intermediate image types" To: Felix Moessbauer , isar-users@googlegroups.com Cc: clara.kowalsky@siemens.com References: <20261118130243.2042081-1-felix.moessbauer@siemens.com> Content-Language: en-US From: Zhihang Wei In-Reply-To: <20261118130243.2042081-1-felix.moessbauer@siemens.com> Content-Type: text/plain; charset="UTF-8"; format=flowed X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS 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-Original-Sender: wzh@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de 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-TUID: MMgE4jG250Xa Applied to next, thanks. Zhihang On 11/18/26 14:02, Felix Moessbauer wrote: > This reverts commit 6393523290ee4bf108dc7b0a4337720dbf4602c8. > > While the intention of the commit is fine, the current implementation > has some serious drawbacks: > > - it does not remove additional image artifacts (like wic.bmap, > wic.spdx.json, ...) and there is no way to register these > - it breaks partial rebuilds of a derived image type (e.g. a wic -> > squashfs dependency cannot rebuild just the wic type as the squashfs > was removed in the meantime). > > Both aspects cannot be easily fixes implementation wise, as we don't > track who deploys what. The proper way to do it would be to deploy via > the sstate cache and let the cache handle the deletion of the > artifacts, but this requires a major re-design. Given that, we just > revert this optimization for now. > > Signed-off-by: Felix Moessbauer > --- > meta/classes-recipe/image.bbclass | 24 ++--- > .../unittests/test_image_type_cleanup.py | 92 ------------------- > 2 files changed, 12 insertions(+), 104 deletions(-) > delete mode 100644 testsuite/unittests/test_image_type_cleanup.py > > diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass > index 229a37fe..ce19ae1c 100644 > --- a/meta/classes-recipe/image.bbclass > +++ b/meta/classes-recipe/image.bbclass > @@ -187,8 +187,6 @@ SUDO_CHROOT = "imager_run -d ${PP_ROOTFS} -u root --" > # hook up IMAGE_CMD_* > python() { > image_types = (d.getVar('IMAGE_FSTYPES') or '').split() > - requested_types = set(image_types) > - intermediate_files = set() > conversions = set(d.getVar('IMAGE_CONVERSIONS').split()) > chroot_mode = d.getVar('ISAR_CHROOT_MODE') > > @@ -287,10 +285,8 @@ python() { > > # add conversions > conversion_depends = set() > + rm_images = set() > def create_conversions(t): > - localdata.setVar('type', t) > - if t not in requested_types: > - intermediate_files.add(localdata.getVar('IMAGE_FILE_HOST')) > for c in sorted(conversions): > if t.endswith('.' + c): > t = t[:-len(c) - 1] > @@ -305,9 +301,20 @@ python() { > for dep in (localdata.getVar('CONVERSION_DEPS:' + c) or '').split(): > conversion_install.add(dep) > local_conversion_install.add(dep) > + # remove temporary image files > + if t not in image_types: > + rm_images.add(localdata.expand('${IMAGE_FILE_HOST}')) > + > for t in basetypes[bt]: > create_conversions(t) > > + if bt not in image_types: > + localdata.setVar('type', t) > + rm_images.add(localdata.expand('${IMAGE_FILE_HOST}')) > + > + for image in rm_images: > + cmds.append('\trm ' + image) > + > # image type dependencies > after = 'do_image_tools' > for dep in typedeps[bt]: > @@ -333,7 +340,6 @@ python() { > d.appendVar('INSTALL_image_%s' % bt_clean, ' ' + ' '.join(sorted(local_imager_install | local_conversion_install))) > d.appendVarFlag(task, 'vardeps', ' INSTALL_image_%s' % bt_clean) > > - d.setVar('IMAGE_INTERMEDIATE_FILES', ' '.join(sorted(intermediate_files))) > d.appendVar('IMAGER_INSTALL', ' ' + ' '.join(sorted(imager_install | conversion_install))) > d.appendVar('IMAGER_BOM', ' ' + ' '.join(sorted(imager_bom))) > d.appendVar('IMAGER_BUILD_DEPS', ' ' + ' '.join(sorted(imager_build_deps))) > @@ -423,12 +429,6 @@ python do_image() { > """Virtual task""" > pass > } > -python cleanup_image_intermediates() { > - for image in (d.getVar('IMAGE_INTERMEDIATE_FILES') or '').split(): > - bb.utils.remove(image) > -} > -do_image[postfuncs] += "cleanup_image_intermediates" > -do_image[vardeps] += "IMAGE_INTERMEDIATE_FILES" > addtask image before do_build after do_image_tools > > python do_deploy() { > diff --git a/testsuite/unittests/test_image_type_cleanup.py b/testsuite/unittests/test_image_type_cleanup.py > deleted file mode 100644 > index 1e2ad5b9..00000000 > --- a/testsuite/unittests/test_image_type_cleanup.py > +++ /dev/null > @@ -1,92 +0,0 @@ > -# This software is a part of Isar. > -# Copyright (C) Siemens AG, 2026 > -# > -# SPDX-License-Identifier: MIT > - > -import sys > -import tempfile > -import unittest > -from pathlib import Path > - > -root = Path(__file__).resolve().parents[2] > -sys.path.extend([ > - str(root / 'bitbake/lib'), > - str(root / 'meta/lib'), > -]) > - > -import bb.data > -from bb.build import exec_func > -from bb.parse import handle > - > - > -data = bb.data.init() > -data.setVar('BBPATH', f'{root}/meta:{root}/bitbake') > -data.setVar('__bbclasstype', 'recipe') > -data.setVar('IMGCLASSES', '') > -parsed = handle(str(root / 'meta/classes-recipe/image.bbclass'), data) > -data.setVar('IMAGE_TYPEDEP:ova', 'vmdk') > -data.setVar('IMAGE_TYPEDEP:vmdk', 'wic') > -data.setVar('IMAGE_CMD:vmdk', ':') > -namespace = {'bb': bb} > -exec(parsed['get_base_type'], namespace) > -image_tasks = next( > - function for function in parsed.getVar('__BBANONFUNCS', False) > - if 'def collect_image_type(' in parsed.getVar(function, False) > -) > -exec(parsed[image_tasks], namespace) > - > - > -class TestImageTypeCleanup(unittest.TestCase): > - def generate_image_tasks(self, image_types, deploy_dir='/deploy'): > - d = bb.data.createCopy(data) > - d.setVar('IMAGE_FSTYPES', image_types) > - d.setVar('DEPLOY_DIR_IMAGE', str(deploy_dir)) > - d.setVar('IMAGE_FULLNAME', 'image') > - namespace[image_tasks](d) > - return d > - > - def assert_intermediates(self, image_types, expected): > - d = self.generate_image_tasks(image_types) > - self.assertEqual( > - set(d.getVar('IMAGE_INTERMEDIATE_FILES').split()), > - {'/deploy/image.' + image_type for image_type in expected}, > - ) > - > - def test_only_unrequested_types_are_intermediates(self): > - self.assert_intermediates('ova.zst', {'ova', 'vmdk', 'wic'}) > - self.assert_intermediates('vmdk ova.zst', {'ova', 'wic'}) > - self.assert_intermediates('ova ova.zst vmdk wic', set()) > - > - def test_unrequested_conversion_stages_are_cleaned(self): > - self.assert_intermediates('tar.gz.xz', {'tar', 'tar.gz'}) > - self.assert_intermediates('tar.gz tar.gz.xz', {'tar'}) > - > - def test_cleanup_uses_image_type_filename_overrides(self): > - d = bb.data.createCopy(data) > - d.setVar('IMAGE_FSTYPES', 'tar.gz') > - d.setVar('IMAGE_FULLNAME:tar', 'custom-image') > - d.setVar('DEPLOY_DIR_IMAGE:tar', '/custom-deploy') > - namespace[image_tasks](d) > - self.assertEqual( > - d.getVar('IMAGE_INTERMEDIATE_FILES'), > - '/custom-deploy/custom-image.tar', > - ) > - > - def test_cleanup_removes_only_intermediate_files(self): > - with tempfile.TemporaryDirectory() as deploy_dir: > - deploy_dir = Path(deploy_dir) > - for image_type in ('ova', 'wic', 'vmdk', 'ova.zst'): > - (deploy_dir / ('image.' + image_type)).touch() > - > - d = self.generate_image_tasks('vmdk ova.zst', deploy_dir) > - d.setVar('T', str(deploy_dir / 'temp')) > - exec_func('cleanup_image_intermediates', d) > - > - self.assertEqual( > - {path.name for path in deploy_dir.glob('image.*')}, > - {'image.vmdk', 'image.ova.zst'}, > - ) > - > - > -if __name__ == '__main__': > - unittest.main() -- You received this message because you are subscribed to the Google Groups "isar-users" group. To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com. To view this discussion visit https://groups.google.com/d/msgid/isar-users/d511d684-34b4-4acd-bad7-ae74d3d9ce54%40ilbers.de.