From patchwork Wed Nov 18 13:02:43 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5627 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 18 Nov 2026 14:03:10 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-oo1-f60.google.com (mail-oo1-f60.google.com [209.85.161.60]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 6AID38Vp012491 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 18 Nov 2026 14:03:09 +0100 Received: by mail-oo1-f60.google.com with SMTP id 006d021491bc7-71b16539e0dsf1068720eaf.0 for ; Wed, 18 Nov 2026 05:03:09 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1795006983; cv=pass; d=google.com; s=arc-20260327; b=rxLoR3WYUWOXkU+ZqXJhXfQbd9NPfLHfoCO/+ztV9kxN2RVLAzRfmhAEiyrzPxsK7I mAmeIPyY39EEMumkHmzsoNMas8XpBA/0vxIuicteokK5Yv7Z3yWVcQ05bXZY29wnT+dS lkcUmZfD8/nJ9CS6DtP/T627ma9SI6Os9sOknoUA4gsz4llTW87tRGehUcsT3WUBC9Cx 1O9PRzs8Hr2fCkcCujFS5rjsuoGW72NYRhHitCNDNl/Scl4nNDrLiFkZJn6vCeO/69II ezDtWGQOUpSAkB10st2RftOY/guwqeEj4dnSSJDENjJSvA2fatntzutI0n/Lq2EKPUTY lkAA== ARC-Message-Signature: i=3; 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:reply-to:mime-version:message-id :date:subject:cc:to:from:dkim-signature; bh=TzFiC/VzMPc+zoZVEJDLrx1HL4j23df6qQhZ8Wvb3FE=; fh=eABc06//n+Tjooh39K7FCxN9frDHk1oXJA1tv1ZtCig=; b=ReW+AJ6rxjpwjwAE8S3vR9TG0qWSDysvyTJnQqb/cD6JlAROoti8ZbIEPcDS/5uSdD 3834CfPBnNjTufTr+mEuAlC5Zlwo72zdgajnhEq5YSArxUTVPXjzwJS8YEHXATeWP30y Zitzjhjc0p//30tul09lXUo10Vjxq+mBS39mRdeJSRGmOo4o+29PrnTeIJYBXPqFdadI zMXFvpTwxG6V0A6CZMsf7BJyoQ17+T8+SUFeNCk6C0tdy7RwhJCBeL1IxlDXCmYZRhQN +b8/o3mNRxlapuMWFZaWOXYoQwh4FOe6Z5wuYcNu9gFQ/k/4eK9TmY1N1pMq9vQ1vx6e d45g==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HS93XVfU; 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 felix.moessbauer@siemens.com designates 2a01:111:f403:c200::5 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20260707; t=1795006983; x=1795611783; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=TzFiC/VzMPc+zoZVEJDLrx1HL4j23df6qQhZ8Wvb3FE=; b=vqiW8V8VKyTw6taV7YgrrX23h26K+i4WlaGlCoCn+ks9PWbT/uMwNHBOG3bjLNb8Ux IYc932hnLUD3O4qZ0x4Cc0IT8LRuyu22s3LuJQghW05Qh7+IPs2w2rrxthbzJ6c1r+6s yI2zplomd4gLWKq6joeAn1HBgje66wsx+hlFIQfnsTJzqUn5PMp/hWMEiURaN+YEu7uu QLIRP7AuYMlMcOgm13+nU/YemPxXVUGRQPatKJBwADI0Sg7kgxwtpb6+KEeUo1UqCXyw 8RwsvPFFjM0HWj1ugE83WD0jBxQNn94l1fI4MYexgjyZHLaKlQyacVMwVQtVILXKzo/U EXUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795006983; x=1795611783; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:mime-version :content-type:message-id:date:subject:cc:to:from:x-beenthere :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=TzFiC/VzMPc+zoZVEJDLrx1HL4j23df6qQhZ8Wvb3FE=; b=0wpqBERd6qjkcivpcWjt1AaNgq7CTfkCVCtrpgViWoRFB2Xgc0SMrngP6D7aEYyagK 4MjXRvjXX8fmPWOlNKQtbyeJQv+HgLlbMxScBJ6vmrb+YOLRDYNu885NggGXaFCvvSn6 7sCEyNBTxS5knh/qXLylsbFd2naEHLIl11+ictg0ljtDZNDVmyLKkB0AYbGXBaJG9TlC +zmsObJIqBw4dMD3FY3M/M848PhgERNMEj6b0Zd3qVU5rNpmlSTWP/VoRTh84QRM7Der 5INJxZ3cFtVM0ljfF+4pI8HDeE8wVcB4oVs2sbf6P1przS/JUAf/Ad0ep0PFzXhGzDw4 R0Xw== X-Forwarded-Encrypted: i=3; AL+hErGO13+a0ha0JdB8+5f00brglRRju6TCLkuysovZGy8j2FO1UfwsH1xo9+Mrb2rOT9lZai3PNFo=@isar-build.org X-Gm-Message-State: APuU4Z/iBLrpXO8f2KPdYgE03wmyARM1rZsG4m8AEgg6BgWlgMH7hyLX aXt4ZyXYILlevQmG3bI7FZ3FhQZbGw7Wnlg9Bnyva0qOHDj9Tt6+jzZj X-Received: by 2002:a05:6820:627:b0:716:f261:d8d7 with SMTP id 006d021491bc7-71b18293009mr2039154eaf.10.1795006982850; Wed, 18 Nov 2026 05:03:02 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="ATskLdf81kEXSDqrpQcWX7dvZi92YqxM27BObUYgjINDUV+Smg==" Received: by 2002:a05:6820:c451:10b0:6b1:9f43:c57e with SMTP id 006d021491bc7-71b1720d78els738045eaf.0.-pod-prod-07-us; Wed, 18 Nov 2026 05:03:01 -0800 (PST) X-Received: by 2002:a05:6820:1517:b0:713:9556:56b with SMTP id 006d021491bc7-71b18293225mr1839881eaf.6.1795006981700; Wed, 18 Nov 2026 05:03:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1795006981; cv=pass; d=google.com; s=arc-20260327; b=A2Mw36gyJT/nCtd5NWoVHsded8Amu4I63lE/1yJqNlgTHTCKXkt9n2VxwpSNGrTdMA 8hYLVgVE/70FIBUo3va5tuSsIaYZ2xPHz08DZAmmu7duLHJ0WpFpUX8H9TLWa1rdxosO tM2/H4HlzkuygwPJvZQVAokTrWOHh6kkMVeD5Yu9OBrnGSx2sH2Ee5VE216qGmq4Pgu7 DGHc0IWer5TATqeDEHzcEX+FBLeX2LGEw7DwB8ysjrJlXXc5qZ0cKVSIZ7vT5jDL5Tv7 KqIq5kcTOePqIn2EljEBsGtuCCKyy+dqIhQh/HCKHBRWDAuRdxytd0abWE2Hm2RNbP7A dxTQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:message-id:date:subject:cc :to:from:dkim-signature; bh=786m/syBWaY3lJBdKB2z/PCWhDzCbiwWDP7WY0Keb5s=; fh=ooAcDisRHZE7mStZKyJQMWVqsXQcsSztsxGcbRp6sIU=; b=N18hvjfhnO6rVLXYD6wlYd6bU0gU+9Lpdvl8/7TBmYb2JNf5YrbvWnNmDqnnuLmoZF XdHDyEuWRskQpEtXf9ucUlTB4RkyCLD1DGh4+f0G76P6ZaoXr7hrUdXCqw0Xj8z7bR44 wjUJTJQsZiWMnkdmHqDpDZ8tK6aY1TLAHfNHLKOBzku6816/JEDxjtGyVoJ8LVzWkFT3 rhYER5HqebW1WXBP8LddTvqHdiDsMg39R4KtrszaZ61JyYIyI+hy3lKFBxzBURvkqEs9 0Jq+eWk97Fg5Bqg3AEc3DuaiMJUNJGIcQ/jsY7rqbVXpUoBOKVrik35kjZ8KHdmnJKS6 Ao7A==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HS93XVfU; 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 felix.moessbauer@siemens.com designates 2a01:111:f403:c200::5 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazlp170120005.outbound.protection.outlook.com. [2a01:111:f403:c200::5]) by gmr-mx.google.com with ESMTPS id 006d021491bc7-71b193f5f32si45630eaf.3.2026.11.18.05.03.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 05:03:01 -0800 (PST) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c200::5 as permitted sender) client-ip=2a01:111:f403:c200::5; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BoDa1kdquIAlYVNEQ9IwPs3DtkZYKGc30uPzxOStQYw+Z1v660V10qRDaBn19gKbOpxa6DXBoa4bbRAOinJinBX6gedlI16I90T/EPf1/jrhvnDyQ0Z8aLLXZqrbBh9WfVQU5Xh3lzK5QKV4D1feBadY3jG82ikjPMV9mQWVQQTECiqA2qRb5BU473598GOSHfF5wyqyheEVJQ0PVcHzr+1fJK9UAaEvXgzo/cnYS/o7s378a7UgoQC6NmgsJSiZw191IESOWjloFXHKDAz+djcES2eqkopChQIHDZX50grdutTZJzram8la6+u+S4ZLL0TPayqRa3SPvxKbyAvJ7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=786m/syBWaY3lJBdKB2z/PCWhDzCbiwWDP7WY0Keb5s=; b=q26aeLg4y2vva2zWq3kHwpxKql7z6tJr/NGnfW2hlVbVJEQW8cZd5utRMShRlZbaHqVIBBPXQ5fbbk4ueSzzaW5B29F7FTRm3ToIn7mtOv8YzN968LgZ67LAwMcinUbbbDhAjJvHD9ey2xv1u57BiHRG4SX4brQKB5i6CK1UBrCnT/x2I/SPcQuH6OT/QYY1JPVMRoFhC3BiLAuGYXoY/G+C1xb2cLakboDI4n7HtL2hSUSwYe5hbrPadnhgitTBv4PwNtlXjWxn48POR2EFK7MsQpFhfcUeAvObpM6IdVrajCDMqulJfndw/MW6TKq2s8Q3QZhyKDpKeNA1c0WR7w== 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 Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) by MI9PR10MB992305.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:290:b9::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.639.8; Wed, 18 Nov 2026 13:02:59 +0000 Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c]) by AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c%3]) with mapi id 15.21.0639.006; Wed, 18 Nov 2026 13:02:59 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: wzh@ilbers.de, clara.kowalsky@siemens.com, Felix Moessbauer Subject: [PATCH 1/1] Revert "image: remove unrequested intermediate image types" Date: Wed, 18 Nov 2026 14:02:43 +0100 Message-ID: <20261118130243.2042081-1-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.55.0 X-ClientProxiedBy: MN0PR03CA0020.namprd03.prod.outlook.com (2603:10b6:208:52f::27) To AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3956:EE_|MI9PR10MB992305:EE_ X-MS-Office365-Filtering-Correlation-Id: 6ad09761-8d2e-4d09-0915-08df45744520 X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|23010399003|366016|1800799024|18002099003|6133799003|55112099003|3023799007|11063799006|56012099006|10067099003|261026140227099003|261022115727099003|261022105027099003|261026121527099003|261022075727099003|261028144727099003|261021123027099003|261021121427099003|261009223027099003|261102123227099003|260925022911599003|260925021311599003|260925021911599003; X-Microsoft-Antispam-Message-Info: 1+4aCD/3njqRijhT5o0Tdqzl/MEQHNrImz2f3UPjEdLYVtY42VdT17X9aaKqCJFObIpbrZ6lYIGSLjqZkJ2TsZpQBnhHzBArEkv3lKaRieus06A3ohCQiP+2UMKIXSxN1y8/PR/sXi+AQ1IJ9meYSbGZ4H9KXXUiH70CrZh2YIW2Rfv03BrbNsCwN9C1820yEALw6yN0ER+IrGtGhaJSmaErtiNGZMJ9ICbQFl2f5eEwXLz3Ihz1Z9RtvHqgRpD/MGBViCRXHLfrhBbwAiZDo2dB2pWQjkVNkJYllyblY2Qteh2npVOJS2cfF3sFd2ZRS8LqyMar5oCsPm0lH8ZMAnY5LX0DMlx+TkC+hLWgw6dsnDxQw18oOl5+nybm9DwQgY8EFBxi1lXWrwgOQsNEDEUo3mgHnWfw9Jz96mh9EgGMLe+Sbs/qM3IV2iBfHc7wi/SAnG1R8MKxEJ8JZIxJzgMLMyth76hev9TuAyiP921E8ITQdQQAgd5uhmyCm/NuR++uu02nothA/x4MX+tGPeLpM2lHMMEG2tBlb7NGSLiDRIF/4FYhSMcL+yJ3sovrCuqjRunvqQwYoNX92VkOTUsvNexTs2sSTl/z5+dowImE+dgsko5Jb2HjZvn6pWttzh9g+EhLOZ7+VW6XQr33bNraIYBBKqtIDgvUeuRmjx8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(23010399003)(366016)(1800799024)(18002099003)(6133799003)(55112099003)(3023799007)(11063799006)(56012099006)(10067099003)(261026140227099003)(261022115727099003)(261022105027099003)(261026121527099003)(261022075727099003)(261028144727099003)(261021123027099003)(261021121427099003)(261009223027099003)(261102123227099003)(260925022911599003)(260925021311599003)(260925021911599003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hIu05/753N1IVTsT+aC1coUe7QzfI878TXYfxkGFKoCvZF7VX/yKyeYRxTBnyo7TlrCi9UW7v1AFM8SAJSzTILHLF7iQz0UvNI63Wg3odkJEXxUGAjFLifPBbGhwS6u7hZhMrsGwnOFU6kA4Nf7GSnqKCFzlcQWfS4WsrFovMo9VnAmJatpQ4VGotJnfhWgu4RK7nsbwDcTphDCVlV4WHLmN98C8ALkKBtqEiU92ds1KKtKErSW31drxBbzUYFw+vzaoJAyqRJOtCVUWl0Z3eUgpGVdgigbAF/xGG3sPjXycXsPSRxXtvKXwRXR+F6+N/e1ZF2ao7+lv1boBfANzT7FoM5jN8vTkGGMFTE4NXtWMInfwbv2q0ksy3Qj2HAE/ll+ZaSLjk8RKu1MhJHlJlX2tVyXBwFNDy+0KjO7SHMKkBrvvkP2vHjXKfS1p1ZbUyKS0rQXfB+vUYA8R3FiN0lSM4IeI1BDI8xl3EPw76joiXtixFOkvoFWGWy1agTlX3gIVpV+XI8Zom4zS06Hx4/kJPWw7p/mJzmSs5efJGtxSev+P2gCXsgcIj3jPTG+oQcyj+Go+Iw5LPJu9hH8Oa5mhrl8DL+jO3Xr5KyQ/OXti0UKU5ccOfmsxhyXFqw4PzzvYn9Nb6y2YbRkPJCrNjVb7DJLvvXoz/VVdPT4kmRuTZPpcPOr5bqgmu6rJKUfkKRdLjttPtq1DIl5xtT9mOhtsSbI/CSa8BLmI+Y7Bjjkbm3yKrsAs3qRs/37ci28kbllZIfc2rYq6773gwWJjM5R4Gf7g7x1PxebD5YhtEkAGnnQRjic6A7ly3M7qh7nqreHcg9B1bzUcwOMKIGrGVHjJbcEsatG8+dIIY+lFKT9TeGEZ43NwKlOuOHok3gbGFsz4pBKvNqH8OMz6z0gkLU3R7c6NgehILVcS/zXuEHMiZ0x4Qz6j3rMg0ssTZziK/wMpBgBsMfsL7n5OIo6KoawMyLYCiWQ+R47aLos/XCEHl2poq92i8GJsdNc+dT0ajAKsJFoaf4PGv2LBvLOZ3uZJmbCGlCCYDXYSqSdkiPxhFc2zo7Nfvup36II/E3FB0CvVFzvYbQEjUUhCX1AtnN6IhhlOcRtTd1nDdDrK5gdDy6XmjomRFc9dQvVtNPR8QOe7Rs4tyExNDHJmJTEE87zDx2lDPqHjIWWVfmNnCpji/gQbumbDks1rkfMQ2/jmNkGnN+x4rrTVxcaEOmIykhKVO3oxitgMNI07kY6asTOvL+nd1wEiyIcZcOmfXztay+Vgr/kNLZvjELHnFjZvZ+Wee5M96CeR2zqQVraNs0J+NHpKsKGMT7rqe4jzxQb3AUcmPEbyyiR8uJvnNahm6L/Wes+PPJrt5PwEUQXiFCJKKnX9VGblcaR7sbomOKX2PigrgOScsGa6o0z/6VOCno1SFiKydpCeN6vCDGRFwyWuHJTDdr9N9BH9E4LSs5hlbhr835sQxFbpaR6Dwzun0FQjxC654bSX9fwJj8PYButmBB4/M9q9iuQJPdeJ75InYLMoCrp3O2XSlFcmg2ekjPBXcQ1Ph3NYxRp6CM4xDj8AszREhgRpU4v4Qv8qE6hS3LyKJVYt49hNvXsQ8Iu7EfKUuavxgQaqnII5mJWIwbts95Yibgtm6JvWNPQNmL3Zo4FGQ9Yw5NoLhZuPlowUlFX6lPI/3S0cjBWOgRypKHHjTHlSeMazRGRJSSwDisezRWcvztoPOh+sO+rZ1reiLx+VWKtJ/Hk/1Fe3VZru1cY= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6ad09761-8d2e-4d09-0915-08df45744520 X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Nov 2026 13:02:59.0101 (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: de79aVHoBuaKxOl1n7zV48hdiHu5F415FwLiy4VcllSExuv7bNQe77idX3Y3VpJnZJiCFxXAPd/4S1NAU8BaaVKsGSIT9wPUygxzeUe1/r8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MI9PR10MB992305 X-Original-Sender: felix.moessbauer@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=HS93XVfU; 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 felix.moessbauer@siemens.com designates 2a01:111:f403:c200::5 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Felix Moessbauer Reply-To: Felix Moessbauer 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-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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()