From patchwork Fri Oct 2 14:49:28 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Moessbauer X-Patchwork-Id: 5528 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 02 Oct 2026 16:50:00 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-pj1-f55.google.com (mail-pj1-f55.google.com [209.85.216.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 692EnwYk006583 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Oct 2026 16:49:59 +0200 Received: by mail-pj1-f55.google.com with SMTP id 98e67ed59e1d1-39b6416441esf10043a91.1 for ; Fri, 02 Oct 2026 07:49:59 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1790952593; cv=pass; d=google.com; s=arc-20260327; b=BHyeKo0nUVHoyOTZ+99aFAFKGGX0EMRUtT4UprmpA94LhzZU1qMtAKqlA+T2BTcBAq 1XklO54XY+iACCqNc95N98oy2FlBVNx8RBTKBhI1B1T0nvoXv9s7oUzWRBkOYfgt6zRW GdW+pE2+HzSwUb8/TtBqFrj4luR0//meDamJdmYiTXSLmaHm2/9D9Ez2AoWQ1Grpc8gX xWgf9tTE9y8RclQlwom0VpVY64ug3aJfXl6WjWtpRAPW5SZB3rTKZeG1zQH7Ts7epLpJ Ycvgo6Mq0g63YDKwK9TvL/9h6BSR5EiraptpuiJhGx5/lhMRlOiA+kI3AQTN6pHccVyZ 0QrQ== 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=+WGc3zRsBrcP5NOXEpRJ79I/4l/FOAqfyEonV8XTW5Q=; fh=M/ZlqNpDvflsYDze02j7nzyf8xhEJSBjnvAXPqgL/t8=; b=P9Op9HpW09Y3dTXvvMTVnqqynqjCoKhfaT8fghLRHMClWCfiEoyJGACUC8KfHG3TSb k4RQ/5CGpnoH51/VuX048esI9lvAsLjdf0ku09dP6Ym3SvcZwsVDXUdaWd8HZzcSL/3F z2hzvQ7Dr1kBgiAr9dON3fZTFN/xF6g4KhEaeSqJTKFRkQ0UzXrxd30VnfAgGIcpo47L HPtiYwWoIrLl5dqmFNHDaFBaGMs4OQm9J3DL9CeKLDxJb3OQCk4FbP7Y+JHX6eJym3p5 /3BL276yzdBZctYZj+fPs16uxiQOeb8yBdPbm7KRdgcpwuZnN/IomZvl4OptteiONwO/ tGbw==; darn=isar-build.org ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=0KILc93a; 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:c20a::7 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=1790952593; x=1791557393; 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=+WGc3zRsBrcP5NOXEpRJ79I/4l/FOAqfyEonV8XTW5Q=; b=qhZtIGVuYGq4KvIYsPTjVdp6NsEt96Xvym4bVNzTDzeZd9/KJlt8LTLl/sFaIzHSLO 6d0BcTLZbLorVfeds3eJuluPNciAscjK2LKDkZFrGbBpzE+4BU4r6UhN4EJU2YMwOWTq CQgEtQQggBYpVGleKaHk+InDUvMNYybtxspv3Cer+nR5AAF9PuqMV01C1cMw3nvvhH5k GqVSMfWIjUy0fFGshL97jbKxgK+/R1eL3/3Kk40YovaQvEdqVi78jPxKZZHZRldzVe4K e1MN1MI+X/W6MqMSkSFoXGmHcE+f9ifIGXADxBv3gBkr7le2FeBUv+TS0aI/yzVeZAgU iVTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790952593; x=1791557393; 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=+WGc3zRsBrcP5NOXEpRJ79I/4l/FOAqfyEonV8XTW5Q=; b=SrBeoF1r2wP8ZJ7NdFpKGIcGSLF4iVon8gBJ334fcOcAWxIzId8U6RpqiyLKZ0hYeR j0CnD04Zju9/yFlZgkebhnyEMC3zaduB8GAMT1UzkKx/incZbmW3S1TAGDNf+5EmALl8 yu2f4JhZjF+5BTqN8Z9TijZ0feWLglT6dgqnDQoRYFalcPfc1qWK67KR9V3vpf8cALlB CntmllgGDrqvIrM+KtlfJjya7+ZVthSH7ZHVsK+nYNVUdiu8gG01ET+yLBGeNk4vgLc7 pDhRYMEhrusMs3KEDWqg4cEtMSOX0jssRyBXg+1O1HMLW+tnd5ueQmeMjVgHLsolKY++ sy4w== X-Forwarded-Encrypted: i=3; AKwUvBz65WiVQju2TW0wGyfVy+bsiR1MozDTKQG/PDqoqM8yEDQ+Z7HMnMvHkisMqnQp/SWeH2eLnss=@isar-build.org X-Gm-Message-State: AFq9FYLGEdEfx54jGXcCnBHdz3KgYTQz7WJBk0mUAPMuQpdwGXPXSXSb cGOJeSNJtZ4IZUxbpOq6qYz7NanBVRgK1W6Ti1/ACbgFzFbzG1XsY5p1 X-Received: by 2002:a17:90b:518d:b0:3a4:c725:2870 with SMTP id 98e67ed59e1d1-3a6ce6cbcb4mr2810933a91.14.1790952593010; Fri, 02 Oct 2026 07:49:53 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h="ATskLdczMimk/5Jyt5z8u09jEmtNp6G0uaxbFNKtZCEUeR33rA==" Received: by 2002:a17:90b:1649:b0:3a4:ac5c:1916 with SMTP id 98e67ed59e1d1-3a6d97c5856ls1414212a91.0.-pod-prod-03-us; Fri, 02 Oct 2026 07:49:51 -0700 (PDT) X-Received: by 2002:a17:90b:586e:b0:3a0:f5fe:74d9 with SMTP id 98e67ed59e1d1-3a6ce3a97e0mr2911943a91.4.1790952591477; Fri, 02 Oct 2026 07:49:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1790952591; cv=pass; d=google.com; s=arc-20260327; b=Obw0W8ZUiypOsi1Nvv5mwsVl3JCa9jwyBZhwXQweUmkdBcGQMyrOPRKwX76m7GoQtS 1adDI4o4V6P4OCgbvPNYQU0KbtIVU9R3paFVOIh3p2eACbv5HtKz2ZZF57QT+2O9R37x 0Wrq/Rz2JegfbA7hFZ+rUfOuXMT7kJkh/D1HkFRZNJmY6jrRj5lQ5JhCMB3y4mFOcxl/ xSRmdojMutCsDzdvm/l4jQChEldWmo0jbDnObaLm0dOuaJSkq7R4uK2ivmHr0X+kEEAo RS3x0ZZEHnI2dY6WDVw6MKZFF3O/yTUtsOvGsylQBcPLhfSPBGWP9/5lt/e56X9Gk9mI lHqw== 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=igW7TvbVE9FlKII0c4w7wyGY7CrpYaHsg6gNEauXmCA=; fh=8dBW2IRCVdGsmrD2hdAVDsJaRF/dLexRtANCwaOHVZk=; b=Vro+O3PFjv6z8ANdQxUZ0rWh+a95GoJCX3KR+bj6LGCLsb2ypae6xNXMKLuTOo+eWL Cmf5Jm94FsY/Wl4VGaxiblt6+uGPYGc1bBFpWcf8nVyQzL5w+ePS1xoZeuT3jOH71Nlt K5C2WYHACy7DiXOn35WeNkg/rifhucvwl2xMJ40tLtwzAbICwkwhB0WSop7qRnSpxptl xaafU92MA18PU2l2fnuUhZDKI7bEM97dorDrUOhyMkoXkZXQ3TQWiRvjToGCtHapILF+ j//Qh5Wsx/XYu3WNjUKdSp9DeF5EiEXyANyTT9OHjy1LmBQmGMzfXkkthowre7rKG+3h aDNQ==; dara=google.com ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=0KILc93a; 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:c20a::7 as permitted sender) smtp.mailfrom=felix.moessbauer@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from PA4PR04CU001.outbound.protection.outlook.com (mail-francecentralazlp170130007.outbound.protection.outlook.com. [2a01:111:f403:c20a::7]) by gmr-mx.google.com with ESMTPS id 98e67ed59e1d1-3a70a56be0csi13740a91.4.2026.10.02.07.49.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 Oct 2026 07:49:51 -0700 (PDT) Received-SPF: pass (google.com: domain of felix.moessbauer@siemens.com designates 2a01:111:f403:c20a::7 as permitted sender) client-ip=2a01:111:f403:c20a::7; ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FTEKTiIdFoypBEkyw5ACNNaB0ua7ld5sAD2Fk2EkCPUxuq3Qiu10RqbqTHkmtEY/D91Iqo/WF7qYjAWJgabcGpq7rsrwUHFw4TrGjgq7EUICepXIUQwfOa1016i12zUni1tcvomqd3XsShCIMXkW1wOZOoRY2h3YxJQkyZaKCTf/oheHCA1StiPQ83PzDRbbuTfD02rya9JATVwhAde1DSom/AaZHABuFw2DfyVgKUVNHBDUObciwCLkiG0G1d1z/9T1q/0fYfPw8n1YXp03C3IH+gSke7NVs6+Mcif5O5OP5i//l3RRWmS6wbVex2IhhLNg2YXhJHm8p+FXX2+r1Q== 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=igW7TvbVE9FlKII0c4w7wyGY7CrpYaHsg6gNEauXmCA=; b=utB59zW+DzZtrFR1aud8CBpyI1XuTeHG0aeEg55wp9TxOOodk3Bp1Q0Z7brQJzIeJjGTI+purCB/KvEf1LLxpP9wmolRkaz3wmCfhQE8AGl7K8Cyo5dnmbGBZcDNGGBQfS+LPFPHPHepGn5LdumAQ/AbhblJGZkfbNXLk9xndKqvCzhlXa4ICv0Tf9PHXwT+Q1mr42tWa0MTrA38szqvJGDeEGP8PqHMwQVCs5LewnyrhIxeMVNtpXdJcPY1C9gRbWcSajojp6ebLg9Di2Gfpm6rIK7DI+XN+afLqfjQEHYEybAWDVxSYysixZf2ymZQAT7ylMe1c4V6wrRleFE1ZA== 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 DB8PR10MB3737.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:119::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.472.18; Fri, 2 Oct 2026 14:49:47 +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.0472.016; Fri, 2 Oct 2026 14:49:47 +0000 X-Patchwork-Original-From: "'Felix Moessbauer' via isar-users" From: Felix Moessbauer To: isar-users@googlegroups.com Cc: cedric.hombourger@siemens.com, jan.kiszka@siemens.com, quirin.gylstorff@siemens.com, Felix Moessbauer Subject: [PATCH 05/13] dpkg-source: let the native package variant own the source package Date: Fri, 2 Oct 2026 16:49:28 +0200 Message-ID: <20261002144936.246628-6-felix.moessbauer@siemens.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261002144936.246628-1-felix.moessbauer@siemens.com> References: <20261002144936.246628-1-felix.moessbauer@siemens.com> X-ClientProxiedBy: FR0P281CA0205.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ad::19) To AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:17e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM7PR10MB3956:EE_|DB8PR10MB3737:EE_ X-MS-Office365-Filtering-Correlation-Id: 52886141-873c-4d22-c0bb-08df20946799 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|10070799003|1800799024|22082099003|18002099003|55112099003|56012099006|10067099003|5023799004|11063799006; X-Microsoft-Antispam-Message-Info: tuLrdr9dIsIzbqfqBQKDeQ2/si5goj/12/MUnWSOjD8S0EhphHF3OPh08L2IBCwvg0Ie07fQwFA+yz3NykacjK5bvzYtZU64EyvR/U26rsOHebLnqIztmIsgREEunDb+JBYyeVExMQuk32Q8coSq8dcbgmynzVqViJWEm5ZJcH3e79Pr6EJoWYcNh8vmf1hegMbHIEPRgpcUX/dBQNeXtRg3ohLbsK0hzASxRsvsRwYbPyRDFdsnfYWzM+ucV9yALUzcxMEDyMAgbYuTzHd0x+QQ52m3bCEFakwVEz5ZjOzLoKF4dOCIAAe1zOrrRvwKp7DHVsjlMFA/VPPFbcpkgIPwnDE+Wh/b7XUHHiFPWy8rjZMloqu8SO+9hcB6hpY0IE7JQSigD1harkT9DZ4nOTo1xGZEZTT7jQEyZ9l7F4KrurDnjF2iAkv9ZHjsuEt3HsWVoWE769eOu9S/R7HcGFmrxbh3i1h8nLciReUxPIQhC/Xs0HmOlPOBEGaT0JTAzqcallvAaAeB1+lfXWrgyCYuE/lfvtKz78MssDhkhX7uwkksqw8pexqj3NSgSp+5NVen3CpBUK2/UC/VJN/KVYzsW63Cycw7PDT9Ry117PN7Zx9blEDEdbh4zL1zx5ri/ngNd3uZ0JYBQewGblKAoCBApMNc1F1Jdbf2zHtHcys= 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)(10070799003)(1800799024)(22082099003)(18002099003)(55112099003)(56012099006)(10067099003)(5023799004)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: +a4mAASbFSCY9p9h9XNStJAZAZjhxcHutdSNiBXOktypf8OOaHS/hYqt9BFAMF3TVpgDIdYkTGzEFRGvxrRAVKj6H35z1j82hdDuW1385ABz2hVqnwXx9acfYwJZSryZ1kfl2clk+WzI8UHlblx8j/tHQ1zBEWGBDs0OAZiQdVQHVr/Kb+fmZQoRECEtIXYrRCo41Evq1AteI8o/SycUwheIJymJEobjEyBdj05shwJjYBNPlTnmX13qZMdRuxj9ptazd6HIs3vJIcEUDtMGAqN9YzeuFw+tPzxmOaLep0fK2TuelU3xpw1EYlkALjvxHJg0/qyvsctUdft54fpX8yHqc763KPt1ZP3sMhea31Pm+j7QMQjAOozOa93YdK2NjXRT08FWnME+NUX0kyKcz4d0WYV28NBuKbmTNhx6fWmUfA74g4ZH1eUU1IDEsAgSmmOdl7YAbVeB8JI1O1TdeL7SuFP2UydpkjYl77U6HNJA4zxLbxxyVlM0DIudHOsWZ4WAXeSRTx9KssEUVEWHZJbDSVN9avSspGbybFAqtkHMC2FtdseBI36UxmpiXVtyX3V3VkobQoCFLFRUeYVO5OYfQK6nCnKBHzET+2HEZ1PTtkDDZLcmENdyCeJlolZgXGyyar9EPAQj7ZlKkO3TqDkYTEloBxU8++adXc1WtTBEIXgKoCZVZllL27CpWf4FIt2FTTdRJuI3nU7qTWbDjWtJ4MFDDd6iAWl4iLUi5QVbI2clRWEaojbeDiW6mw0i3sC+0z4fiSEas+OcQpWNro9NIEEmWHT9x0StqVr3WTaDJ6IgalgTr5p/xrEWTYBxvz7gM4VO6Zrug4Ae58f6E6OaIvvFwZR6SLSxzKJXcwa1UUJSLo4s9PRaOnDaPYt0ZwGitzXWJq+YqfVnZsOvdOo/ClkyNvX24kgS3sN4/o2+Fn6p134x2+qJrLkRUktpzq2KnKa31ruih8kgQAZ9dmK4uOVJeq2Mwq9E3wVuCYUq5f29LkJwBA3UEYmTyDFNbUTibP/R5WwSvFw9W7cRH6opXKksfHXF7wAwO9vGUJWWxDtbjQNOE0sFCLrk2DSB+m2StemkVYNdENE+FnJOmhBisn22CCknBg0Dn469qc+3VKPAJGOyYmyvS0vrJ0KhWWoWlve/qZ1KLOqL3tIAbH2LJUgFm3V9cpk8cjrDeGsOZVSW/CHrLmBlNv40BGYHyynn5TfrcoLFv8iQTbft/B9VShoOb1lMtsCJw4ivAWHyjTwWQwWt1ef9gnLtEWCuq9mE1OEZ3aOU4zx8mDL6sLBQRR4XLCZs2mW4r0W3pf6D80nXOpP0W8m2D4Yo/wRnzRG46BdGsR97BIt9pPcmff3PFgXYIzAZ7mC0Jji+tC81qHA9N9wQp4OOvuDBUAlvF+4Hpw9QvG0mBcHaIhvpwPqJprevH7Xs5OoHzuidGlNT+uYrehrVUuRzuDa+mKfojekVNun3MEjSJdReiRjrJPt5U4BqftrYQE46YyzSZw4Hny59ZkcCvTXO/JScOhh+SPIaHzOnFQrPEvxvxyQ11pEyjpKIcSG9g/QAVjLGYGQYaH5SpLdG+iSK2qAwoEUaYe/7/IV7AUPt92DPCeKGKJ6w+QWO4uQLIrwAJnA0hkIdSFU7NzEbtYWOAgI/0gMKM6OUwrgPPFyL6UWWruYsXbgYUoBl4JXmJBXy3keWw2ABIhYdCOZcu2fFI645jpQgc/tBy1Z0jQTPk4KQV8UBpJfQfS/72GWtcDdxgui5jQsj52aZoINPLEnoOySKukyfLmGtA586 X-MS-Exchange-AntiSpam-MessageData-1: 9KPhQqOdTEj/48+bm/bQ247V0m/zGdqeVEY= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52886141-873c-4d22-c0bb-08df20946799 X-MS-Exchange-CrossTenant-AuthSource: AM7PR10MB3956.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Oct 2026 14:49:47.6359 (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: qj2ck1V7wJ6YtQG4CJdSyWfh51b4mHrvufWo20xz9h+e0pKSb3/B9ywVvL2mt+VerK+4BLIJWBJ7Kl5B74ZCBfouoBYXKO0pC+UP+Uk0tmM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3737 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=0KILc93a; 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:c20a::7 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?= We currently build the source package just for PN==BPN and otherwise fetch the package. This logic was implemented in 2ca3a7e to fix race conditions on the package, as well as issues due to them not having bit identical content. In 826acb3 logic was added to deploy the source package via the sstate cache, which also made the generated package accessible from both PN and BPN / variant builds. We now model the dependencies explicitly, whereby the -native variant of the package (on cross) owns the source package and all consumers depend on that. By that, we can also drop the fetch code. This has the additional advantage of sharing the source packages cross architecture in the sstate cache. As the kernel source package is architecture specific, we exclude it from the -native redirect. Signed-off-by: Felix Moessbauer --- RECIPE-API-CHANGELOG.md | 14 ++++ meta/classes-recipe/container-loader.bbclass | 1 + meta/classes-recipe/dpkg-source.bbclass | 79 +++----------------- meta/classes-recipe/linux-kernel.bbclass | 3 + meta/classes-recipe/linux-module.bbclass | 3 + 5 files changed, 32 insertions(+), 68 deletions(-) diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md index 3798a9d1..4711fb72 100644 --- a/RECIPE-API-CHANGELOG.md +++ b/RECIPE-API-CHANGELOG.md @@ -1225,3 +1225,17 @@ the rootfs. This has been replaced by the `exclude-docs` rootfs feature. The When enabled, the package changelogs are now removed as well (copyright is still kept for legal reasons). + +### Debian source package is generated from the -native variant + +Previously, the base recipe (`${BPN}`) built the source package while all other +variants merely fetched the resulting artifact. When building for multiple +architectures, every one of them produced its own source package, even though +only a single one is ever deployed to `DEPLOY_DIR_SRC`. + +Since the source package is architecture independent, it is now always built by +the `-native` variant. Only the `do_dpkg_source` task of that variant has to be +runnable, the variant itself does not need to build to completion. In addition, +the name and the content of the source package must be derived from `${BPN}` +alone, never from `${PN}`. If a source package depends on the architecture, +set `SRCPKG_PROVIDER = "${BPN}"` after `inherit dpkg` (or alike). diff --git a/meta/classes-recipe/container-loader.bbclass b/meta/classes-recipe/container-loader.bbclass index 8439db53..31c6e245 100644 --- a/meta/classes-recipe/container-loader.bbclass +++ b/meta/classes-recipe/container-loader.bbclass @@ -17,6 +17,7 @@ DEBIAN_PROVIDES := "${BPN}" PN .= "-${DISTRO_ARCH}" DPKG_ARCH ?= "${DISTRO_ARCH}" DEBIAN_MULTI_ARCH ?= "allowed" +SRCPKG_PROVIDER = "${BPN}" CONTAINER_DELETE_AFTER_LOAD ?= "0" diff --git a/meta/classes-recipe/dpkg-source.bbclass b/meta/classes-recipe/dpkg-source.bbclass index 6f9091a8..16d423d3 100644 --- a/meta/classes-recipe/dpkg-source.bbclass +++ b/meta/classes-recipe/dpkg-source.bbclass @@ -82,75 +82,18 @@ do_deploy_source() { } addtask deploy_source after do_dpkg_source -do_dpkg_build[depends] += "${BPN}:do_deploy_source" +# The source package is architecture independent, so it is owned by the -native +# variant when cross building. Without one, the base recipe also provides +# ${BPN}-native (see multiarch.bbclass), so this resolves in both cases. +SRCPKG_PROVIDER = "${@'${BPN}-native' if d.getVar('HOST_ARCH') != d.getVar('DISTRO_ARCH') else '${BPN}'}" + +do_dpkg_build[depends] += "${SRCPKG_PROVIDER}:do_deploy_source" # ensure that the source package is deployed into isar-apt -do_deploy_deb[rdepends] += "${BPN}:do_deploy_source" +do_deploy_deb[rdepends] += "${SRCPKG_PROVIDER}:do_deploy_source" SCHROOT_MOUNTS = "${WORKDIR}:/work ${REPO_ISAR_DIR}/${DISTRO}:/isar-apt" -fetch_common_source_schroot() { - schroot_create_configs - insert_mounts - - session_id=$(schroot -q -b -c ${SBUILD_CHROOT}) - echo "Started session: ${session_id}" - - schroot_cleanup() { - schroot -q -f -e -c ${session_id} > /dev/null 2>&1 - remove_mounts > /dev/null 2>&1 - schroot_delete_configs - } - trap 'exit 1' INT HUP QUIT TERM ALRM USR1 - trap 'schroot_cleanup' EXIT - - E="${@ isar_export_proxies(d)}" - - schroot -r -c ${session_id} -d / -u root -- \ - apt-get update -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" -o Dir::Etc::SourceParts="-" -o APT::Get::List-Cleanup="0" - schroot -r -c ${session_id} -d / -- \ - sh -c ' - cd /work - apt-get -y --download-only --only-source -o Debug::NoLocking=1 -o Acquire::Source-Symlinks="false" source ${DEBIAN_SOURCE}' - - schroot -e -c ${session_id} - remove_mounts - schroot_delete_configs -} - -UNSHARE_DPKG_SOURCE_CHROOT = "${WORKDIR}/dpkg-source-chroot" -fetch_common_source_unshare() { - run_privileged_heredoc <<'EOF' - set -e - mkdir -p ${UNSHARE_DPKG_SOURCE_CHROOT} - tar -xf "${SBUILD_CHROOT}" -C ${UNSHARE_DPKG_SOURCE_CHROOT} - - ${@insert_isar_mounts(d, d.getVar('UNSHARE_DPKG_SOURCE_CHROOT'), d.getVar('SCHROOT_MOUNTS'))} - chroot ${UNSHARE_DPKG_SOURCE_CHROOT} /bin/bash -s <<'EOAPT' - set -e - apt-get update \ - -o Dir::Etc::SourceList="sources.list.d/isar-apt.list" \ - -o Dir::Etc::SourceParts="-" \ - -o APT::Get::List-Cleanup="0" - - cd /work - apt-get -y --download-only --only-source \ - -o Debug::NoLocking=1 -o Acquire::Source-Symlinks="false" \ - source ${DEBIAN_SOURCE} -EOAPT -EOF - - # run cleanup in separate session to ensure nothing is mounted - run_privileged rm -rf ${UNSHARE_DPKG_SOURCE_CHROOT} -} - -do_fetch_common_source[depends] += "${SCHROOT_DEP} ${BPN}:do_deploy_source" -do_fetch_common_source[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" -do_fetch_common_source[network] = "${TASK_USE_SUDO}" -do_fetch_common_source[depends] += "base-apt:do_cache isar-apt:do_cache_config" -do_fetch_common_source() { - fetch_common_source_${ISAR_CHROOT_MODE} -} -addtask fetch_common_source - -do_dpkg_build[depends] += "${@'${PN}:do_dpkg_source' if '${PN}' == '${BPN}' else '${PN}:do_fetch_common_source'}" -do_clean[depends] += "${@'' if '${PN}' == '${BPN}' else '${BPN}:do_clean'}" +# All variants share BPN and thus DEPLOY_DIR_SRC, so only the provider builds a +# source package, everybody else consumes the one deployed there. +do_dpkg_build[depends] += "${SRCPKG_PROVIDER}:do_dpkg_source" +do_clean[depends] += "${@'' if '${PN}' == '${SRCPKG_PROVIDER}' else '${SRCPKG_PROVIDER}:do_clean'}" diff --git a/meta/classes-recipe/linux-kernel.bbclass b/meta/classes-recipe/linux-kernel.bbclass index ac587b17..60bf2a49 100644 --- a/meta/classes-recipe/linux-kernel.bbclass +++ b/meta/classes-recipe/linux-kernel.bbclass @@ -102,6 +102,9 @@ inherit dpkg inherit kbuildtarget inherit libctarget +# The kernel source package is architecture specific +SRCPKG_PROVIDER = "${BPN}" + # Add custom cflags to the kernel build KCFLAGS ?= "-fdebug-prefix-map=${CURDIR}=." KAFLAGS ?= "-fdebug-prefix-map=${CURDIR}=." diff --git a/meta/classes-recipe/linux-module.bbclass b/meta/classes-recipe/linux-module.bbclass index 05a36129..76bf03f7 100644 --- a/meta/classes-recipe/linux-module.bbclass +++ b/meta/classes-recipe/linux-module.bbclass @@ -51,6 +51,9 @@ python() { inherit dpkg inherit per-kernel +# The kernel module source package is architecture specific +SRCPKG_PROVIDER = "${BPN}" + TEMPLATE_FILES = "debian/control.tmpl \ debian/rules.tmpl" TEMPLATE_VARS += " \