From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406651323187200 X-Received: by 2002:a4a:a5c3:0:b0:599:adbe:b53e with SMTP id k3-20020a4aa5c3000000b00599adbeb53emr4643929oom.15.1706515200524; Mon, 29 Jan 2024 00:00:00 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:ab8e:0:b0:598:6f4a:c095 with SMTP id m14-20020a4aab8e000000b005986f4ac095ls2293710oon.1.-pod-prod-09-us; Sun, 28 Jan 2024 23:59:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IECuiAgwSTNZCE1Q3Fm1RdUVDRt0L1CfM9PxIObEVXCp5pPs7vHTulF7QOSFh6mO8PmGCnD X-Received: by 2002:a05:6808:221e:b0:3bd:db57:a45f with SMTP id bd30-20020a056808221e00b003bddb57a45fmr8507662oib.50.1706515199693; Sun, 28 Jan 2024 23:59:59 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706515199; cv=pass; d=google.com; s=arc-20160816; b=qcirGF0zpH5cRuEhh8Jsw2EBcX0sJcWb7d3b45Kl7rp8G/1ri4wtaZ7NEY/kNkuslS C1UpO5ELdBibg4NtRipfv94AeAG/YzkZSoQ2M9fxkrCjaJ1qMmsq7q98BaF/2nqkglG+ jTYWzk/6PpE6s+buxmU2/yMC4vj2R8+5LsbI6ARfe4sg8Xg3PQgYpNtrCZ42tXaun/Re QG6ZDF/SiGf2cXrW3vADvphay6TG+h7hYTzx7Qdrw8BFScsj9d3VYy9SXXUMUokYZYVB Xao0yjNIinzorIQzrIFBavajU9Y0E1EdEiBVIbfeRGPS37khEQo6gIm/hGfUuhLLhbnJ snag== 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:from:references :to:content-language:subject:user-agent:date:message-id :dkim-signature; bh=nwtR32RfsT3H/XvvmP5TcswVL33lwfq+0oY1x/gmN7E=; fh=Ya44QEZijmGwi3iM06vY2ri2uPgFJ4O2CEdNzu8WM0o=; b=CRITC7tA3bbXZW1GaLVuWl+emAWlRo3egLnfFqAtbt1LfrLMQgkQ5xBGPACmzUKj1T 2rdz9oygf2aoXKGGuNUj2BMcX/j35fHz0krQ0rZk+mIx1SY6jMN3pXdHJQCc+DmM+/4H IUEJgtGgEWB7cwonllhoHiLQZx8jVrSTk961iMX1Kt3mWATrOlvqLhovtoGqb6lMYY3D OovYsjIAooEdWliOwYoeEwrp/dXcDQAeS6Yh5kmffJBjovYf0jG71VB6IV5bOiZhtb9e Af80W5HJ7UaKs8j/WxE41KWNKDNQmC7W+XsrNIBFaiwZimG7cII0Oq3OTSTUaa9Y8OER PzjA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CZd551PV; 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:f403:260e::601 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 EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on20601.outbound.protection.outlook.com. [2a01:111:f403:260e::601]) by gmr-mx.google.com with ESMTPS id u19-20020a056a00099300b006ddb842ed81si455132pfg.3.2024.01.28.23.59.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Jan 2024 23:59:59 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:260e::601 as permitted sender) client-ip=2a01:111:f403:260e::601; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=CZd551PV; 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:f403:260e::601 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=G5LPNoX7Gp80noofHupWZey3HTGKBMwpujUGx9k8FQQky6EZXeI5NpEKiNYT0i+FD5Z44ixyowFEm0NdZvOQBrvt0wjsERlNjpOP1jZXLnAIj5E//MrsudJih9f8aeagHl01ddlu5oDa8a1CtWv2P4caTNVLtLYWXtbmvJ9ugSsKt+JSojc1ixf9f9/K8d7IvFEDytf6OK3eMJ66QpakG8NN4gS2SKRKbg8L2oGfS9EqYRh3r9T6lQ01fe+dMMXiJt4ENsvf/i0UK6PDLiSNDD0+yU+1xNzrh5BVHjTWdO6tpRy3TqfzDmjeCThLcyIvqGE/ZRs+O8xUF6/w1q2wHQ== 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=nwtR32RfsT3H/XvvmP5TcswVL33lwfq+0oY1x/gmN7E=; b=I0F1z2kiVppRynJVdHmDMxvWh8eKWbWvTqBZLiZh8jth1OzCbORqAu4dTrcqo8eZ2qc/DLLfesrC3gm0uRaUU17JPHCoSZzlh01JcT9ELknrTkCtfg73+WQwXh2XRBJqUCZCu+4/kGHwyivK9qAQmpeqYh3yIsBjY4HvJdyv2rxAPvuK6E8zYjUWnKmRq+m4DP+Cg6Nz9pVK7Xldbc/VcPQ4LEWx9E4iJVShRt+kzc4qMn9K4GIT5i7lFbU6XH0A4FRnmpCsVxwS4Xvs7xT7cK5Bu2iUVPOgJa4iORT1CmqQrcWabrcF0lVkSlqhTnZNDNQaacOqEvIa3wtxTJIKYg== 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=nwtR32RfsT3H/XvvmP5TcswVL33lwfq+0oY1x/gmN7E=; b=CZd551PVAHt5ODW2I+qmXEQ3uDxrN3AooP7pVScgtjqiL8ZSI1pdq34KBUYcI7NwaMF3Lwbnie91OfZh/LqdQmGrIUhUd7N7rgjQJZSPSOl4/4Ov8sscCWqvVPmJbhZ0iHUHVV+Kt+vD+bPbvsRiZlB4noMP9EpqSYn6RtAS3wvOdxA+zukgk9UdrOyMKkLi6BVFad77/lOWAD6OOIgvk2OvI11t23kZ37uXuS9y+xtvca4o1RG2yM3HE6Y9f1e/0MFTGEJ96FPN07ExbtVUA1l6ij/f7fbAWNRM0L46gyOkymQDHlMb7iF42NwM2Ob38ioNStIzWlTFDpfRcnBftw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS8PR10MB7523.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5ae::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.32; Mon, 29 Jan 2024 07:59:57 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d16:7fbb:4964:94fe]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::8d16:7fbb:4964:94fe%3]) with mapi id 15.20.7228.029; Mon, 29 Jan 2024 07:59:57 +0000 Message-ID: <0dc61862-8da9-4fa0-a5cd-32b3a2f53262@siemens.com> Date: Mon, 29 Jan 2024 08:59:55 +0100 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7] dpkg: Restore support for replacing pre-installed packages in sbuild-chroot Content-Language: en-US To: Uladzimir Bely , isar-users@googlegroups.com References: <20240127074253.24570-1-ubely@ilbers.de> From: Jan Kiszka In-Reply-To: <20240127074253.24570-1-ubely@ilbers.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0103.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:cb::19) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS8PR10MB7523:EE_ X-MS-Office365-Filtering-Correlation-Id: d5cdedda-576c-4cad-fed6-08dc20a048b3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IAG/YBj7VLhI5aeADstiNsVIo03Hou82NJYTfGEoCmfgFPMd5kDU3CV3RhWsaLF7JXYm+jqqYaUAa5WDvS05QPRho+RYd5VTUmtaIwrUrlDbCWx0fm+3eQGqd7eLMV8wjJXBtLiWu6KKUvf9P9SYOjz/RxZwo4IhPhtxnlVya28Myr1Y2U2SDeGjrP9EZKkWE3TFYu+iT7ZKa+CmEHdejG5lG/Iik+aNEaFNHhoAcgRovs/TzZKkgtjkAY8Hr7+xiz/MYFbsQtQNEZPqHbVqU8TBB1Zy8FPDQa9hc6ukGOR5cKrfjW1LJwc1FuGxr/IDOO9gyjm3knM7NiZHUuDFJ7nbbZ2hRB5gNrFdsgMAX162UPM0wz3QoGqiwbfZoOuXp+J591sNgfjgt1QO0d6X+cR9upYppN3S3rdLEI1AJ7HBvkvyF0ix8lewo8AnnQSpYfCh7Q37AFDZBR71VjKASzh2YiEjmGwll1Q0yZIfufjaoGC6sn1WrzmslBVODA8GcsCnmqUGBMc1xWJOmXoN/OyALnBclIK5+JjMWynpnvyG2Ag4GaX3wEYaN9ETnZ3l8EGQhSRXOp6uI49oVXUl6+xq6GIKqMZmvnRrrAyLKFv5eIYg4hRCZM/MnoaoagiSmg4JiPtrwsfafH+4tp/9t+uMqAA/wOm6KUaiTdcG7fvPB7CrGE4q1WiUWO8IB2S71WOh/j9WZ49zsCEIouvoGA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(136003)(376002)(366004)(39860400002)(346002)(396003)(230273577357003)(230173577357003)(230922051799003)(64100799003)(1800799012)(451199024)(186009)(31686004)(83380400001)(86362001)(31696002)(82960400001)(36756003)(38100700002)(2616005)(26005)(6512007)(6486002)(6506007)(2906002)(478600001)(53546011)(41300700001)(316002)(66946007)(66556008)(66476007)(5660300002)(44832011)(8676002)(8936002)(45980500001)(43740500002)(360504008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OG9ja0xXdzUzMjJ4WjQ4ZzAwUUNqMXUvRkdqNmJhWEt4Zlg3a2tINitXTm00?= =?utf-8?B?MUpLWkxaMzc4RlBvb29CTjlrQmN4Wnk1bisvb0tnVzlxNDFYTyswQ0tCb3pj?= =?utf-8?B?WStVdTAyUHlkYXpTUXYyemRNTEZTQTFYZDBSbzNHUDMrSm1pMWl6eTBZbTNF?= =?utf-8?B?YkV5WTgxbThSYUxWSGV4ekF0RkRzbnJVcTRqVFdDQjlYYS9DMDRWbk1ERy9n?= =?utf-8?B?VDN5ajJkdE85VXN1cjNpUzRKSXlySjM2SFY5VFVpQXlacG1vU282Umh2UzNV?= =?utf-8?B?ZnVUcXIxcGJ5aHo5QmN3L1dhQkJxVzRQMXBDWXNUVnRyQk9oc1NZamNIcm5Z?= =?utf-8?B?YlVjYnJ4QTJlZzFKVHpNdXNIQU8rWTJzdUJvdWRSL0xSWVBtQVdsODdwQVhI?= =?utf-8?B?VzBDYlJWUVdWNWxNc3I1VGgvVjdtMDlZbFlJOW92Yi95cmhhdHlhZ1ArVXVw?= =?utf-8?B?L1QvMGxoNDE0VlJuSEwySGpraXJjZ0xaUDM5ZlFRZWJCb1pCRndFb3p0R1Y3?= =?utf-8?B?eU01USs5bU5QdVRFL0VCRmdLbkREbXlVTGRmRy9CRkxnekt2Ym9WNXZ2SjdC?= =?utf-8?B?WUswSEJPcVJjd2ZKVG9PMjJia004Z2tIenJFQ21JVFY0ZmNVYmsvamx1ZFhk?= =?utf-8?B?ZTVyUGdZYkRlRWN2dHdsamFOYlpZeEc3UktpUXBKWW95c1ZIcVoyZUJMYUho?= =?utf-8?B?ZEJuVGFBNlVRdDdTL0NZR3czMjlRZm5ianErT3RZdHh5V2pQVFRHSWVlUHlY?= =?utf-8?B?ejNpbEFBQXpXUkhaNXpXMEVGdzVkb2tWUlQvWEFwQWlTaVdsMGlERmk1RXl1?= =?utf-8?B?bW1uQnVZMzNXTFJXRWc5NWxVTEEwL1hNRmo5WWlINm1kb0pCdG03akxSWjcy?= =?utf-8?B?WlhVRnI1YkY5OUxBbGdhQzdkMWQ4K2FJNVNPUHRBSVJnZ1RhaElHb0dicjdm?= =?utf-8?B?UVF5MkcrNjd5NE5IQm5hNUs1T3E5Uk16QVZjbGZKNHJCYXZ5ejlnUmhTL0xp?= =?utf-8?B?SnFlZWQzU0NWbjZXMnYrNDk4dGVvS1VmaTFWc1V4RzdLQW9iSDFtdEh0eitq?= =?utf-8?B?d0dEdUFuOEhRN2hSV0xyVCtrcUxwQ3RZUTNmVjlRYk9ZenlHVjNobVJQWEhU?= =?utf-8?B?N0RGSUlxYWltNGFWcnA0R0Vta1NEaVMxSGEzeitUTHFnNzk2dWJDTXBKVnox?= =?utf-8?B?WTJHcFRjRFlkc1JoaWlYVFBhbW1aTnpmNitiSDQ4UU4vejN2VVF5ZDRwVDJH?= =?utf-8?B?YzFkak56NUJlVEdWY3hVb1Q1emtQN3F4cmVyUkhtNzlnU1VaRGNGSEg3N2w2?= =?utf-8?B?Mm5ndWFLeDlvQmt3WWNrWXNMT3Z6eWtucjJDOUJCUjcvWUJZQkVRREM2UUNC?= =?utf-8?B?ZXd0SWJNRGNrcGtjMDV2YVFQUkJ3Nzh2bER2R0NPUlN5VHRDc3lHSzNZN09p?= =?utf-8?B?bU96ZDdRMGIzREttQWM4dkdBZkhWMWFlRmRnNTRRUWdjNEh1V1JRYnhkKzhs?= =?utf-8?B?dHEzZUltUGhiLzk2TThwd0M4NWhPUUVDM3dVQ3pORzZOb3VSeDJOVnQ4TWxO?= =?utf-8?B?NnMwNjRLUDdUcStiYTBkZ2xHRXh3ZFl0OXROb1FnTUo4VGRZWGl2dWpmNVpT?= =?utf-8?B?TUU2T3ZTVWRFTVZEVUx4WVoxNzIvUU9rMUNGWko0NjRBcFg1SDJWU1hsdjNz?= =?utf-8?B?TndmK0g4dS8wbnZ3VjNsTGZJbzM4Zkt4ZUlMU1VsOVd5YU92dDF6NnpHMFRi?= =?utf-8?B?WVNUcnhkRFFPS1BkeGMxdGMzRHRXUVhoVDFmRis3UkFwR0lrL2dsTkpJU29a?= =?utf-8?B?QmtLOVdpK0NTSlFuc202Z3p1WUlsS2tYT1FRenlzTUlNdUVEa2IxemVOb3Vr?= =?utf-8?B?NExPaWc0QnIzMG1kYjJSWkNORG9IeStLMHBJNVJkQjY4WEdFRS8zaTNZNXoz?= =?utf-8?B?Vlp0STJBZ0kwRk8wWGN1VHhjUW5ORnF1UkhRTEtmSzVwWXZyY2p0Q0FsbmJL?= =?utf-8?B?UkwrbGNGQTFWMUJld3FadmtoK05OSDQwWTZBaUI5RjVseTExRVA1SXdPaHls?= =?utf-8?B?aUdqY1k1bVU3d2E4U2tSaWgxeEhIeGFSV0RWK2RMV011TUMzSlVDRHl6b0t2?= =?utf-8?B?T1kzcXVKaDVrckdWeVFDdnF3YldCS1o3K2J3Y1BhRTh2SkpvK3o2bzcvMVpD?= =?utf-8?B?M0E9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5cdedda-576c-4cad-fed6-08dc20a048b3 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 07:59:56.8007 (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: Iw3q/liOfrhXM+L6xOum88UrtykXEYjKTyrkcnzWsszdS2oXSNpEAO+pOp0RUM0k+eB7lv1V8C1H+FH0Sq9Mmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB7523 X-TUID: bGk1LWfkuJOq On 27.01.24 08:42, Uladzimir Bely 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 > 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. > > For apt fetching, we neither need nor want isar-apt to be available. > Rebuilding self-generated apt packages is generally pointless as the > needs are better addressed in the generating recipe itself. Exposing > isar-apt to the fetch may furthermore lead to fetching a previously > built source package of the same recipe, rather than pulling the > external version. > > And because the sbuild-chroots are now left behind with isar-apt > configured, the configuration in imager_run can be removed (credits to > Srinuvasan Arjunan). > > Signed-off-by: Jan Kiszka > Reviewed-by: Uladzimir Bely > --- > > Changes in v7: Merged v6 with fix disabling isar-apt for do_apt_fetch > > meta/classes/dpkg-base.bbclass | 37 ++++++++++++------- > meta/classes/dpkg.bbclass | 5 ++- > meta/classes/image-tools-extension.bbclass | 13 ------- > .../sbuild-chroot/sbuild-chroot.inc | 2 - > 4 files changed, 27 insertions(+), 30 deletions(-) > > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass > index 95ca3db8..86466b57 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 > > @@ -109,16 +107,24 @@ do_apt_fetch() { > E="${@ isar_export_proxies(d)}" > schroot_create_configs > > + 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 > schroot_delete_configs > } > trap 'exit 1' INT HUP QUIT TERM ALRM USR1 > trap 'schroot_cleanup' EXIT > > + schroot -r -c ${session_id} -d / -u root -- \ > + rm /etc/apt/sources.list.d/isar-apt.list /etc/apt/preferences.d/isar-apt > for uri in "${SRC_APT}"; do > - schroot -d / -c ${SBUILD_CHROOT} -- \ > + schroot -r -c ${session_id} -d / -- \ > sh -c 'mkdir -p /downloads/deb-src/"$1"/"$2" && cd /downloads/deb-src/"$1"/"$2" && apt-get -y --download-only --only-source source "$2"' my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${uri}" > done > + > + schroot -e -c ${session_id} > schroot_delete_configs > } > > @@ -221,8 +227,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: > @@ -288,7 +303,7 @@ do_deploy_deb[lockfiles] = "${REPO_ISAR_DIR}/isar.lock" > do_deploy_deb[dirs] = "${S}" > > python do_devshell() { > - bb.build.exec_func('schroot_create_configs', d) > + bb.build.exec_func('dpkg_schroot_create_configs', d) > > isar_export_proxies(d) > isar_export_ccache(d) > @@ -297,11 +312,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 +323,13 @@ 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}; \ > + apt-get -y -q update -o Dir::Etc::SourceList=\"sources.list.d/isar-apt.list\" -o Dir::Etc::SourceParts=\"-\" -o APT::Get::List-Cleanup=\"0\"; \ > + apt-get -y upgrade; \ > + {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 c699a84d..d1666f78 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/classes/image-tools-extension.bbclass b/meta/classes/image-tools-extension.bbclass > index 58799fcf..46bdf78b 100644 > --- a/meta/classes/image-tools-extension.bbclass > +++ b/meta/classes/image-tools-extension.bbclass > @@ -44,19 +44,6 @@ imager_run() { > distro="${HOST_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" > fi > > - # prepare isar-apt > - schroot -r -c ${session_id} -d / -u root -- sh -c " \ > - mkdir -p '/etc/apt/sources.list.d' > - echo 'deb [trusted=yes] file:///isar-apt ${DEBDISTRONAME} main' > \ > - '/etc/apt/sources.list.d/isar-apt.list' > - > - mkdir -p '/etc/apt/preferences.d' > - cat << EOF > '/etc/apt/preferences.d/isar-apt' > -Package: * > -Pin: release n=${DEBDISTRONAME} > -Pin-Priority: 1000 > -EOF" > - > E="${@ isar_export_proxies(d)}" > deb_dl_dir_import ${schroot_dir} ${distro} > schroot -r -c ${session_id} -d / -u root -- sh -c " \ > 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 Thanks for sending - thought I did, but I only prepared locally, never triggered the submission. Jan -- Siemens AG, Technology Linux Expert Center