From patchwork Wed Oct 14 15:50:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5540 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 14 Oct 2026 17:50:30 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qk1-f185.google.com (mail-qk1-f185.google.com [209.85.222.185]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 69EFoS2D008485 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 14 Oct 2026 17:50:29 +0200 Received: by mail-qk1-f185.google.com with SMTP id af79cd13be357-93edac58b24sf55669685a.0 for ; Wed, 14 Oct 2026 08:50:29 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1791993023; cv=pass; d=google.com; s=arc-20260327; b=fvUypY1fRKofpfMRKzTbP+POAshQeg8Ll0XvEegcUw1NDyB0WMnZkmUnUIgT1Zi4yt Trzks1Jz1MbSR1MbX56nCF4xcqLlyb5xMeMZY0Ol+XbmQ6x2T7vhCRhFhtF7BqIZgYTT LLJDjfWhcYDpc2A5kCcuaTbJ2ggkSUASxRg1wbRKQpYHeWMJKh1rdlmx43AY6DQzExI3 Di6d1EtsqVtONbm4oKQUldAZ0zoB8B1r03Wjsp65gAtllMXJLTxM4U8HXDdN67h3ixmh U+22rOdoT3EWwVgIidg5gx1cmTxoJof/gxvXItoiHrAoeBnJfZamq2wRUpGB/2jTtze7 cn/A== 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=U7i1tFBrHnEl+6vjN4FbrQM89/DkAPU4w/6w2t7J4a4=; fh=VihWnsOMJKpFRZGDYlgRojuy4Bn++L8P5IqCKwhl+zw=; b=o33ZRwzFz1AMfEpQfFA1U/BqO9DitG45XYnQ39mVYgmLQMqhO2TODcutA+lEk/ceZc baiM3SDOgf4MM5ittAL9nRRyy2xwn2nHmjaiYwsZkZBuYpGAgyKe6BTuU0l3Gvag3y2Y YPMRJmgGmF8yYQOzilm0Pl7ifCtnBw+2J8e04e6jf6INBKQuQrEz8zoI5KT7GAqSJ8Qq tj587QDMKNOeMiElPYf/Rc5Qk8RzN36SqglYt1pkGBLFRdHrOiMDyZx8eUaWvTy4WO6S CVm8kNDu8F0HpAumfl7YctiESt/0FGNfvYXYwRAIWGMUgfCBrXSpYN+zDG3k7cCDIRxU hUhA==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=bH+sqHpv; 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=1791993023; x=1792597823; 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=U7i1tFBrHnEl+6vjN4FbrQM89/DkAPU4w/6w2t7J4a4=; b=jP9W1ABNQq5wjhsljFIZdINU2QJK9qNKlTzur0LJV634kFIlF3+NLdm/vH/JCfw9ln 3va1JEDegNzR7xTLaAcNsYGTviEBbApsjfRZg+o2hX+i2Zm/vDwqkQR33wbax2mBn8eG QxaJKSebQjeqZ8xv4RvkgQkTJcF2wrSKdUGMf9LGh8q5Rbu2Y8O3TSrrJQ+5H/nXNeXB ojXBrlCBGQz59jYw6Qz7ggrAbsNWWXoUYM/Xl5WnV1iIONvKQ39sN4kc8S8OkI0nmBtv G0lUga7XWRh4ELeUyToy7PEUy2Xg+gZE+/N6PTeHf/2GNR5iR5xtBI6RZzr7b9n+GaeR +hcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791993023; x=1792597823; 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=U7i1tFBrHnEl+6vjN4FbrQM89/DkAPU4w/6w2t7J4a4=; b=Z9AplwGw3fm+RNPjZUAtgBsA23iq10a2eb4s83YAQYHFVenyKkMi0Gu9PZduslT7d3 1Eaz0I6JJsdgp8siTPybJEYKHX+oEIOIwhKgBYbNXh980Zk5WCFaIUKfOsEgVUPh5zpd 2HpttzI3xS0VJ0yyH+YOTVf8DDoOMwKFGSAhKCEkrBqBoOGCEvS/IuxnOcYUmGSQDxs2 O2+SQX0bM2yOYJfsQyO7OesjhngoXo2iVOvZtUIUY3c2+5DuyuUF8DTFjlR36zOsUuor 7oRfpjK4nprIi7s+6aLLRAD3HUZUL9EnKssBU+4LCy0f0Jg4X53R9VQ+qXPJ9LaOQBfh zTlw== X-Forwarded-Encrypted: i=3; AKwUvBwXAGFy6Vdg/YLgtgSUJZP3VfytEa1c7B+aNuz79TB1YUmd3A6IwwEmlYGUkWVfdCYSWjpTeDI=@isar-build.org X-Gm-Message-State: AFq9FYK5g0jidk0Nzkqx3FbOuvkC2TAq+4idz0eeheypw/GET0ub7rid ln2ApaOecZ/GMgwSjvdqggujBOCvgWVPr/jhtptF5fo3+p71+jV0NwJk X-Received: by 2002:a05:620a:390c:b0:93f:a34:d9fa with SMTP id af79cd13be357-93f0a34dd2bmr241179485a.1.1791993022884; Wed, 14 Oct 2026 08:50:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdeBhlfxOl87Z/DYDHr9N3XFRNH5aIukFag1mUzfo+m8mw==" Received: by 2002:a05:6214:16a:b0:91b:947f:a427 with SMTP id 6a1803df08f44-91bbab70095ls492846d6.2.-pod-prod-00-us; Wed, 14 Oct 2026 08:50:21 -0700 (PDT) X-Received: by 2002:a05:6214:5004:b0:914:48c8:6961 with SMTP id 6a1803df08f44-91b5d57c1b5mr269771926d6.17.1791993021175; Wed, 14 Oct 2026 08:50:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1791993021; cv=pass; d=google.com; s=arc-20260327; b=aMxYW2pOcY1f4jCaf7MsP6MD8y+bqtuE2uUKMg71LzVzhLvAgp/ZQIFtFVgGHGskzZ +NAwf3hrYi31R3QJuyl46EkWjBDBU2Xq4qwZduDsB9JpgnxDqOc6+M2H/6jA71OQRwJm HaMwjOW7c7S0Q9KYw0rRrv1x6A8cYngSGTm8Roo9vuCWs4QjUSbbvE35FsQyLvdZapAW Xne7ygvZ6E5et01FtSGMw07SwzL/dShX30JSBpyVwJmFGhLYGHaitQQtT7M4+Pvw1s1x /XTjsk9eHwlikGuDfQbMTGGnud6Kxlgz3/7uUdo/Ii7O7PCSeAk8lmiW2dn5VFIjpQZY wqMw== 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=vog+M/A1iHFlGlFGFlGEAYgZ87qFp9MS2XbUuJqWJL8=; fh=8MbhTH9sSb2NI8F60ZifaONmE6VNl23UrpyAIeWFoeo=; b=MTm+XLcT2TftfH1lNegXKqnXJ6E/JtOyuvt42ZZiE5/6cr0yz8sEPYZe/PjdofWwgG om5LrSUejKTHqe2kyJfGbII+SVRZzj2WMRAWtVfrSy8wHU+oycHX43cbRA5VqJdyANcz dKhSb1mmXz5yjRNBpKF3vYnWljf/ITojnxlPn6IkAhRhF8H1sKEgDL/jaz3K+6/+5qHc Kpg7oQKw7GacqMyU4q44Z7q8nHgAdI/Zv6sYtG2AGoLxNXUgDsLit2BSUTbXDwK9dT02 bg+UTf2tJRkn2Apm14+HYyPNeoVll6G1gn6d2qLJvKhv7uWITwjlo6AJ1J/RW0QgknKc pVUw==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=bH+sqHpv; 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 6a1803df08f44-91b97b8602bsi1613916d6.9.2026.10.14.08.50.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2026 08:50:21 -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=IzMD4hPOeQIqXmhnKi9o1sVe9DYt2/NDkCFK++ewpQTAC2ofuYMeLhVi/SQgp6HZ1pm7dzvcqkRFSnIgU7V5Kd1oQV7Qoxh6ZKStAtRbxk4uYdw5fbu4N+YC7cvRphCr2w3m3E7ELhNSr77McR8seIZDuxdw7aA9ZmtZRHKAInXP1cHvnGvijPhcPadea4GFKdamlJodR7ZpVWke65UIo1vIsvEZDP09o1gvWBDYIJnZ9ta8SWtu4T+SsvF6UMOBGUF+/MbG/kTd/DmlB9SnG4RN/m9uQPjYHLbJM4+YN0tRRRph2f2E8fyoeAATx1dqiL0+W/PibN7QGUpRRXnxkg== 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=vog+M/A1iHFlGlFGFlGEAYgZ87qFp9MS2XbUuJqWJL8=; b=idbcMzTe3hJIaYdoQCslottvGcLgMhK5wwYNURYTM7LvijkRN2YOMTeVSwXrxGiDs2tWmhrtsvWWlhQ33x3K74dcTZMD9MQYEuap+l7V9G8pin4BFbr4Q7rrUSwbV5m+kYrkWCY6lkmFbn6ygoHcSg8wn2ifIU8jg2OY5NuRHCymEKkq7y/qS9F8EdExFmKdd9kuu7XqP8d8eCL6jB22H2PSndtIJK0fGarOB3F8zd0bsxkjN6wtMRjo6N4MmGZ1OoT8pmewnKjb0PTYlZH3f2yfN0TTQMqf+XX7v0xzJ2bzNgtzfcEEp44+4JceY99btiw8DA8OuYLV6/YyS/w0CA== 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 GV1PR10MB6074.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:9e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.496.23; Wed, 14 Oct 2026 15:50:17 +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.0522.012; Wed, 14 Oct 2026 15:50:17 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: gamzenur.kaba@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 1/2] fix: only remove binary packages created by PN Date: Wed, 14 Oct 2026 17:50:08 +0200 Message-ID: <20261014155009.937200-1-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.55.0 X-ClientProxiedBy: FR4P281CA0401.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cf::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_|GV1PR10MB6074:EE_ X-MS-Office365-Filtering-Correlation-Id: 508d5ecd-fcbf-48a2-091e-08df2a0ad7fb 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|261009223027099003|11063799006|56012099006|18002099003|10067099003|55112099003; X-Microsoft-Antispam-Message-Info: iS1WmAxaDMsI1AUYCE7aCNPUYqM6SVceM9Fk9gR24cvWgYn4PR4xTx3EXEmFnHYkoTDcclRmglGfYrjEACYoF1ieUQ5jfvzdUcTXAR+GGXteIsT1QAKyy0CeAVqPuhVs9SxqcSTavjX3VunSJddEB8NqhO3trhNpMe5sDL+qzJc+5CPXSp/KfKtgbVz//rO8uajKup6+GsX9yyHjc9FQqoCVsye9t4+euVP8ggsKmWV1/88GJytNERSKu2ykm43wD+gtW+au/UTLrxjfGpfdlPFsXacCPnEPgCgpzgbOUhMrAu1wEHsxmK9TNuIYkF2ALCWY/HnLNvfc0yxkUQAzyCTLMZn5r+sqcez94lbzVBMohZ5JmbjBUr0dm/yKn7BnLW9v580su2PkpXqsNaeuYTdr0n2JiMkRD4e3Hrdb8DZ1PE5BScwF582hDGMzkWW0KQENTiq4tHPVfA82hJZwc5zaKpzUTUQJUOh+KwT7+LGB/l71WU2jKVWNv1FPLhvIQfUf2MXiw/q42trSE1c2/hUmTcwN7j5jPrwUOPhLUZp0k3SLpVox2NRaKBx6m/BWnPVIVoEmhggvrYfuFq2MaFnRZnz9aiYPE1t12yDvunnmXuS+itsy33dRGlIpejgFBYzsSKez/SYEP0M3MUsRootiFOXRqj1FqD07Ainw4Bk= 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)(261009223027099003)(11063799006)(56012099006)(18002099003)(10067099003)(55112099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: TSuJqBRJst5DxoMoyar105OdJJ4lUaEKJqQMLQGqmPJZfCjqN+oXy/nvG2PcKOvwr2uqekaR90TbzgbjvYkohF2GCZPQGN2MhlVoIlQbDJ+Y0neM8VRf25D/6FZNkxxGOLyA73GnRt7qgbk1CgnludyxyTCLepNL6P6esq8cU6+42XMpIjIQXlHKYTyF1GHYsqx+6rnY9ffEgld9XbfRifZWoHF1TbPMmM4T63CuS6BrqqGVmC4t0x+ObNGAUKkZavGDLItS8L+y3FB5pEKAD86JCPx8rJ2QqcXDDuMad9Wxp/XYhOy5WYPtuxM52EjE6VR5IERzT6N7Yj71g0Z4+YjWbSdasydUE+6cHWCeoBxXa/Sr+u2pFEm6e5U5cUGncMQycm44mS4KkMBgCxnAn5EZc4wucs7irnA16biecG1rOLIhM5n5mANxuPvmJ673u3UNId6uRgbDqW2SXQq6GRrykKuu90FCAtuic3T5Cx5MrV+ZghhJOLVpzKAa2zhG86JkwN34Cc7J9xFuJecSDyPJgFZ/DDq4dTpHcsnc59FqWmGwg5ZoaF6vwJg8xUbSfc0vIwWLltyvvMqA6oevcwHepWdlAlReyk8MMAMgPTpgGmt9boOfyj8wAdnySDqHxYu9SSMActxjPwfhshbWhx5INGFGFgxc9mnVEnstIiofOnhBbPS+lX9GhzdlaJ/zoB9gcfuT1wE9CjJFeH6t5TIoUj2xM5UaGppVZxfuZR9X+Ve0sDCyt+69xM0htDGUAsaehs9WBiVbyco9wOuYemp+WUxyz3+rU9P7doOEo19+RdqVtX4y+VWp1fEuMep6PrAMvWDqHWT3N/lBigg2+wo8VshyUujsIdBMFvyFSGKHxjcbkgNnhv3tOWgCVGa+Rvw/QRGM3U922iuVyI1m8hxfYFQyaiI9lMVIfJ7/zJSvujZ+U2tMaQ1KBnTsA8ktbL9EwaTOWjF11Cb9VYROcQqjiEEHjiPhtslyXyYAbf6PF1XojNfgOkmWqeCMwx+wy7LtI3rDR7sLDryDEWymTWzkFTgXscCsYq22Tx1AjCT4pPZxq6eWCCON2I9nUiy138i6JtIHzrcC1zOZDeZlD1+WRJ9GHDLW2KWCFQLu+dt9ZtA9kqDIkpLGmFSAh66d+Hsmq0Xf0b85FMxOnMOlWlE3ZWfVZgn5JD/lV/TLgQ+3iS/gQDQAM7eJO2kc86QVwb8VoYScoM2aVJLhAwZJRAh8a6bQ19y72fC/p4Mj37uIdYR9cfu5f3lh6+zoejWeqW7vAC4BEnQ2likgHVJesYAeQCeYvKTuq/4vgb1hB+Nion/ud/Mr4GTC2HU0kNM89KXxEgDKWja+ojAMPTsP7rMGDIJCv3gglOf+1+bE3Eo0LURSwRJZz6Jr7YnKV4AoZhY+I/DkShdfDSt7zDeWgXNlKw0oROsDvDBg/ABOZlyWgDQ3LRyQE86ic/M4ktaWuBOkyOFz3lC5kk85Mhx/ZYpeW01Jlai0THaiSDGHPpyqUiyzAcBQt4bowvw5ZMvuOIborJTSTClON66CXxlXKCc0HU9iV7Rf6wnsJyJo/RBA9CkHtekoTKWk1smQnfycPrCWt1M9i/WQX910+KreH8WnlfYqhUjjghhWS75Wn8OhmsqQDdGMYyHpGzWJKc29pdyBHV59XK664o7MDZ2wAclRbj71BmBzvfUKD3N+sh/pVwc/nApW3D62R0eFRkzHRq9aJfZ58oAZkjgRPTolcu2msmkhLNO56Q7eOpzULHVa5JrYq7/iB8L7WsnPRKGqPEENx4VY X-MS-Exchange-AntiSpam-MessageData-1: /vcBubNI0GxSD66WFMt5eASwU7RxJ6s2kbw= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 508d5ecd-fcbf-48a2-091e-08df2a0ad7fb X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2026 15:50:17.2756 (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: WNKXElb535Oj3W+GdehsKMtShOm+yAVciUk1da7pISmNlnrKYHM8A+EMw3uwg5TzRYMaZLd/U+dz2/vI7Xf6mIZT1xo1CpqKhn8tjnOu9E8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR10MB6074 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=bH+sqHpv; 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_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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Cleaning the correct set of packages from isar-apt is surprisingly hard. In fd0d030a we changed the cleanup logic to remove all binary packages that are created by a single source package. This however broke the case that multiple build variants (which use the same source package) are built in a single run, hence each variant cleans all other generated binary packages on do_deploy_deb. Having multiple builds of a single variant is perfectly fine in Debian (e.g. independent builds of arch=all and arch=any packages). To fix this, we switch back to cleaning just the generated packages, but we change the clean order on cleansstate: First run deb_clean to remove the packages from the apt-cache, then run sstate clean to drop the packages from the cache. Doing it the other way round would result in the original error fixed in fd0d030a, by which the packages did not get removed from isar-apt. Fixes: fd0d030a ("fix(dpkg-build): clean isar-apt by source ...") Reported-by: Kaba, Gamze Nur Signed-off-by: Felix Moessbauer --- meta/classes-recipe/dpkg-base.bbclass | 36 ++++++++++++-------------- meta/classes-recipe/repository.bbclass | 22 ---------------- 2 files changed, 17 insertions(+), 41 deletions(-) diff --git a/meta/classes-recipe/dpkg-base.bbclass b/meta/classes-recipe/dpkg-base.bbclass index b392211b..4ec0ddbe 100644 --- a/meta/classes-recipe/dpkg-base.bbclass +++ b/meta/classes-recipe/dpkg-base.bbclass @@ -229,24 +229,18 @@ python do_dpkg_build_setscene() { 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) +# Prepend, so that deb_clean() runs before sstate_cleanall(): the latter calls +# sstate_clean() of do_dpkg_build, which empties DEPLOY_DIR_DEB. +CLEANFUNCS =+ "deb_clean" +# Remove by .deb file, so that only the binary packages of this very recipe are +# dropped (instead of its variants) deb_clean() { - repo_del_by_source "${REPO_ISAR_DIR}"/"${DISTRO}" \ - "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" \ - "${BPN}" ${@deb_clean_archs(d)} + [ -d "${DEPLOY_DIR_DEB}" ] || return 0 + for deb in $(find ${DEPLOY_DIR_DEB} -maxdepth 1 -name '*.deb'); do + repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \ + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${deb}" + done } # 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 @@ -255,8 +249,9 @@ do_clean[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" do_clean[network] = "${TASK_USE_SUDO}" do_deploy_deb() { - # Removal is by source name and architecture (deb_clean), so a single scan - # of DEPLOY_DIR_DEB is only needed for the addition below. + # Scan DEPLOY_DIR_DEB once: the same list drives both the removal of the + # previous revisions of this recipe's own binary packages and the addition + # of the new ones. debs=$(find ${DEPLOY_DIR_DEB} -maxdepth 1 -name '*.deb') if [ -z "${debs}" ]; then # DEPLOY_DIR_DEB is shared by all multiconfigs with the same DISTRO and @@ -267,7 +262,10 @@ do_deploy_deb() { bbnote "${DEPLOY_DIR_DEB} is empty, leaving isar-apt untouched" return fi - deb_clean + for deb in ${debs}; do + repo_del_package "${REPO_ISAR_DIR}"/"${DISTRO}" \ + "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" "${deb}" + done repo_add_packages "${REPO_ISAR_DIR}"/"${DISTRO}" \ "${REPO_ISAR_DB_DIR}"/"${DISTRO}" "${DEBDISTRONAME}" ${debs} } diff --git a/meta/classes-recipe/repository.bbclass b/meta/classes-recipe/repository.bbclass index b9097de5..1b6acd9b 100644 --- a/meta/classes-recipe/repository.bbclass +++ b/meta/classes-recipe/repository.bbclass @@ -129,28 +129,6 @@ 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" From patchwork Wed Oct 14 15:50:09 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5541 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 14 Oct 2026 17:50:31 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-qt1-f190.google.com (mail-qt1-f190.google.com [209.85.160.190]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 69EFoTTi008496 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 14 Oct 2026 17:50:29 +0200 Received: by mail-qt1-f190.google.com with SMTP id d75a77b69052e-535066512b0sf120079961cf.0 for ; Wed, 14 Oct 2026 08:50:29 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1791993023; cv=pass; d=google.com; s=arc-20260327; b=iphO7PKemdhynhiCj0ksbJy34LvF7AFIIrsHmrkumVbCntHwtC6qiCCtc57XAK/VG1 5HKBkUirCwJqJP3b4Zc9uIxd0nPMgdTa86HdTPk0rJo6DdwJWJLYDzrgCw5+ZrtmaGQO YtG3ki/UlnkdfHwPCfqNqED098NQQDLCIGaG6Kd0mz3zx4Gcr1zAK2lWJaMgLhN/hS69 9o50V44a+brpYUWpKynOGV+Ct88HZAtlD7MeXH2Gjk0v31JrZQVcrNdhjkkDC0UtIfbV PjBwZGYaM67wL6ilirCwpx6o8EisP+om9Vh+vSongO9lNu1NICdpwwl4wFlxNH/KgRWW KM4g== 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=VY2Pw6qvpCnqsxTAgtYR7sXdVwQ+1Pajo56NVEyzhrs=; fh=dcGuVCYByF2VSMvvkoP23OuW25tcGJ8oN5u3YfObjvY=; b=kyd9ptgus1PwVKX0YqHsyqkLJGoszyygS+FiumdmQsC9Xy6rtPERG40oRxxzBltl05 9budX9+eAabnN00Efq0hOsAtFG2Of8EHkES/26db4qKzDRjHhGjgCMPodzVfHDcjoIot +1Epon7c8yQo0nLXPhKeuNcaS5KA80WNqphtPrl9ekSWKbkOWOMU+O+m8XQjh/PyZ/2M mibqOBlU0ypBfJbSRW3z2VFxYnB5IBnpJ9nCgHASexlBB+F7Ipl9OUbwGvSF8etIk9PM XPxxLqX5+ZHs2nu+mVgM56XXk/5N0icDNCdfcwcPX5oYCJBqCpbSHwu2PqZkOAUIqVrF r7dA==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=T1GxiSyU; 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=1791993023; x=1792597823; 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=VY2Pw6qvpCnqsxTAgtYR7sXdVwQ+1Pajo56NVEyzhrs=; b=tgk6aDDMP301Q/RezuvyRfFRaUcec8mz4zL+Ruv/HirQdEQS9pSmKOPVmz27zQ6aXn bMrAW9pHZznKnessg9XvULQljD8TzY0sM7L1zHbE+4GgBB9fJCyShpxBqH0GkOAcunsB aY7apDO8OR05O0eSUKNjokmEwj+yDfy77WT+hXnbdA8tkwkeEh7rDep9OCNgJ4OkXpoL W81wMpA0o9WCucArDsms+oj6AJB/P2kkzJ63FwkqLr4g0G9RQo8PXZCAG7KWPWmlMnNo MQKo8zk4/D7EgcE3J5FRs4+fEFwG2j3GresU06VW9I3CPkMOrb6tGiqZScrtWeQXP0kv 7DPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1791993023; x=1792597823; 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=VY2Pw6qvpCnqsxTAgtYR7sXdVwQ+1Pajo56NVEyzhrs=; b=mcBacKUNQLpm74Ywye5hI8U7ywkeutjBIqDIEJpIYGngU0YAl16K5AVBUT3usVs4Dv PIrNaGduKMZzRIlCABqJq7JK2H5aIqNU8OeZ0DvF1QRdk58PA40WcBYYHdUq6CK9HpJG aa6R5kzTJ3v+A80rHoQnOZN2tJHaKX4Nif5unGs+4UJ3wnoBZPGREeiHn8y+3+aZuC34 5k+fOnFcPvu2U/u9A7KzEKqR09CiC25kJs9cgonIqn11qMeHc64SLS2pc2HyVUiVHKsi vVdznDqn17tB+r1lU3tB+BADpMjeeB7iLV0zI+GCIfes8Uj7s5iQnqX2uk6YeZJnKGfv DwVA== X-Forwarded-Encrypted: i=3; AKwUvBz1MiONGwL3YmcfByfhEBsVjtcPwt0/IxYUcE4NjPAex3hNE8X04ZcBsCEdt8NC5ACHK+XHkgY=@isar-build.org X-Gm-Message-State: AFq9FYKdvAsMaKlJFlxJ2to9OPIGv7rHfGYIGLeqgUvzo7MakxNpBBJq adr+7UuXO280I05EAGH/97Gj8oMqIQr448gX/8IJIXH/KJyyKUE3OeY/ X-Received: by 2002:a05:622a:40b:b0:533:97e6:37f2 with SMTP id d75a77b69052e-5359fbb1871mr283838071cf.51.1791993023224; Wed, 14 Oct 2026 08:50:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdeBef5cBE6ymYFMCwXcNlATXCIeSoPlKY+2+ZWIXP7wnw==" Received: by 2002:ac8:610b:0:b0:533:3943:8a7e with SMTP id d75a77b69052e-5359e1eff1als44453801cf.0.-pod-prod-06-us; Wed, 14 Oct 2026 08:50:22 -0700 (PDT) X-Received: by 2002:a05:620a:1a25:b0:93e:a689:2dea with SMTP id af79cd13be357-93ebd25ca87mr2801045285a.42.1791993021851; Wed, 14 Oct 2026 08:50:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1791993021; cv=pass; d=google.com; s=arc-20260327; b=A+FiB3hUi3pziMl9p+WUs2eV6C2biZQ58Oy9lTg9eBQaqYNvTfpxh2rjmQu+Ly0P0Q Ey0pXwoqC+heri3SENLT8eVvFNeXlq/+9mgMQpjzhGgWdTPe1VPfNFnm0gqJ7mbScRQt h8vWXxW/eoAIbtnZQpFzfWBLt2ZYPe2ix1MYRRVx/Yt3Z6Jh/RNxHUSSU4ShHMR4VFsW WX6acF4UJLuzHD5fqfBRttz2TezP+P9o/dJqbXjStMFq+IDsnvqzTq8ZMrvfbRB7K108 fQrZhYNqKaywNQL1vNYlhFry9blOpa/l3idWR2gohcUu5zVKkos+eeSDD05bb+v1qFQJ LelQ== 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=EwK4FKB44QBCZgQUbIomnofBSZvi3icMCj3rlz3vWnw=; fh=8MbhTH9sSb2NI8F60ZifaONmE6VNl23UrpyAIeWFoeo=; b=gqoBz3Dhd3iONT9zcRbkYMBry0SCf1S1oaJpx99r1tIGbzkNklZdiCew9Z4c+n3wrC fpeCmOqtO6ZNV4w1Hs/UJ7hch+t9HjP3L5Jzjv0ES0NNXMfuldFXA3Odo9Zrt+/jJNkI Dqq9Cp4O6K9l+l1oKFP+7XInJNNq9kc+q5+pUmNB3zjKzCw9YB65INLEoyGvpm+coEeH vmchR6qBcmd6pJvm+MmiyELlHy+YToAKqDpfUXiN+T5RxnmoZ/U8p2x3BXFfNm2nrRil qWZ/He4s8ATMydXb57Fiejl5WF4BQe40wEA9rnRhxEodr5IL3KkzCznSNY/NqruLuJCK XRSA==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=T1GxiSyU; 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 6a1803df08f44-91b97b8602bsi1613916d6.9.2026.10.14.08.50.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2026 08:50:21 -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=P7oMsijcE4mVXkleoxbcZx1oqh2IVxgOxdr33cSKfsTsCCNuht3Jt+zRef7OxfSRfsSpuaD7dJ314RuVDckE2szTnli1RTT2HV0ssm+EaaU06eRFVSuTGLJyg/o964qFIwih/GvTnozbUF7uY0uzNrucbpEXBCdp6HLvMAfsm5YTP5WfyHEwDp8ZnJgaGHm04nSCcRF46Xn9g+GUlc8ZwRHmfQhoknXpulGi4nZhcv+X0Gt8QYX2QeXAM8YIPKwEuiCDbrus13BrypwbFxLhxiHF//YeNG+tnkjmYcOoOViReO0WfSWaL7LfIoHnCYHr4UF39xyvaLDYWkQuxJHrmA== 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=EwK4FKB44QBCZgQUbIomnofBSZvi3icMCj3rlz3vWnw=; b=fuAPFFYwgH1Iqou3JnY+KDctJxeqEWoKodWhUuKHcAOiMHo57Xn5EmoCge9wb/GSlKkEq4nade1XY8Af9+eNcRd3Om+oAFOM5e8su6Z77D+gqMr5tj2AP8OLzEFBPaZn3nPXS7XG5h6BrqPEfz4oicOjQ1E0ZqeKXlDxacXiBc/HdPH0UqNgslBDDT8tBrlIWYQ0e+0xsguwxbrj9z/kV2W5kQI2+J1iy3Yp20lcoSzYqWkvEKBWOKsACKFAH+c1o+strHgVkKMqte4g+y5qdZN4Cru5opiEi4mgCvEjMp3qnFnirwSloAM6Ka2WCp+fGYUO+Gpqbh7lNRI/ninaog== 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 GV1PR10MB6074.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:9e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.496.23; Wed, 14 Oct 2026 15:50:18 +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.0522.012; Wed, 14 Oct 2026 15:50:18 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: gamzenur.kaba@siemens.com, jan.kiszka@siemens.com, Felix Moessbauer Subject: [PATCH 2/2] testsuite: test if variant pkgs are correctly deployed to isar-apt Date: Wed, 14 Oct 2026 17:50:09 +0200 Message-ID: <20261014155009.937200-2-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261014155009.937200-1-felix.moessbauer@siemens.com> References: <20261014155009.937200-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR4P281CA0401.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cf::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_|GV1PR10MB6074:EE_ X-MS-Office365-Filtering-Correlation-Id: 6604671f-4907-4208-9796-08df2a0ad860 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|261009223027099003|11063799006|56012099006|18002099003|22082099003|6133799003|10067099003|55112099003; X-Microsoft-Antispam-Message-Info: vQPBnbYM3IxoVhWMKGrAy45jKIFBfQVt6nfAI65H1pXkVSGGLb8+sAf+nWPtxyxPsCloF+dbds3bOfj7Tt8MpBnHbk2RXNd0x9TXIXxG60c9Ee76lF7KpzKrQhxhaapjawjD8ta+6M4wCVM8AWeR853s2LzaU0NvQwsJxmi2WUnBFmtq0FNUKVrQbeQXhtMujC7XvbqOIibsI9A5oSH6JqMY6MLwJhiChbnD4Txz/QHskfHKY7Vd/THqZx2XJiB+LSWbyYggxyVxeXXROiCCLFFfnqPFMzipExD+cabcyyxpx9F0TtrDDJuwIt0ikM5Mq8CjKj2cGkQozOudomErE6YTeUSP7uoHge7dPtKANYfhqQLTbZwiGGa3rN9NL1LpFugKW8OZbw6Aq4kPLtBiIrP4K2GMORGOFyxe2X4E0lPlZ8DHdH/YaZL5fjZHvRAgH2zwwHJLRjFYIY98Rh7p9m8Tn9qzhStFDqYCK5KkSK7/nySWBDs5FgbqdHpUtPeABiuUoxag30b4KSL5dQtaIS0BA2Hn/hcMjdklh6kKlh/QUvr5vW/Sy69VcjeLiEURvSwqlgMMNJ7y8uLD0q7axWbwoiKH7FflHcr2mPrbvnleuKdLQzraVgsjnalksuPgAAStYVfS3NOlq7YzxRlUW2qXwG0BeH8AgHwVhR4GzK0= 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)(261009223027099003)(11063799006)(56012099006)(18002099003)(22082099003)(6133799003)(10067099003)(55112099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: r7n5hUcxqRogjQ0jBJh5VCZXdALm3kAmqQCxPoveEtxJ/mYbzW5q/R/cfEGWgEgPMGI/BaXyVpdpX/czsqSS6hivUFMLtK07xLng9BWZrbloDCuEFIubKAeIs4tWA8BkVHDInE91fmUa1lV9QnX6q1k43abKRdz0xdAkTwAq/sG8TEvIESnvRoqvtW/WgWI+gzTvi/BL8Tw3Eg6P5E5Etz37rSkeF8zlXhA/QPi8zoyK55snFs3ztP1PKyxRzGlhum/Wq8e6qlXuZh+r/K7Teo8cBJg1RphRDCOJsqtkzk2b5lL0j6LiVlDmCdDDWXGoS0v5OFSya9qcB+3N+vaQzJfAcBmCskQCAPdlLWvBY8LLPAIosEJ1SayRdZUKxm94aBI/b2RpHBHPn4iT8/ajp8RH52KV3iR4wA6iSPDpFDqFxe+NrpWDlHRRdSRmQyNYhepUH9xazvPmEGxwy9E7t+RaUAg897IuTtexwDsgbOxtcqpe8sJDS1EcPhFTnivCrdXxetJwhignCQJnvq6lpdR7gehZx75fUITuB8j2yTSggF+pjbaxAeK36Knc8ysPhllO6/ilm5YXIeQ3TeEi60tl5WkgwQ+WP/PKgbBLZjgnNqDHKJ3MUL5V5tkSQZ4MIulxN4lnlo41Q75DDGep8JQxLHnXC7WPcm1+LDU0yiDj6yDM9d5IUxCZ5JKa61JBQnOd2tsIC2T8Wo6ff2TZGk4mwxFGF7odSaVa8W/Bi6m6RU0qAV0V0KaalTZkX4z6AAsEuCAaan7S6b4gCKyaI+dgYETRLMIz0bM8jM3yElMBOkzB/HZAxqfLdY/ffJuvPtdCzr9o7let3gSCZfdC660SNQOJfdyMFXy9L+NwjxRjFrXnwtu2eg8I9/nAPCD2e0mEqp4iF9UTc8Id7MM1WNVWMDhxRepG6AttS5jfn7/A3so8jFkJJSjJMxtHTbKCnpfvLH7cKkcUI4OD8PGAollrevnPlZdfMeOSL/sXNkHytaadDrJ7eITg9RyhHS4l/lsuIAwxdfNiVcFr6lA1oVVXufkJe6nqc06TkO2hed9Ef611PqxLpv3ABAu+9d6QZxeTvT64YLeJdcEkiYQnNaMRkBqjlyZk3Q3KYo/v8srh7n5XDeyBbP2hkiiMpW+d8LSL+3iadIpjT0/TJ598ZFTEZs+OKfpVB5xX5pwE5tIltrdLrhKMvFUZhsFewGzgOf/cw5QXtEqoDFHIu5k0Ojqw/uPu8sedQtWniOLqTDvyW3GCDdKOoMlcLX4Ki6++pRui3cZoW+11n+O6URbfX1Lf+tXX7AMU1bvSk7fcfR323ZOwwGZWCSMRH6v8zmGXZ8Ar/jDev4jYV6r2xy9vvy5ZO38uwvCBOYDZeo5d0wHlnMUPCSDpZfh9ukje19FZ05wXQRgzKMfyNBI7vG0AdhUDKw6kl8xkf70nbtK5dK9fK/gW0f3X7gnLHeoLFfi14/01hAqZe1OgdgSGwmPTDJR72L+OPjhcoLNPaFig9612gDZTjE/sSdiVHgxq3Bm/xKekctWa72WDqseaDltUgt236ixQoVR7G4RXgYD1KBGTZEU1GnXQWO1P/flMIC0fOVy4ZCsi1loo5vdKh5oB2Qm/8TUTQcx3Zk0Vug6qw53EuTZ0ykFVsklebuTkp+65Wlznt7MA26p1yw/r89GcxqVz3e/W3xx6Vso5XMXQFUNuaE3izlzZoINJMqF9GAOHXbd8MWuzMg1Z09gimePuJLK2Nxzu+f1YvvfjX6efNK+qc6C9ISdU8deGAzJAo6HCbV0ss7FO X-MS-Exchange-AntiSpam-MessageData-1: 3Fkl+wuzGz6woR9pT6v49S8ce1k/SEaMkVU= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6604671f-4907-4208-9796-08df2a0ad860 X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Oct 2026 15:50:17.9325 (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: AN1sybBhga50GTbkqchM/YwumI1K1pSv2WoZQFch8zOhpx8i9sqF5u6p8eB1h1RML1O3iwEDP9MfqVwCqwSc+D8c3lL+sloAt5sOFyw3BDI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR10MB6074 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=T1GxiSyU; 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?= Test package built in two variants that share one source package name and one architecture, as the kernel recipes do via kbuildtarget.bbclass. Each variant produces a differently named binary package, so a cleanup that keys on the source package instead of the recipe is visible in isar-apt. Regression test for fd0d030a and 1182a45b. Signed-off-by: Felix Moessbauer --- .../recipes-app/test-variants/files/control | 18 +++++++++++++ .../test-variants/test-variants.bb | 25 +++++++++++++++++++ testsuite/cibase.py | 13 ++++++++++ testsuite/citest.py | 20 +++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 meta-test/recipes-app/test-variants/files/control create mode 100644 meta-test/recipes-app/test-variants/test-variants.bb diff --git a/meta-test/recipes-app/test-variants/files/control b/meta-test/recipes-app/test-variants/files/control new file mode 100644 index 00000000..b171c7e7 --- /dev/null +++ b/meta-test/recipes-app/test-variants/files/control @@ -0,0 +1,18 @@ +Source: test-variants +Section: misc +Priority: optional +Maintainer: isar-users +Build-Depends: debhelper-compat (= 10), +Standards-Version: 4.1.3 + +Package: test-variants +Architecture: any +Build-Profiles: +Description: Binary package of the base recipe + Built by the base recipe only. + +Package: test-variants-extra +Architecture: any +Build-Profiles: +Description: Binary package of the -kbuildtarget variant + Built by the -kbuildtarget variant only. diff --git a/meta-test/recipes-app/test-variants/test-variants.bb b/meta-test/recipes-app/test-variants/test-variants.bb new file mode 100644 index 00000000..19382807 --- /dev/null +++ b/meta-test/recipes-app/test-variants/test-variants.bb @@ -0,0 +1,25 @@ +# This software is a part of Isar. +# Copyright (C) 2026 Siemens AG +# +# SPDX-License-Identifier: MIT +# +# test package built in two variants that share one source package name and +# one architecture, as the kernel recipes do via kbuildtarget.bbclass. Each +# variant produces a differently named binary package, so a cleanup that keys +# on the source package instead of the recipe is visible in isar-apt. +DPKG_ARCH = "any" +SRC_URI = "file://control" + +MAINTAINER = "isar-users " + +inherit dpkg-raw +inherit kbuildtarget + +BBCLASSEXTEND = "kbuildtarget" + +DEB_BUILD_PROFILES = "pkg.${BPN}.base" +DEB_BUILD_PROFILES:class-kbuildtarget = "pkg.${BPN}.extra" + +do_prepare_build:append() { + cp ${WORKDIR}/control ${S}/debian/ +} diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 2cf8448b..e5150b36 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -115,6 +115,19 @@ class CIBaseTest(CIBuilder): with open(config_filename, 'w') as f: yaml.dump(cfg, f) + def isar_apt_packages(self, distro): + """Names of the binary packages currently registered in isar-apt.""" + self.check_init() + pattern = os.path.join(self.build_dir, 'tmp', 'deploy', 'isar-apt', + distro, '**', 'Packages') + packages = set() + for index in glob.glob(pattern, recursive=True): + with open(index) as f: + for line in f: + if line.startswith('Package:'): + packages.add(line.split(':', 1)[1].strip()) + return packages + def perform_wic_partition_test(self, targets, wic_deploy_parts, **kwargs): lines = kwargs.get('lines', []) lines += [ diff --git a/testsuite/citest.py b/testsuite/citest.py index dfb6eaa2..0cedcc2c 100644 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -194,6 +194,26 @@ class RepositoryTest(CIBaseTest): bitbake_cmd='do_rootfs_install', ) + def test_repository_shared_source(self): + """ + Test that recipe variants sharing a source package and an + architecture keep each other's binary packages in isar-apt. + """ + targets = [ + 'mc:qemuamd64-trixie:test-variants', + 'mc:qemuamd64-trixie:test-variants-kbuildtarget', + ] + + self.init() + self.delete_from_build_dir('tmp') + self.perform_build_test(targets) + + distro = CIUtils.getVars('DISTRO', target=targets[0]) + packages = self.isar_apt_packages(distro) + for package in ('test-variants', 'test-variants-extra'): + self.assertIn(package, packages, + f"{package} is missing from isar-apt") + class SbuildFlavor(CIBaseTest): """