From patchwork Thu Sep 10 14:01:59 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "MOESSBAUER, Felix" X-Patchwork-Id: 5452 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 10 Sep 2026 16:02:47 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pl1-f188.google.com (mail-pl1-f188.google.com [209.85.214.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 68AE2QDF007264 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Sep 2026 16:02:27 +0200 Received: by mail-pl1-f188.google.com with SMTP id d9443c01a7336-2d6f80c76e6sf141145055ad.3 for ; Thu, 10 Sep 2026 07:02:27 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1789048935; cv=pass; d=google.com; s=arc-20260327; b=CYUKNA5o0Ryct+5paYsrEmSEe3+EqnUBXN276zRO2hqTLTVF1n//eaCKGZ5o4FAk75 P9By9Y/kHmv2PCqxXh/aGkIPKLCcR5ogzv5u1XPfcPeBuzAjoL+GsACQzPC3J5A/bKAt 8xoAeptLA6ioK57gJ3foHqsIRwk3A3hD03fsGuPSjlFDW/hOQmMLzpeRrIL2CTf14fvn PiuSwLbQYQURHFyEpwhfXZKy5TF9n+lsDpxnUJeQ1U8Blofd88x+QApQDS1k4MGuNwZe ByyeTZzLqEODQAAFYfMu8sDryO6N7BWo0apbbcltgjEviFwajm+YN984owcklsQUrDYZ hCxA== 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:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=0KkrkjxuknO86r/PUaVIAus6kv01r6wnNoaR2Rfkc4s=; fh=tWRnaPcoZoxyqskY8ydCyz7LegHLxjnjiCIQfU9d2qg=; b=moNJ0G+FB1YKhs+NLksfqnFHUDhi8zPK7x9/gv1Z37ejiY6M9ArBfbZ+HDy2+NQcD5 kgglNRHFRjyfFvqpiMUu4cI21E3o0hZrGjIPzqqSl2Hx87QLfSrgPDbLQOPodW2BTs8Y Ew3Cy9p7dVm5AiJdsIkksSsDsesyg4e2KaoLqxCcC5XEtgV4d9erDYLQogMRCmNNiCqc 7YGKZyAJ1oE8Y0EC0xUr78a573N4+cuKlqIbIKzsviQltkciFDaS71cJmZ9zt6wdSK97 TEGIUR4hyN/FdM7WZqUr9pZVlqbYwxzGVrRp1hZdXGZnnJ9OzMXZlZi9YZMU/g9jy4g6 HNVQ==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CPrq7pdm; 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:c201::1 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=20251104; t=1789048935; x=1789653735; 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:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=0KkrkjxuknO86r/PUaVIAus6kv01r6wnNoaR2Rfkc4s=; b=HWReITnFOly7wPcMGJ4IFQycgM5FzXDEsnunZbnuVcxf35juDRKq1ma0KCff8Cw5sz A0cyEy0YY2LQMWDs543Ns1u3VBt9sAK9wWi2OvWO266QqrmOyzHH4yfArKhgieJv2Rlx e8fFBv4Kk6+E29ijo/vDuLc0Uv5qpVZZhwN5CtzVHDpXRSoiX+tixUcCGv5tN8eIDErA Jx/baHCpLuDJemMzcnsq9Jhton8DdS/yky+/E+4fyXnPq+NXObdUn/EmMS0jRNWSwGQ+ ArW9LGAuTqlh3ho8fNMEnL3JGFsRjzsXROAag6pC03NgEE253mmTTs7N4VDGiaGvMS2H ptQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789048935; x=1789653735; 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:references:in-reply-to: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=0KkrkjxuknO86r/PUaVIAus6kv01r6wnNoaR2Rfkc4s=; b=stpAzaxtPP4N1WFKqYo32BJ4cMeTNj8NZPMNaSpuF5hz7YhtCbiosoGq48DgJTNq9J R4pEHwFe2EhrAuh9cYZ5L8eXtn9jDJUA8ZmUj3eNVOHCR83IbCabce7TAOlXPnygjdhW rTUhMWruJcFBWS8oSmLUsdCNGrgMSjdqkoihruuZIIbwzD7CyCmU468xbd47Ycvts7BY k+pBZx6j9ZGO6OCCQBiN/UesN1BbLRUbGTsn+rNc0BcOUfFRHmG+nGi6FEdoghOpl+r6 37rhLHlP6X7wXYEBPWAbusBW/4Cyer475p69J0QPKOfTxYEVbtK65NjO+CqIngFO/Zcs XAqA== X-Forwarded-Encrypted: i=3; AKwUvBzELCboBSkZFQrGQUdQkL+6n4TZc8toVvGwSoR9huYDUyynAO+Am+axAFpoDyuxG4NVZQEvbxA=@isar-build.org X-Gm-Message-State: AFuF++lKkzfzJ/F/6sWmvXzexdEN4ov2G4yHBx415SoVPxYsj4YZobzG UGo16K3WlWgJg/RiAmEiqiMMTq4xKo86bVAdCVVG9ozTZNRzSqY2ecTg X-Received: by 2002:a17:903:2285:b0:2d9:520c:38e7 with SMTP id d9443c01a7336-2db8d817b24mr148758695ad.1.1789048935112; Thu, 10 Sep 2026 07:02:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdcWYAmthM/66Lmy7h5v2N+VWwO/i2m4v9ymuyjQKwJtbQ==" Received: by 2002:a17:903:1a68:b0:2cc:73e3:dc7 with SMTP id d9443c01a7336-2dd0dbdd13cls23989535ad.0.-pod-prod-01-us; Thu, 10 Sep 2026 07:02:13 -0700 (PDT) X-Received: by 2002:a17:902:d2d0:b0:2db:18fe:bb08 with SMTP id d9443c01a7336-2db8dc822bfmr166786965ad.10.1789048933513; Thu, 10 Sep 2026 07:02:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1789048933; cv=pass; d=google.com; s=arc-20260327; b=YdX4bb+3wjyAfN4pU50IbbFUQA5CHMcFr6jtL/vmxCjP5g7dXpwkB5KrihvrfktBAX EIe/IIRxMuRvhPWr32MwYi5tQ0ODFQdKBWD2RFjgkNu9Ex7xlruRiLKdLfjATXlbrIV5 iPbOF0Lu1LM5mk/cZ/ynxfh6y+O2joJRC7Upo7C8feHbt70avNdgTToWB+DmUHcqW+EZ 1xcI7OmfWZo5/XcB9rNa2dIFoGraKm/HTsackjIuOZBgYKA7i5IOw228Lmiz0JXpTmj+ sOJ8nER0U9tjGfAkO4+x2hVSn30P9Lu8er1l9/0K/gsfsJUEdnJLD787iNn+sZaKvmKb oh1A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=GPTHyxQ5kNi63DzhokBt8DkQLBlyp+v1tpSYCB2sulo=; fh=2vPEtVRFZgJExMSCfX53nKBFsjiPYp/60rbGy5S5Mwo=; b=GQoNAd7GhhsgoBpfcHsmjEMRawpgGvJkchP1qVtDIYwacfIM2AclaDt3fsIRgvKP5j 55jqt0h7hUgz+rFQ0Az434UbMGVQ2etIZqF5D8lGb6H6gs+kdT/0f9V+nuf3BT6lSsCW M3w1aN4fep3bOhWt6zei/r8rHAq7zyCRHvTShEySRorcRAqzgXe4W1hpTRPjsqDmSTYs nGdPzhjC8JGUXqz//OeSMbHI2PL0ytwXYFaQ7ZniAbizLTZx7Ps3B/fV1uv6ZUjPkLR0 r1P2IyEhVyStq2RJCsFaHg3H2H7jFxhS8miCHNi9kTZ1T4otdbpi0Wzx7znmoQorTc8W 5HeQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CPrq7pdm; 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:c201::1 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from AM0PR83CU005.outbound.protection.outlook.com (mail-westeuropeazlp170100001.outbound.protection.outlook.com. [2a01:111:f403:c201::1]) by gmr-mx.google.com with ESMTPS id d9443c01a7336-2dc733cf1bcsi1764205ad.8.2026.09.10.07.02.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2026 07:02:13 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c201::1 as permitted sender) client-ip=2a01:111:f403:c201::1; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yHfgRWABz/Pj0fISXg9zyg/Ye0kxqSuwBxv6bqKHb5fWGUDqwtg1+Bi/LGWcNg0jFcklcCBa1TcqXj6x6wgAwl5Ys1IQ98LJmnfx0V27QJllCD+76l00Oli8+9WGbS7MXMDV+o5hh0uRjRsvz7IBpKNwLIjLxPn0QfmIJO4ERpvMLlj+vcq0BJpbzKIbsiYv9DUEQjU71DVhHGWnvJxSaAPK/luy8HhbHskj1kmB/vlZBIBKPyZ7Hsehy6B3WjBddLy9s90MclqRA1owQu75CHJFzbLYgkCkXE7ZEFiLW8WlEdN+8ehWBRhizUNv8xy0PzGYR4xGE8bNES1p3EsykA== 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=GPTHyxQ5kNi63DzhokBt8DkQLBlyp+v1tpSYCB2sulo=; b=m0VUsVmKebySf2CeQu0q0ze4wsdsAm2faSe+DHIiR84v0opraVN75iXBsmzLh+zvqFGY3TSi+t1bCF8d3ZHUDpo2mK4gWYyr85xr6KEv7DfBRaqW9Y1mcRH7Qfq9ptoeE6hzSHMmn96pky0Y/qBatYQ6pG/wQAvLEMLDuPQJwT4BbmeR2lYrnbpBx5K21mvfBn9IWz4Ml6nnOSQSYuXWoqptqyzXm9IX9WktKMFXCw9siiIrO4kqfEp+0FyJQoIDXCkgqvgx472WnFGv9OqzO6ZyxuT3MVNhHC+kEfEFH6biTyNPxiK+CXpunSG09ILPCR9ky/CUb1Iuw9f/kO4uxQ== 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 MRWPR10MB9602.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:501:9b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.406.9; Thu, 10 Sep 2026 14:02:10 +0000 Received: from AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c]) by AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM ([fe80::c54c:ccd8:ebbf:477c%6]) with mapi id 15.21.0406.007; Thu, 10 Sep 2026 14:02:10 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: "MOESSBAUER, Felix" To: isar-users@googlegroups.com Cc: jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 2/4] fix(dpkg-build): clean isar-apt by source package and arch Date: Thu, 10 Sep 2026 16:01:59 +0200 Message-ID: <20260910140201.250854-3-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260910140201.250854-1-felix.moessbauer@siemens.com> References: <20260910140201.250854-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR0P281CA0138.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:96::7) To AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3956:EE_|MRWPR10MB9602:EE_ X-MS-Office365-Filtering-Correlation-Id: 1d41c6bc-68ce-4801-142e-08df0f441bad X-MS-Exchange-AtpMessageProperties: SA X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|10070799003|1800799024|23010399003|376014|10067099003|18002099003|55112099003|22082099003|56012099006|5023799004|11063799006; X-Microsoft-Antispam-Message-Info: q0jEyCFv4uB+1SEdN6xgkyqDm63B2EjtCICpYbWD8MYYXUZOBnxJ61WrKtanz5zpsCb0rSuxNzNkj8w+LkoNPGb0OLeSOfwsbcG9jWuAZlD8/3cO3L8oTvZJdpkfntTa+Yj+2b1CAZz3Ag2l9k6QmGwmDQuse2mKIpX1+ls63c5c3dEoPr1EjrVM+DqoZbeNDKeHfhSYc8M23l34ICKH3XywPisHTXcGWAGNTbrfzpl0TQyvAuOZAgQmBD3XUQS+9+XZOz4FkEADvlaG78Z3+5RZJxceYCs27w0qYl6RIunPWxaVYMdwB1/psgF+5KZocyjKoh6ZU/ap0/+U48zhVAlyMh5+C/hSi9SknDkXa4RDoR0hro6tq6v3Eerh41ITrsR+z+XtjSD/PHwwD5N39r12kCA7RAwTIXLyChGHHoMY0FZbAV9QpCx/enK/cnZ42xCKmLR2+w5ObQGcGO4rah2sCDDDvRdeGQqhtZS9z5zN1lOUcV3TCqvlqnXipHyQU2ozBZnMyIi3AybHJxWO7Q+FgNZAoSOWJONjccjveyV5isUulpvcsp5bEKSn8vKCzNhQpb7wJC9UwoabksnkbhTCp4MQEddhxzwhsHjszXpK0VyGXmBm5wK9nMveU7d4L6LO90Km0D4Jan6XNI5m/HGCqAibOhwVDEwiDRBXezM= 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)(366016)(10070799003)(1800799024)(23010399003)(376014)(10067099003)(18002099003)(55112099003)(22082099003)(56012099006)(5023799004)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: bZqUUcxn6MbfGXsOY1n5PjBbOjyJOofmcZO7hYS4MZHaRXSMvWEOHlEH54fBtVKdaheRNEmTXpQ0t/0w6BHAj1nYvp/0/Al0ud7U/a7KaaVjwMqJwMNCQm+M9y4D+gEwG97AtYk87gkNxq9r9g+vtlWLhuDebP/VZu/o94wXZAlmjR1m0DlT2epsUX9iAdi4FLbzTqzeKP+BPdWzc5udAEFZ+m8LMKsOrcPqDjrNJ8zeSwlrypli4H9514Rz9aDXTVtovhaNzwc3loolqbb5TZ+HTnPBG4A+c2v80mvJW65hjVfKATQ6xql0OyV16ipUnDTV1vloBlWM4Pd8YBy7XDy8vwMFvp/qKMBaYpRVba9qIG1/IO915FX03WpJR3bBafhZ1uDNLzs9uyWAW5afQwUIxlTVroJs+uDL+0YZXGV79ebK9paWh2qxXIWch44m2JCBI+UcApG+eLYTo8IMTM/f8TbrrJQiTIiIlTUwvJS8wvlfIzOzT6NpsjClgm0ZCTlEmasH/qb/2qQoNA45J2KnUAhPRrWJMg9yahm6zRCB+8T3tpePjoxOs/KTvMJXCnMoTzDrDRDul/6xc56q0z6WfjAvzy88L3syD7e8VyNCfExnjCCmQEdE40UIkvu4RuxyXrVzOKsHLWSl6/SPv0pPUxI4SF7rn2FZZkVFPMrM73/qIhhiCHQP46eQTtH3JchJrYC83IGx21ls2j4WGkDvmA6XbhqirGlZxo1AhaLiHzKRQopYXAVWKfeiuctdTohXypNL5vZT2KNIW9gbKhlRTpWFInoivSQuHqW06bPdmH0+1E+S0W3i04teMOf9Ev4WCiN6NvSk8H9jULf5L3Kw4h0RzFogpmdF2tritUpo1wOP74fxZ2vUyqejprHKy+0wTd7wxBk/qxV+bx6TADute+z32B6RG5nxAENl8rgLY9ZnTWZgzbYkXsvDAt5Whcn9TDgHDiaXQQugOIbJxGE2fqrzQ+1AyAxnUzcJ0L5bvIzTcCMpPUfHO3RMtxuLmzquhQOT2FTxk0mPgKBkZBlqL/WTMM0BMbO3z+DgcrCEiR5LvIzMQ8/OHE7JiyvqU8/J7ismrkXiS5UXBh7MW6qgWzj/51EUEm/NTt0nAcqjx5qQO1RdbU0urBC+myokxEwGxPWgnCE3tPRp0yR6BW10JZc2Hrez57aoPf/fd3bB9ea6bBK2EdCdvjAaYb1JORX9EklV5oJ3hhHqz/NVDZxg3pMTiteN5FR0TVteVT8QmjyfImtoNkDjEzCDb3eb+5g5LocuZAyzB2p8Vhn6CmVcOgSRKFD+/xcKfl7pHQmPnnK2aIBOL11CQC0mU715uYgQYLekmbJzdST69R9dfStcOigRn2PERz5DZETomOUaj9oc8JyccbB7E/UYBQGNhVoayAD3xqELuh6uvqsVktj+5NU2Ww1nz/RanwXPrrvCRts53MNJv8AP9UZpp1xwuYid9rcuDoVzz1cND5zhOJXFUxqjOL7Q86oY0eXM+6HYhzIZ8CEqo+fqlO/erPeqbjtyqDNkQW4CJSJG2+w7ICDeida8bTj7bRUM2JKOoWpk2wH3nnPqUDx7sP/p2r2EK3reWu3E2pbJU0zwru/USZIbexpuvDAJd5N6MepIYTcPAZKxGKdTAQ/e9ax3CBxmBqsnX34AW4yJDYr0Et6rAhIho/kTWXiLIZNQUjutnDnq04P0f68rjbqI3ChC++xbFnIz5scRRHaim6k0HVR2QbvXBe3ltXpCnuhs2hPUSFpoHM/Ns9YM/Lqi67+jFmm/pVYObrNd X-MS-Exchange-AntiSpam-MessageData-1: fMMVYodiy5nvGTgtm9PVkK8IBQuiAatDhu0= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d41c6bc-68ce-4801-142e-08df0f441bad X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2026 14:02:10.7513 (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: f1DVyl2DfIwliVNjwx0WujOoKv8JnmdEjqgcM0E71h7z4QBeod+63IukqZR4DUgYVBbawGwepTYrhKxcbXGClrbJTTw0z3U3AN0FxDzvm10= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MRWPR10MB9602 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=CPrq7pdm; 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:c201::1 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?= deb_clean() removed the packages from isar-apt by iterating the .deb files in DEPLOY_DIR_DEB. Since do_dpkg_build updates DEPLOY_DIR_DEB via sstate, its sstate_clean() empties the directory before deb_clean() runs, so the scan finds nothing and stale packages are left behind in isar-apt. Remove the packages by their source package name and architecture instead, using reprepro's removefilter. This no longer depends on the .deb files being present, is idempotent, and also copes with binary packages that were split off or renamed between builds. Fixes: 1182a45b ("fix(dpkg-build): deploy debs via shared sstate dir") Reported-by: Jan Kiszka Signed-off-by: Felix Moessbauer --- meta/classes-recipe/dpkg-base.bbclass | 22 +++++++++++++++------- meta/classes-recipe/repository.bbclass | 22 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/meta/classes-recipe/dpkg-base.bbclass b/meta/classes-recipe/dpkg-base.bbclass index 164f247e..66f4d177 100644 --- a/meta/classes-recipe/dpkg-base.bbclass +++ b/meta/classes-recipe/dpkg-base.bbclass @@ -231,14 +231,22 @@ addtask dpkg_build_setscene CLEANFUNCS += "deb_clean" +# Architectures under which this recipe's binary packages end up in the repo: +# the concrete build arch (PACKAGE_ARCH resolves DPKG_ARCH=any), plus "all" +# when this is the build that also produces the arch-independent packages. +def deb_clean_archs(d): + dpkg_arch = d.getVar('DPKG_ARCH') or 'any' + package_arch = d.getVar('PACKAGE_ARCH') + host_arch = d.getVar('HOST_ARCH') + archs = [package_arch if dpkg_arch == 'any' else dpkg_arch] + if package_arch == host_arch and 'all' not in archs: + archs.append('all') + return ' '.join(a for a in archs if a) + deb_clean() { - DEBS=$( find ${DEPLOY_DIR_DEB} -maxdepth 1 -name "*.deb" || [ ! -d ${S} ] ) - if [ -n "${DEBS}" ]; then - for d in ${DEBS}; do - repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \ - "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${d}" - done - fi + repo_del_by_source "${REPO_ISAR_DIR}"/"${DISTRO}" \ + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" \ + "${BPN}" ${@deb_clean_archs(d)} } # the clean function modifies isar-apt. Do not add DEPLOY_DIR_DEB_LOCK here: # CLEANFUNCS also runs sstate_cleanall(), which takes that lock itself, and diff --git a/meta/classes-recipe/repository.bbclass b/meta/classes-recipe/repository.bbclass index a2061100..d255d1c8 100644 --- a/meta/classes-recipe/repository.bbclass +++ b/meta/classes-recipe/repository.bbclass @@ -129,6 +129,28 @@ repo_del_package() { repo_set_release_date "${dir}" "${codename}" } +repo_del_by_source() { + local dir="$1" + local dbdir="$2" + local codename="$3" + local source="$4" + shift 4 + + if [ -n "${GNUPGHOME}" ]; then + export GNUPGHOME="${GNUPGHOME}" + fi + local arch_filter="" + local arch + for arch in "$@"; do + [ -n "${arch_filter}" ] && arch_filter="${arch_filter}|" + arch_filter="${arch_filter}Architecture (= ${arch})" + done + reprepro -b "${dir}" --dbdir "${dbdir}" -C main \ + removefilter "${codename}" \ + '$Source (= '"${source}"'), ('"${arch_filter}"'), $PackageType (= deb)' + repo_set_release_date "${dir}" "${codename}" +} + repo_contains_package() { local dir="$1" local dbdir="$2"