From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406651323187200 X-Received: by 2002:a05:6a20:a103:b0:19b:99ab:d4b2 with SMTP id q3-20020a056a20a10300b0019b99abd4b2mr2324429pzk.42.1705657752822; Fri, 19 Jan 2024 01:49:12 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:f310:b0:28e:5902:5d1e with SMTP id ca16-20020a17090af31000b0028e59025d1els549982pjb.2.-pod-prod-06-us; Fri, 19 Jan 2024 01:49:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/QcvBQm2/nr3yz/VmUPiRLn50ddnELv19TlkcEIfgqDFonf6W5yU89YyEcTp6L/gEZfkF X-Received: by 2002:a17:90b:4387:b0:28f:f3fe:7288 with SMTP id in7-20020a17090b438700b0028ff3fe7288mr1967834pjb.82.1705657751552; Fri, 19 Jan 2024 01:49:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705657751; cv=pass; d=google.com; s=arc-20160816; b=qIX9cP/BuplT4FA6h8ErxKRYj5wHVZMVtq8bV3ICjmo/wAhbGe6sNmEPFDjOTgm++Y afs9ClvJ9qPTJhE1aJ9H+2y6I+gYh44rUhGxrWqXy9/dP8uRFU0debJLvtW2m3OlgIsG mpcumOsPkXf1wZfaHmq/5I+DSo4ql9lMltu7skRSowf9yIa0JFo55mkfM/vOQY9omdO3 ctYd1P59DQIqBi+HB+RiYE8su/dsuGLIeOHUpO/h9793aL4xEsyrPuD1w23b/nG+UTmP 8DV/p4C4jSZVtEzxkoNukE7a0Q+11efVgHxC+PIjhEHnyop5anXMEEllyfKVds/NWjiy ACVQ== 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:references:to :from:content-language:subject:user-agent:date:message-id :dkim-signature; bh=wRHGNnvdMuonfHIDHDv9OharmAER4AYYKA2kyY5JNpY=; fh=qYjLjom2XYK2EGXTfM32+e6Y5m6bxV+vwmPCS15rMNY=; b=RBS9xhwUTrFhr0GcnNW+MX0Sw5u2WwpoF01QBgt7H8tgreRXcBNuaQseHV5cX6FgwY 2rInukP70l5RknQVb3kTYTWGuEF0gVPXMkiP5tjnVOBQrUDQViLzNEj9coXw0hlwzZ/5 yQvj7Y0a7zplmr2M4I7i6O57am3XSoI8ww29Z8xIqSCgjOj0X/UZjv/3xeCSwiBkUMIO nOjvJySkV87EBrYF0Alj941zD+5LYhVsGJLcbRwWVvkWuDhlwx0VXZ7bhGdDHl0oeJVa 1aLY2UPtwplFZcwb6Nds73VYUjjBTCJepaPQ0dL/A54lThpf+yBL7yF2QbPh8oUdW9Zs RKgQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=yMbku3g7; 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:7e1a::626 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 EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20626.outbound.protection.outlook.com. [2a01:111:f400:7e1a::626]) by gmr-mx.google.com with ESMTPS id ep10-20020a17090ae64a00b0028e79ece469si139165pjb.0.2024.01.19.01.49.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Jan 2024 01:49:11 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7e1a::626 as permitted sender) client-ip=2a01:111:f400:7e1a::626; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=yMbku3g7; 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:7e1a::626 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=gi2wfhrcXbDt6WJOBJYVza/vJTQPSWYY4BGyGOsOjqmWWyOjREXfgBiFXYuPKtEdiYeFc5BGetXDSi0I/F7SDHfrXVsS3Je0/y4X2mUVFhO6fvfYL4z2KhDF0Oi1ccDaYc44FzAykQP3r+7/1rWLOdXIFKxoECPrKYAuGVvG2IqqtYjpFqVG1zQLjbB+uylWFaFST/JQHCqVio4Wfk9ApDgkw4UjbZQ6bHzp2MY1DRpYh/Aqa16RZfRo4lHqcSQz59LPMLyZfamXVStHwUJA8OAtl17+Ca296F8VBSm25Fm15q5hyqm7tsr/39dLQ6VG8IofPSsoNcA94bNI4znsVg== 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=wRHGNnvdMuonfHIDHDv9OharmAER4AYYKA2kyY5JNpY=; b=mg5KfSKPbe/oy+zed4l7ia7YaXi0H1vsGdXgUzq7YHvfld+TCT4mnbHTB9PFFitW83yZecyRsjmzXitxr4vfQlniUppZavTyPaUMh8AwTxMFkpzvhieFlZfGefhJhrUXTm1VaIc8L7W4R3u97WhV36I1S0nUHAkWcsAD9J9ZySuCOrM0U/NJHclbWaWbheEiAAvP76ozdmurQWeMKie5z8gNiFB+t78j3sf8sCOYbdRgrlg1fMHApXMde+IKh7kIATAZVGSNgVJ1FnnlhyX3prjoQ2XBuw1MD4auJSldIuBAVylH4sni2aTKW9a0mhQm7ukCmSEBnMkVFf6fuY5bhg== 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=wRHGNnvdMuonfHIDHDv9OharmAER4AYYKA2kyY5JNpY=; b=yMbku3g7PYVqADIaLaALGhCMJOQHqRCQ54Ou4y2zYKMJ0zGERapNDJu/k/hykL+aLhMAZjRvqFYA1WtZUVWcKUnvojvpBFeQYi5It38muTbdX5n+K7MpvabRv4nzmwsFyGkU9BwpUku/zr8NHeCux0XjeEs1Uvk4mzov3mGKNTqsstxdIxUHL8zXjWelhRKLDvudwSt+x8/cH8JVR8iAXnmXqtunp+U8nUeYakT4MVRhxgnJVtrN+56BiZEYsTOSY22dRITYiid3tlSq2CcNYpgP40XWf6wOhNzYx+7ev2UtTcQT55R8W83jAnXGUa/7C4TKQ/V7NZoVXxcUQEed6A== 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 AS8PR10MB6363.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:56f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.23; Fri, 19 Jan 2024 09:49:08 +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.7202.024; Fri, 19 Jan 2024 09:49:08 +0000 Message-ID: Date: Fri, 19 Jan 2024 10:49:08 +0100 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v6] dpkg: Restore support for replacing pre-installed packages in sbuild-chroot Content-Language: en-US From: Jan Kiszka To: Uladzimir Bely , isar-users References: <024b7d92d8d9a9b1bd50466d5903086cda462c07.camel@ilbers.de> <0eacc107-7e89-4118-a9d8-f2e9713c64bc@siemens.com> <7767aec5-41f5-44ce-a292-6551c59a6ecb@siemens.com> <932bf7a167b931150719479296a509996c8b8536.camel@ilbers.de> <9f23f168-f5ee-44f5-aaa5-a242632dcbc3@siemens.com> In-Reply-To: <9f23f168-f5ee-44f5-aaa5-a242632dcbc3@siemens.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: FR5P281CA0053.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f0::12) 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_|AS8PR10MB6363:EE_ X-MS-Office365-Filtering-Correlation-Id: 23e719d4-04c9-4b2a-aef7-08dc18d3e1ed X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WnL+dhVDm7zpPBl1b0Nhs2UNLNrjMVKBXFdljAPqTQBSvypYffcoM0+TS0ZCL0jTfkczNZZ0Vy9GSzfE+S5ZzkPuUcxVSoBdyUew6FIjlS0sAVRjZubnNf7QIgcrALDQvtI0g62WjaGIWaUx3VQm4TxNKyEUV1thAa0eq/xJstvkYkWTZNHLCHAeY3X9fivd8Xp7Hz36lFbOkdoOE5D8U9P+Z7G/U1VQm73eO9NaPDQ7eFn+vb5Pa6v2kxgsncgWFa7pf6ExZuZWuBksdQ7PmE1+jqcKP2rqojJ6EdaHn65HCgW1wSPmTtkViSlz//tpNLkApvo+tvCij9X+6iU3LdHzzEGgp8hX/LkQ8NzVwEXBC27z+5u5bpoAwtypfBfrvC8aZSNNyvvuYIUImT2qXRGoUjJFabb0aMc0ck7HywMXhN7svUuN6NHhDO93Od6uizNVCQrpfihE/BaDgvYyOmuBfc32nFw5dhK17b8ZvpQpQ4gaF6oxBuKwXuD6qa4hj9VLJddw4FB6kGp2EW+dBDfBmPcuXbIqFgOqwjH2OudIQfzyEd60aVjKe5gYzTSo9iLp6bETzIehHvzpO1rNeaTuMXSwf2oK7GVOxcYO4bYqhr/F6ATcQtYYZHozIEehhdVs9A/VvBKEP9nZ7TP2h8LTRCfvGTIT+Os6tJhMbHb1Qm370q5TUYRqaCAOVG0+ 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)(346002)(396003)(376002)(136003)(366004)(39860400002)(230273577357003)(230173577357003)(230922051799003)(451199024)(64100799003)(1800799012)(186009)(82960400001)(2616005)(6486002)(26005)(66899024)(44832011)(36756003)(53546011)(31686004)(6506007)(6512007)(478600001)(83380400001)(66476007)(316002)(8676002)(110136005)(8936002)(66556008)(38100700002)(66946007)(86362001)(31696002)(2906002)(5660300002)(41300700001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZGpsWWhGWWFCc1BZWDlyWXZFc0lSMHY5QkZQa0kvak00NDdwTHRlckMxaEhX?= =?utf-8?B?d0VjRGxyM0NpSSt3Z01XZlZ0VkZ1T2hBaXcrK3NHUlk1aVUrd2l0UDlZNXUy?= =?utf-8?B?alc3UU9wcnJaNkM1ajl0NXFsdE1xZExhZ3RTVlZ2a0VWSEdqWGlnTjJGd3k3?= =?utf-8?B?T05BdFBDWmRGYVU0NDN3UEFrQ0g1S0oxQWVXanhUeHE0dDE2R1FROW90MkZO?= =?utf-8?B?TWpPU1lXb2ZlY3RIYVk1bXpFWW11bGhTMDFrQVpEbEtqWTE3cHREN2RINVhG?= =?utf-8?B?ZUk5S0tQVHZuOVM1dGtnTzMvd0dIeTlPdUk5S0JGcTVTQlluRVZJMXpNVHBJ?= =?utf-8?B?di82YmF5T3RtVDZZMW9tMERVamRCWllQUHVuN0tuNlc3Zmg4MnJtTzIxMUtD?= =?utf-8?B?dnZVcFg4YTQreS9FODkzSHlWb2pyUEhXWmRISDY2ZUtBV1NGTmtrSGplS2Q4?= =?utf-8?B?V0RyRXR0SGtOZ0d1ZnhRRm9idk9PWDRON2tJK2tDL1Y0b1FaRFQrcGZVRGhk?= =?utf-8?B?QmhCWVhkK3owbEFBeFVGVVhieHBUT2VkN2dmNDBXbStvaXNaczV6RzVxL3h3?= =?utf-8?B?YnlDZ1F1NzJGbDBsME0rcWZGTGwrUFdyRjhpMGRyVHNIUVRxbU9XdDc1dmRw?= =?utf-8?B?bVl5OE50bDJVMERzZm1IbjloWStEWTA4REVsb3FOcU51N2lrSHNtNUI4LzVD?= =?utf-8?B?aHllSlZSUU45OHVRMDNDZ1U1TENONU15b2Q1U2tYZ2YvZW1yR09SdzRyTEFK?= =?utf-8?B?OFNyc0RzOHNtYmdMZERrenVRTE9jOU10VWpHWnJsVzBwQW5OTGF1OHR1WUlK?= =?utf-8?B?WVpNdUlaVkRseDlyTFRZTjFBbUNLMXJQUnZ1QWtDai9yUmJFMFJUdTU3blVu?= =?utf-8?B?OXh6aWJpVzFZc2wvT1RNa0tGSkhFSDUzMGxzSC9IczNYeDJzbGdjNU51UVI2?= =?utf-8?B?MU55L05kTzdYemNzUkpXWVA4R2E1TmdHVSswMEpLRDNXTGtYWGxTckFySTVh?= =?utf-8?B?ckFuNjdpcC91VDJBS1dqVW9QTDdBNEM3eXlzMFcxVUFRa1lmUXlKUCtiTWI4?= =?utf-8?B?bnh1amJEZ043S0laY2NLY1JOY0o1c0ZKV1BmbVhJTjBxNTZIbGpvOUVvSTRn?= =?utf-8?B?K0NUbjkyWGlmWW9pWS9FSTdTYUFEbzNxZzVKRUZsWGxXM3NqUUUxditpazd0?= =?utf-8?B?bDBQWXQ5c2tTelExU2VMYzJEaStReFZJc0prazNFSEhtUVNSWWlRbjYvY0tV?= =?utf-8?B?ZEN0Z1VjOFhBbUViYjBYemVLMEpFanJmQXV4dytJd1crc1RUaWszays3djZO?= =?utf-8?B?eXNGWlhIazFvSmQwYUZJa3Fac1RGMlN2M29QYnRORTZxY1NXOW5vcFdBYU1Z?= =?utf-8?B?OUdZNXhBZHl3cklXVU5vZytaMmwwZ25uZmhlanMvYUhobWh2RDYxcGJ4cG5B?= =?utf-8?B?SVVLenNsVEtmRlEzbG9Cc3JCdEI1QzRiTWpOVmlnNDVzRGU5ay9TcSszdVRR?= =?utf-8?B?NUUvUE5XVjB1aVpOenZlWmdhdXVwUmgvYjVLbWtmbUFDWU1hcGFQYS9ISCts?= =?utf-8?B?WTJQQ2p0aEdyYnU4WFlvZis4U2JDK24wUjNzejVBbGswZzVNVTJwSWppWnBJ?= =?utf-8?B?Vy9NeDdPTWoxS1lQQkprV3dZWHZTUWRsSkw2NzRjRUp4V2ExSk5qYW5PUWxk?= =?utf-8?B?SWNETU1tSmNrVFFabUlTaTM1QS9raSs0UnRyUjJTOWUyQnlnNTRTdEZzSUkx?= =?utf-8?B?VGYxSlVocHYwNFZhaURqdTF4UGYvN2dKQzNhYlRQNVRPWGZLMUhlNUUvRkpl?= =?utf-8?B?Y0VEOE1aNURHbE1lc3ZzNGNxa2Y5bU5JNGI4dFpaWURxSlcwVTRxQ2pvM3RE?= =?utf-8?B?OUV1US9ESi96N2VKZFBUNTIwNjVKWmJ4Tlh5aWdhbFI2QS90ZTNlaXJQbE80?= =?utf-8?B?OENWY21SVHNTdDhDQm10Nnk3VzhKcThHc3JIeVBPRGw0d0xLdVdSdlBmNnI4?= =?utf-8?B?MzREOExUVTVBeWJiQUpoK2JOLzYzOVhzVkVYMkdwa0cxekQ3VkNqUjRSSWpO?= =?utf-8?B?eURvR2gzL203K1dQWSsvbTIvMW1xOWVZRS9ZSTNPcVpSdFRpcFNudzJoclF1?= =?utf-8?B?M2dqVHc0KzNTLzlyVDRQMlpSVzhiNk1tUUFxcGMvajByQ0pvNlBUM0M5RWNG?= =?utf-8?B?NHc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23e719d4-04c9-4b2a-aef7-08dc18d3e1ed X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 09:49:08.8185 (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: yVuGdbytom+mGIW3Pj2/MHy6Hoe2Hf6FU1SW4ZBYg5oMInmo3HLjHhKzuPpQWQ9oaipsqOG9fRyc+i4ab4yTmw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB6363 X-TUID: 0/ukhmLT0bql On 19.01.24 10:42, Jan Kiszka wrote: > On 19.01.24 10:15, Uladzimir Bely wrote: >> On Fri, 2024-01-19 at 08:49 +0100, Jan Kiszka wrote: >>> On 19.01.24 08:44, Jan Kiszka wrote: >>>> On 19.01.24 08:40, Jan Kiszka wrote: >>>>> On 19.01.24 08:37, Uladzimir Bely wrote: >>>>>> On Fri, 2024-01-19 at 10:20 +0300, Uladzimir Bely wrote: >>>>>>> On Thu, 2024-01-18 at 14:50 +0100, Jan Kiszka 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 >>>>>>>> --- >>>>>>>> >>>>>>>> Changes in v6: >>>>>>>>  - basically, going back to v4 but disabling isar-apt in >>>>>>>> do_apt_fetch >>>>>>>> >>>>>>>> I was able to resolve the scenario that Uladzimir was >>>>>>>> sharing this >>>>>>>> way. >>>>>>>> And I also realized that apt fetching as well as unpacking >>>>>>>> should >>>>>>>> have >>>>>>>> no deal with isar-apt. So, v5 was taking a wrong turn. >>>>>>>> >>>>>>>>  meta/classes/dpkg-base.bbclass                | 29 >>>>>>>> +++++++++++---- >>>>>>>> -- >>>>>>>> -- >>>>>>>>  meta/classes/dpkg.bbclass                     |  5 ++-- >>>>>>>>  meta/classes/image-tools-extension.bbclass    | 13 ------- >>>>>>>> -- >>>>>>>>  .../sbuild-chroot/sbuild-chroot.inc           |  2 -- >>>>>>>>  4 files changed, 20 insertions(+), 29 deletions(-) >>>>>>>> >>>>>>>> diff --git a/meta/classes/dpkg-base.bbclass >>>>>>>> b/meta/classes/dpkg- >>>>>>>> base.bbclass >>>>>>>> index 7b054d3f..80686677 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 >>>>>>>>   >>>>>>>> @@ -115,6 +113,8 @@ do_apt_fetch() { >>>>>>>>      trap 'exit 1' INT HUP QUIT TERM ALRM USR1 >>>>>>>>      trap 'schroot_cleanup' EXIT >>>>>>>>   >>>>>>>> +    schroot -d / -u root -c ${SBUILD_CHROOT} -- \ >>>>>>>> +        rm /etc/apt/sources.list.d/isar-apt.list >>>>>>>> /etc/apt/preferences.d/isar-apt >>>>>>> >>>>>>> The issue is still reproducible with the steps I posted >>>>>>> below, as >>>>>>> well >>>>>>> as CI still fails with v6. >>>>>>> I think, the steps above are not sufficient to completely >>>>>>> stop >>>>>>> dealing >>>>>>> with isar-apt in do_apt_fetch() and we need some kind of 'apt >>>>>>> update' >>>>>>> here to consider removed list and preferences. The question >>>>>>> is how to >>>>>>> say apt to forget about isar-apt and do not run apt update >>>>>>> for other >>>>>>> source lists... maybe, simply remove isar-apt files from >>>>>>> /var/lib/apt/lists/. >>>>>> >>>>>> An addition: >>>>>> >>>>>> It seems that files are not really removed from the session for >>>>>> some >>>>>> reason. I added some kind of "ls" near remove code: >>>>>> >>>>>> ``` >>>>>> +    schroot -d / -u root -c ${SBUILD_CHROOT} -- \ >>>>>> +        sh -c 'ls -la /etc/apt/sources.list.d/' >>>>>>      schroot -d / -u root -c ${SBUILD_CHROOT} -- \ >>>>>>          rm /etc/apt/sources.list.d/isar-apt.list >>>>>> /etc/apt/preferences.d/isar-apt >>>>>> +    schroot -d / -u root -c ${SBUILD_CHROOT} -- \ >>>>>> +        sh -c 'ls -la /etc/apt/sources.list.d/' >>>>>> ``` >>>>>> , but still see the following in the log: >>>>>> ``` >>>>>>> DEBUG: Executing shell function do_apt_fetch >>>>>>> total 16 >>>>>>> drwxr-xr-x 2 root root 4096 Jan 19 07:09 . >>>>>>> drwxr-xr-x 8 root root 4096 Jan 19 07:09 .. >>>>>>> -rw-r--r-- 1 root root  569 Jan 19 07:09 bootstrap.list >>>>>>> -rw-r--r-- 1 root root   94 Jan 19 07:09 isar-apt.list >>>>>>> total 16 >>>>>>> drwxr-xr-x 2 root root 4096 Jan 19 07:09 . >>>>>>> drwxr-xr-x 8 root root 4096 Jan 19 07:09 .. >>>>>>> -rw-r--r-- 1 root root  569 Jan 19 07:09 bootstrap.list >>>>>>> -rw-r--r-- 1 root root   94 Jan 19 07:09 isar-apt.list >>>>>>> Reading package lists... >>>>>> ``` >>>>>> Fith the apt_fetch failure followed, because of existing of >>>>>> previously >>>>>> built hello source package in the isar-apt repo. >>>>>> >>>>> >>>>> OK... last-minute change of mine, splitting up the purging and >>>>> the >>>>> actual fetching into two schroot runs to avoid having to run the >>>>> latter >>>>> with "-u root". I didn't find a way to de-configure isar-apt >>>>> unprivileged. Back to the drawing board. :( >>>>> >>>> >>>> Comparing the split run of schroot with image-tool-extension, I >>>> think >>>> I'm just missing a proper session ID here. >>>> >>> >>> Before sending v7: can you try this on top? >>> >>> diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg- >>> base.bbclass >>> index 80686677..1a3333ac 100644 >>> --- a/meta/classes/dpkg-base.bbclass >>> +++ b/meta/classes/dpkg-base.bbclass >>> @@ -113,10 +113,13 @@ do_apt_fetch() { >>>      trap 'exit 1' INT HUP QUIT TERM ALRM USR1 >>>      trap 'schroot_cleanup' EXIT >>>   >>> -    schroot -d / -u root -c ${SBUILD_CHROOT} -- \ >>> +    session_id=$(schroot -q -b -c ${SBUILD_CHROOT}) >>> +    echo "Started session: ${session_id}" >>> + >>> +    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_delete_configs >>> >>> Jan >>> >> >> Yes, with persistent session it works, at least with reproduce steps I >> used. I just added session cleanup (e.g, "schroot -e -c ${session_id}") >> at the end. >> >> Before sending v7 I could also check if it is not reproduced anymore in >> CI. >> >> Also, due to using schroot session we probably also need to care about >> proper session removing in case commands under schroot fail, similar to >> how it's done in image-tools-extention by imager_cleanup(). > > Yeah, still need to check that - schroot is also still new to me, > learned a lot about it these days. > > Jan > diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 80686677..85d0a495 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -107,18 +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 -d / -u root -c ${SBUILD_CHROOT} -- \ + 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 } Jan -- Siemens AG, Technology Linux Expert Center