From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406651323187200 X-Received: by 2002:a25:ae4f:0:b0:db7:d3f9:adcd with SMTP id g15-20020a25ae4f000000b00db7d3f9adcdmr9849638ybe.54.1704300307039; Wed, 03 Jan 2024 08:45:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:b7c7:0:b0:daf:6c11:349e with SMTP id u7-20020a25b7c7000000b00daf6c11349els552429ybj.2.-pod-prod-07-us; Wed, 03 Jan 2024 08:45:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IFHUxU4CLYB6yeGakAQgnj6tMkg06W6E6JztD2v2g9XcSPktt3zmT8S2GYfPACdEhqjB7b4 X-Received: by 2002:a81:ac44:0:b0:5ea:eb5c:a797 with SMTP id z4-20020a81ac44000000b005eaeb5ca797mr8506723ywj.10.1704300305735; Wed, 03 Jan 2024 08:45:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704300305; cv=pass; d=google.com; s=arc-20160816; b=rqcnzhK839zpcvjNsk1KIbiAeHTl7vt3zWikTuCi9MpevH8PuDMa3Hbu8ga9jlvnnv pzwmiCh8ZMAlHG13ig+DG/kgGO53PxMSXqyZht0DQ8wZNMDgP2HmVK2SulVhEgi4nySH oVyZ7GSIGJ2FWYIlqGvbYXCrNT9zXWSFNDzsxoHEBQvx5wdysWc6tiNCZ8oawIKwLJSC gtqdKV+pa6AGZlkFxrHh4iA/J4aiEZtDl+YVAOIemEQ488DubW0Mp3gEIkMTQaYt5dmx 6yxcnLjKgTspzKgRuLlLi/S7hX0TbcYEK1Lh/BzVtvdHoPo6/12BFXqjncrdl80n7Xe1 KmaQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:in-reply-to:cc:from :references:to:content-language:subject:user-agent:date:message-id :dkim-signature; bh=7bttC+P7BSs6atoMMlLhQhinQxiXaaxC5E3umbe9MAQ=; fh=2KHBdC6ETCLM9A35o+V+zMyURRjbQhidaJpej5hggcs=; b=rHo0kOfq427wcse6sayRYAtsTiOSNaZV10IBdDrsQLW2PXSRQpdxRW0LW7vuPWRA5d rVSdtVfb4y1fWmJLBZaSroh+eP/dMuunexvHRumeugfG4/NeH1nTsCEHUTRIsZjRUHMa XZpyYh52cBifguoOEoZDustqhOpniNeOolZrYkRVcZwohnRLdhyQ0mk35mJyIFLzK4Nc 3moeAWNhSPhzgBJxx80Wvpea5/ongj1CvIkxZ7LxzcGIflSXB0/+XlBe2/qJ/P3N9A0q N9/T++tVLennET1wP6azUg7oeWhXQYrPs6OmgRnsxjZAlHQsK1fmbJ8YdIecv0AeDe87 fKDg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=I0q3cysb; 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 jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::602 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0602.outbound.protection.outlook.com. [2a01:111:f400:fe0e::602]) by gmr-mx.google.com with ESMTPS id c5-20020ad44305000000b0067f62632d94si2688106qvs.8.2024.01.03.08.45.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2024 08:45:05 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::602 as permitted sender) client-ip=2a01:111:f400:fe0e::602; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=I0q3cysb; 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 jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::602 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fxo2Jqx+aC0iUarXMggfZXmlcXyLY+5EHN9TlrINtvkTKWOU0HKfYGXu6inYroXGqr8J1pxNE+QWT0/FwUPFYHsGgM7p9F0MXa6qmJ+BaUIbGc8yIIJ6j8ALsreScFwHCo1jpOEXBojFYK5LKdpASFB3A6RYnu6b0obloMOXY7fzwo3DNwQ/hkUUrl7hlpSL5NlEZm4F9bhMLE50BOXF4CMEykno/3yD4ibUm5XVcm7hud07Z1NPTnbtLxyaYCDoizZsfb/fnOICgSvpFzSuk7nRDA+pnzSsEKoG/EMDCoy7Edg/4ocfmdaGoy80GipwpHANu7+I3uXr1miMm7Wozw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=7bttC+P7BSs6atoMMlLhQhinQxiXaaxC5E3umbe9MAQ=; b=iDnqvfPyqojCAHvdF5GXG3OTBn2VnZJlhDi+1ziHu4wjfF1SfVHwwSTJn2gL2POwSIGL2XgMY5L6MAs4opTa6wLs6NKC7URbMlmSYk4nkXVyKrijz5S72S9FR2PDMpVJRNNUHSk7iiEZxD5a4GOvBcEVJ1vQ6UGeGpt+dVlV0SbDBJYiuTsdQIuWEBiOL4k82qrtKMmhuNx2K6+3sGeYiJWPZLSxJ605lJ2S3jZR8iWEo0ggI/91SIHxZ2MASIIMCWHHUCszCvxhrukUUWJW4S31x4N+gAVbjRdB+BgH7RgeySgUQenBjVlCxDSdJ59j7TzdoZil+zd+JBUQtELYrQ== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7bttC+P7BSs6atoMMlLhQhinQxiXaaxC5E3umbe9MAQ=; b=I0q3cysbBYquAkLUQJkOQXMTC2x9GG9TbQ3L8vBlJMLDCEzjcJxBKK6SBBNbntwi9CwuCQ4GBOmJ6mFQE76AIGIrc1t3gR+n4MQ96i+IWU3dqpavOP8Mm/e809ofyCQvQtbhY/3nYk0pB5yXKeove0xP246tVOHUceyItRcNgbgtc87+p28mad1ZLjzGB4x/BFQ0N2D49hgb0BG2rTB0345exHAmff9jTfb5JKtEjaKJ88u7hjmoIEjohHWWNxQMj9CdzsdLVeJKp7Dj/Bd010o11yQtn4S3dmu5h2clI1zSZA/RuZnM7wZtRvvXjVHff27Jx9QLl0x/PfP6LcQ/Fw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from GV2PR10MB6186.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:76::15) by DU0PR10MB5148.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:344::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7135.25; Wed, 3 Jan 2024 16:45:03 +0000 Received: from GV2PR10MB6186.EURPRD10.PROD.OUTLOOK.COM ([fe80::c463:2929:b52e:f171]) by GV2PR10MB6186.EURPRD10.PROD.OUTLOOK.COM ([fe80::c463:2929:b52e:f171%4]) with mapi id 15.20.7159.013; Wed, 3 Jan 2024 16:45:03 +0000 Message-ID: <692fbc91-19af-46b6-9e9f-11da674bf217@siemens.com> Date: Wed, 3 Jan 2024 17:44:58 +0100 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] dpkg: Restore support for replacing pre-installed packages in sbuild-chroot Content-Language: en-US To: isar-users References: <9b36ffce-0214-4734-b04a-06475bb0c97c@siemens.com> From: Jan Kiszka Cc: Srinuvasan Arjunan In-Reply-To: <9b36ffce-0214-4734-b04a-06475bb0c97c@siemens.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0387.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f7::12) To GV2PR10MB6186.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:76::15) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR10MB6186:EE_|DU0PR10MB5148:EE_ X-MS-Office365-Filtering-Correlation-Id: d3dff65a-e31f-4e40-7a92-08dc0c7b54f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xk8EbwDstSRXPcvi7ihu9M+gfKodEVwL3RabZRMWTGrqgFR7ifcUZu0+HMFqB9qYZZQ9ZTKD+oKtsZnIpTZXBbdI0rhUf3jsv+UwhEqcEjgpEChKJ1PpzpGk/+Yfw0BkWBjmpDvDX9FjJpbxqHk8M08nL1TWUb1P+7+sU45b0vO15U33XYjL2B2/v5J4f6RxKY7BKnOjZbpwQOjShGN0VB/2e+Zk5T3HmjlmqwgrQ5G6LNmAE8J+3Zx9bB4Llt/1VjzxKN07qVvaSVvW63a5r6AsoFuIgQMyAN1l0RgZdJ7EMqcKS8s0aD4drVKIPwI0tA4KzcC78QAOf6hp38ID/Ra5bN9d6d/S1aJrniMqjJtr4XCiwZPHXs1UqVi0NIMGN3W3UHZPRi7GZhBOtL2zIP4kyJsl01y/alGcW5nv5p8lcoWd/rswRBYHxVCGoWMU+34j5XpbU2sef5xUe/kwe+sHySZLbZcLSuDLn/xzrK6yXZTwIBxCHapiFm+xjigSQTLwRmm46p+Ce5H2J8Gn49VJA/ty9O7R0ShECDfTY4S6SqycosC/41sFTEul5HJw4kpv+5kJqWoeY8cN/aMcAl4EoKzJk5Q7k0uI4Cgj6jxfxgpU+Kxo03R1P5T91UKbwtx+xiKymmhBne0Lt0T04xutfDJRJw6SONZRP1DMUw0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV2PR10MB6186.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(376002)(39860400002)(136003)(396003)(346002)(366004)(230922051799003)(451199024)(186009)(64100799003)(1800799012)(31686004)(2906002)(8936002)(8676002)(4326008)(44832011)(6916009)(66476007)(316002)(478600001)(36756003)(86362001)(5660300002)(6486002)(966005)(31696002)(41300700001)(53546011)(6666004)(6506007)(6512007)(82960400001)(26005)(2616005)(38100700002)(66946007)(66556008)(83380400001)(45980500001)(43740500002)(360504008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?STE1T2d5ZXdIaTdJaVdHWVJsVTZLQU1veCtkWlNxTFV1NmtOcmtCSGc4OWE1?= =?utf-8?B?dnhqcXUxajFUQUJBcGtJcVA2aTZGTHZtTDhSMFJEY1N3WWNpdEFNSVJNYVNk?= =?utf-8?B?VFFocWdaSlIvV0FyUDlLbGQ1NUpkVlB4U3VZdmVRYllaMlUxdXJQTHROc1dP?= =?utf-8?B?YjV0bDZodU16aXJ2ZHc1anhKVDRjK25GQ09qMlVxalNwUWpFcExIU3V4cXVL?= =?utf-8?B?TmdhUzFLWUp3S0pWZ2ZNTXBlekVNZXlhZ2lsTk1UMFhKcHVtZEJwcGNIaXRS?= =?utf-8?B?WG13ckM3aHg2ZUJITXlZa2lIRUozS0ZjVEdDVHBRM2kyRnR5ejBqNmt0UGxS?= =?utf-8?B?VHh3eGtUN2Rvd2w3OFcvTFJmZzVKUm02WHVoMDBwY1FuTGkrUFZaTWZjNXlU?= =?utf-8?B?YnRHYnlUdHBvR21oVTdXNmFkdGJuUWFPWm1rakl5ZGtwL3Z0ZWQxQ29PWW80?= =?utf-8?B?NWMvYjRYdE4rNzcvZWpkT0xWdDRmM0UvMXA1VzVNMG9jZUsvWnNDWUlQSXI4?= =?utf-8?B?OUFjWkNzNk5JL0pUR2grY1JGVWpDMDU0Q1luMWJGaDh4Sk1wKzBmemJQQTY5?= =?utf-8?B?eE9rTmQ4c0VTaCs4R1JxQ0lzdnVxSm9lYk5FZWx1TlRsVWlCQndEVHNNbDhX?= =?utf-8?B?Tlp0bWg1bytyQ3d5N2NUSm9aRkFsWkw1eVROWUFvQWJ4SGVFTDZ6MTBsZjhk?= =?utf-8?B?ak82NXI0VTBLYmcrSkl3ME5ic1U5cE4xQnFLei9KMmpWWTkzYjNHNW5Scmo0?= =?utf-8?B?T0FYVVB1dHAzQ3djRE5pbE1jWTVBRkxsOXVSTmtHYWFseW5wK0p3L0F5M2Ey?= =?utf-8?B?K3U1NmxKTHVsRUFrb2RJWGlWSi9sS2YvNDZ0eHFHdlJDejhCVXNvTU43Tk40?= =?utf-8?B?WkR3cU9UMFFnL25PUkxpNHlnc0xtdG9tQmFPa0xkYjhaMFVjcWE4VDI5ZXE0?= =?utf-8?B?V1d2V283UUlvUy91QTFFRTRHODVmQ1hhbVVqOU9RUEJSb2dySDU2enJUZDB0?= =?utf-8?B?OEVMaDJIVWxwTWlTYlpiMzFpcFdobWt6NnNXVFo0MlE3a29LdTk1cERFR0My?= =?utf-8?B?Ry9pUG8yOHRyVUEzVm1WMmpGNGJ4NmoxdTc4OUxpK0RUNjFsYlExSm1McVhl?= =?utf-8?B?anB2aTFIemRQYlVPU2tESjM5MUYrbWJ1dXBHUy9QWFVEaGhUTVJJZElueXBv?= =?utf-8?B?WW4yQ0haUE5rZ3ZIRTZ3aDlYWHg1TGtiUWFBZjlnQitQWXd2SjhKa0RXTUNk?= =?utf-8?B?K2NWQ0ZYcjVpSVZjcGptdzJseWVLYnI2ZHlNZTBaYTVUR0YxVENLcUlnY1FP?= =?utf-8?B?ODBJWm1FRGs2RlpIcW83MG0xaklaR2JqRnNnek96SHgwY3Q1cnJJUFl6dHBX?= =?utf-8?B?cE9RR1FOYjdMNUVnKzlJYWZLdkFXRGxwcmVOeEppTlkxZDVucS84UDE1ejNl?= =?utf-8?B?dHNKMU1pTVViall5dXIydEtrUEdwUzc2QnROb3dLUjArd0VvMlNTWlpvcHhn?= =?utf-8?B?clhybngyN2hsUW5uTHRwQ05PVjlHdW14ZVNCd3NUMTAwSEdoZEMrd2VldThj?= =?utf-8?B?QVVlRTlVaDdQV2FQMnUxVDlDUHhCTVQzeFc4K2h4TmpaOFpNSUpOb0RUVlhn?= =?utf-8?B?S2tHZmhFNVRiZDNDUkZaRzhIemZkY1ZpU3dndUpSYytoOFlWcW1ETmZqTFYz?= =?utf-8?B?dE5ydFNqbEQyeHBSS0xkSTJMOGoyNnBGY2hWRDVxUkJES3poeVFISCtsWCtD?= =?utf-8?B?dWJQeEpaeTVNS2xITFBnUzBRdTVSU1hiWE8wTDVob2ZaNE9NQnVPVUZseE1U?= =?utf-8?B?dWVYcm9FaysveGlNT1ZPNXA0V1NGQmk0VFlFeDNSa0xtWUgva2dYbWVPRzNS?= =?utf-8?B?bkJUWndDM1p1bzZwZ2ZjS0sxN0RtN0lmUG82SFlGQ0pIZ2M2OGtRUWM5VFVy?= =?utf-8?B?VTlGN0l5a21ZYkFQRTkrTjBZeDFKL3V3VjRGZG02Mms0bzVjcVhaVDVRN1pV?= =?utf-8?B?K3BDTmNKNDEycVdXem9zampqblprZHZnR0M3c0gzQXpxc2xjZVdsbEFrdlpy?= =?utf-8?B?dE9Ga1FDcjZhQ29Bbm53R0NWN0sxbkcxK041Szd5L3M0WjhJNFh5UzdrMzJo?= =?utf-8?B?OVFXbnp4a1BSYW9uaDZpRGNVdnhYdy8vVWRSb2VjTDBDZ1hJK2s5WmRrZWtt?= =?utf-8?B?U0E9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3dff65a-e31f-4e40-7a92-08dc0c7b54f4 X-MS-Exchange-CrossTenant-AuthSource: GV2PR10MB6186.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Jan 2024 16:45:03.1025 (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: 2abEjepCKJ0KzW85d0VTz5jvFwsBYOjx3mJTxJL0GQnP7seb/YKW3xHOkUCtee7UKdgDphC0fDNLRIKOq0jSfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB5148 X-TUID: 815kH+9TiU6g On 02.01.24 08:55, 'Jan Kiszka' via isar-users wrote: > From: Jan Kiszka > > During the migration to sbuild, support for using self-built packages in > the build environment was lost if those were already part of the > sbuild-chroot. This restores it by adding --apt-distupgrade to the This patch does more than I originally expected: It is currently not even possible to pull additional packages into an sbuild-chroot from isar-apt. As that feature is a precondition for replacing packages, it comes implicitly with these changes - widely obsoleting the approach Srinu was taking in https://groups.google.com/g/isar-users/c/TAtC1wA68mA/m/lI-ci5LrAgAJ. Jan > sbuild call. But that is not enough because sbuild will only upgrade > packages from already configured sources, not those specified via > --extra-repository. We therefore have to switch back to configuring > isar-apt during sbuild-chroot creation. > > As rootfs_configure_isar_apt configures the isar repo under > /isar-apt, we bind-mount the one in /home/builder/${PN} to that folder. > Another difference is that we now need to run apt-get update explicitly, > but only for isar-apt. > > Signed-off-by: Jan Kiszka > --- > > Changes in v2: > - fix regressions caused by adding isar-apt to more schroots than > needed > > meta/classes/dpkg-base.bbclass | 22 ++++++++++--------- > meta/classes/dpkg.bbclass | 5 +++-- > .../sbuild-chroot/sbuild-chroot.inc | 2 -- > 3 files changed, 15 insertions(+), 14 deletions(-) > > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass > index 7b054d3f..6a6964b2 100644 > --- a/meta/classes/dpkg-base.bbclass > +++ b/meta/classes/dpkg-base.bbclass > @@ -19,8 +19,6 @@ DEPENDS:append:riscv64 = "${@' crossbuild-essential-riscv64' if d.getVar('ISAR_C > DEB_BUILD_PROFILES ?= "" > DEB_BUILD_OPTIONS ?= "" > > -ISAR_APT_REPO ?= "deb [trusted=yes] file:///home/builder/${PN}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO} ${DEBDISTRONAME} main" > - > python do_adjust_git() { > import subprocess > > @@ -221,8 +219,17 @@ def isar_export_build_settings(d): > os.environ['DEB_BUILD_OPTIONS'] = isar_deb_build_options(d) > os.environ['DEB_BUILD_PROFILES'] = isar_deb_build_profiles(d) > > +dpkg_schroot_create_configs() { > + schroot_create_configs > + sudo -s <<'EOSUDO' > + sbuild_fstab="${SBUILD_CONF_DIR}/fstab" > + fstab_isarapt="${WORKDIR}/isar-apt/${DISTRO}-${DISTRO_ARCH}/apt/${DISTRO} /isar-apt none rw,bind 0 0" > + grep -qxF "${fstab_isarapt}" ${sbuild_fstab} || echo "${fstab_isarapt}" >> ${sbuild_fstab} > +EOSUDO > +} > + > python do_dpkg_build() { > - bb.build.exec_func('schroot_create_configs', d) > + bb.build.exec_func('dpkg_schroot_create_configs', d) > try: > bb.build.exec_func("dpkg_runbuild", d) > finally: > @@ -297,11 +304,9 @@ python do_devshell() { > bb.build.exec_func('schroot_configure_ccache', d) > > schroot = d.getVar('SBUILD_CHROOT') > - isar_apt = d.getVar('ISAR_APT_REPO') > pkg_arch = d.getVar('PACKAGE_ARCH') > build_arch = d.getVar('BUILD_ARCH') > pp_pps = os.path.join(d.getVar('PP'), d.getVar('PPS')) > - debdistroname = d.getVar('DEBDISTRONAME') > > install_deps = ":" if d.getVar('BB_CURRENTTASK') == "devshell_nodeps" else f"mk-build-deps -i \ > --host-arch {pkg_arch} --build-arch {build_arch} \ > @@ -310,15 +315,12 @@ python do_devshell() { > > termcmd = "schroot -d / -c {0} -u root -- sh -c ' \ > cd {1}; \ > - echo {2} > /etc/apt/sources.list.d/isar_apt.list; \ > - echo \"Package: *\nPin: release n={3}\nPin-Priority: 1000\" > /etc/apt/preferences.d/isar-apt; \ > - echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt; \ > apt-get -y -q update; \ > - {4}; \ > + {2}; \ > export PATH=$PATH_PREPEND:$PATH; \ > $SHELL -i \ > '" > - oe_terminal(termcmd.format(schroot, pp_pps, isar_apt, debdistroname, install_deps), "Isar devshell", d) > + oe_terminal(termcmd.format(schroot, pp_pps, install_deps), "Isar devshell", d) > > bb.build.exec_func('schroot_delete_configs', d) > } > diff --git a/meta/classes/dpkg.bbclass b/meta/classes/dpkg.bbclass > index 1d684e98..0cdb5792 100644 > --- a/meta/classes/dpkg.bbclass > +++ b/meta/classes/dpkg.bbclass > @@ -110,16 +110,17 @@ dpkg_runbuild() { > DEB_SOURCE_NAME=$(dpkg-parsechangelog --show-field Source --file ${WORKDIR}/${PPS}/debian/changelog) > DSC_FILE=$(find ${WORKDIR} -name "${DEB_SOURCE_NAME}*.dsc" -maxdepth 1 -print) > > - sbuild -A -n -c ${SBUILD_CHROOT} --extra-repository="${ISAR_APT_REPO}" \ > + sbuild -A -n -c ${SBUILD_CHROOT} \ > --host=${PACKAGE_ARCH} --build=${BUILD_ARCH} ${profiles} \ > --no-run-lintian --no-run-piuparts --no-run-autopkgtest --resolve-alternatives \ > --bd-uninstallable-explainer=apt \ > - --no-apt-update \ > + --no-apt-update --apt-distupgrade \ > --chroot-setup-commands="echo \"Package: *\nPin: release n=${DEBDISTRONAME}\nPin-Priority: 1000\" > /etc/apt/preferences.d/isar-apt" \ > --chroot-setup-commands="echo \"APT::Get::allow-downgrades 1;\" > /etc/apt/apt.conf.d/50isar-apt" \ > --chroot-setup-commands="rm -f /var/log/dpkg.log" \ > --chroot-setup-commands="mkdir -p ${deb_dir}" \ > --chroot-setup-commands="ln -sf ${ext_deb_dir}/*.deb -t ${deb_dir}/" \ > + --chroot-setup-commands="apt-get update -o Dir::Etc::SourceList=\"sources.list.d/isar-apt.list\" -o Dir::Etc::SourceParts=\"-\" -o APT::Get::List-Cleanup=\"0\"" \ > --finished-build-commands="rm -f ${deb_dir}/sbuild-build-depends-main-dummy_*.deb" \ > --finished-build-commands="[ -z "$(find ${deb_dir} -maxdepth 1 -name '*.deb' -print -quit)" ] || cp ${CP_FLAGS} ${deb_dir}/*.deb -t ${ext_deb_dir}/" \ > --finished-build-commands="cp /var/log/dpkg.log ${ext_root}/dpkg_partial.log" \ > diff --git a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > index 39ced80b..2f07de82 100644 > --- a/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > +++ b/meta/recipes-devtools/sbuild-chroot/sbuild-chroot.inc > @@ -56,8 +56,6 @@ SBUILD_CHROOT_DIR = "${WORKDIR}/rootfs" > ROOTFSDIR = "${SBUILD_CHROOT_DIR}" > ROOTFS_PACKAGES = "${SBUILD_CHROOT_PREINSTALL}" > > -# We don't need /etc/apt/sources.list.d/isar-apt.list' while it's handled by sbuild > -ROOTFS_CONFIGURE_COMMAND:remove = "rootfs_configure_isar_apt" > ROOTFS_POSTPROCESS_COMMAND:remove = "rootfs_cleanup_isar_apt" > > # Do not cleanup base-apt -- Siemens AG, Technology Linux Expert Center