From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7319406651323187200 X-Received: by 2002:a25:2984:0:b0:dc2:486f:55a2 with SMTP id p126-20020a252984000000b00dc2486f55a2mr1452017ybp.16.1705650567785; Thu, 18 Jan 2024 23:49:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a25:df89:0:b0:dc2:2438:21ff with SMTP id w131-20020a25df89000000b00dc2243821ffls1065598ybg.2.-pod-prod-07-us; Thu, 18 Jan 2024 23:49:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IEJRQ8eCUHZX/F2C9DZu/HzpZkWfTQHWRf/XTd6xCnmKYdFHC79pCW4Lwja9sxNvvyaRaQ8 X-Received: by 2002:a81:94c2:0:b0:5ff:842a:cb77 with SMTP id l185-20020a8194c2000000b005ff842acb77mr1915122ywg.90.1705650566882; Thu, 18 Jan 2024 23:49:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705650566; cv=pass; d=google.com; s=arc-20160816; b=DNQGXJRAndNET0ZYT506P/61M/xFuniR2kxNQG2vSxt4CwfNKPi4d/ynPg94EIwGOD cWx+RrlX/xixnXYiHock2AOsvP/6tFzGCKHB243auDZp5KwxL8ZtzqTbSunC8hEoNOG8 0FCPzDs6ow8vCLxiallMzSjzTaH/qrmbS6yeLp3MsczHnzNwtzSfAu/z1kmw5v0cYZUq DcJT64Zb5T7FH63NIcq48TO/SbnkqyHCpPo0WO9VBLoYDKmCjj4cZjSTOclCGP7jSZ8D m8aWjHqb5Ci8MBWc2XpQLCaoy1wc7WSzuq5uUc+jlXQfFLFGTx8rX8wfodW6XYBpr6TA KbhA== 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:cc:to :from:content-language:subject:user-agent:date:message-id :dkim-signature; bh=jdDKprmOrUDa4AVZYMzz6VN+n/WQy5u0nljbGpm2hMo=; fh=tMggEcgDUNPar0Tcfltjaa2eh6SK96+jpMDm04zE+1o=; b=0hvsil799/chKyZlF6pJ/ckU0F5hj0dd0p9K8VEGXPc9ccYVNVQ412hj5vXMwhfGks IAYI/bxZEg8yrwdqAyrZ4ggpqsOlMlUeP+eLWmogFaQODe3XhHl4SS7HAYDLqK0trpIu 2JOGue7A+59fP8wHmHbE+oz9BHL8nPUP+OBqUW2rhRkngkAaQGtzbl2M/EENG3x5lu8X Rc5j/GUa2JQ9ZewgCS5XlgDYdLd8xbItNPnaJ+Wrv/YWEuSXUMK/j2E/cNNfWs1ZQEvD Z6kNwApf1xSSnaLs+757ojGqBo8mosEKwXiuHDTgQSjuivBE2qkcuEqjFCyBCjkPgNF1 urSw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=jeVFJdvq; 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:2612::600 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-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20600.outbound.protection.outlook.com. [2a01:111:f403:2612::600]) by gmr-mx.google.com with ESMTPS id g192-20020a8152c9000000b005ff5d5ae22bsi294143ywb.4.2024.01.18.23.49.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2024 23:49:26 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2612::600 as permitted sender) client-ip=2a01:111:f403:2612::600; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=jeVFJdvq; 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:2612::600 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=lRYTWMGkAJL3Jcq8XIBJug1UFsnWF9VevNHIEns1QJ/rvXEcgTDOR+bc5M7FxMXALqhwQIZXLDpzw0aS92c33pTM9WylUVSVBURcmjLlurNSYNCwDhg6SW61eAbErP4iGvmr9oc+X+A2z+Rvok5YyEbs2NEs5wqcYs0kBOFy8GWXBMC/fjNHwpRHDT0JerpOuI8RgLw0lnMANa23DAgHWuh7gnmon33qRj4mUoiE7uIfEXDMsm2abDhJjdWLDENaMkJ5QM6CA99S5Ek5B3j9DdY2BpTC+syJbgZyx4mpysYrdZTHS9mFHthLBY8kk78ynWjRQwkdsNyGa2v5PxBOsA== 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=jdDKprmOrUDa4AVZYMzz6VN+n/WQy5u0nljbGpm2hMo=; b=b1J3iUMcTSBJ4pENNmRKMU5WFIjZ9WhGOBZDKaN6T6QcbWBFL9CY2QI6M/S3rhzqOd/cAUE22KrJ4woj/yZ9X1MOOalptd6f5emM5JjE7RWUhJtr7W43X3mRul97kkWr5pE6HCxCLWeNrxIyATUqAyz21GZtk1VhSqsX/xx7XOlsSIxyqYRC3Irs94scP8P9U0suRR577YjPgCqYHLKzRD8x221LIbP8IMrBWRQ1oOX4HTWOGmUfTPKG7FXL5gvIexghGMbblSC2ES7QADgcXR/fPr1k8J1k0NLl6fJrAVVP1OB8gleLjyigobJGSauIvj7pbGwsnNm2gb+7UdniiQ== 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=jdDKprmOrUDa4AVZYMzz6VN+n/WQy5u0nljbGpm2hMo=; b=jeVFJdvqSTiCFfLRAUBoN5gx6HDL4SEIktpPBD42VPXxciG8iaXaFWuabp4+xWcylPPMqSg4ctvAUpp2fzS5HT8WPG42OkJD1z5TOxdcnTuBVa4SMvzCcv/jFiZpzWe2RjeOsMbLN4GZvN7Cycn+88kte6P+85cYb4A0TfO3k4uW2Ok6JYa4VJVhAXhtGLxjI9nxf7+QBKJNcqUaCTeYJMY5LeREZM22sLpQb/UD2SnHlqBDgd+DJ+DDCYTxs/+32P/gJHNjvsd+jj2vYSp7l2cyUfo+ZYbigibQsLGZNbSbiLRa4q3Lf8YddrkzzgSl2wkC0LE3LqZEPG8AETb5BQ== 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 AM0PR10MB3457.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:154::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Fri, 19 Jan 2024 07:49:24 +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 07:49:24 +0000 Message-ID: <7767aec5-41f5-44ce-a292-6551c59a6ecb@siemens.com> Date: Fri, 19 Jan 2024 08:49:21 +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 Cc: "A, Srinuvasan" References: <024b7d92d8d9a9b1bd50466d5903086cda462c07.camel@ilbers.de> <0eacc107-7e89-4118-a9d8-f2e9713c64bc@siemens.com> In-Reply-To: <0eacc107-7e89-4118-a9d8-f2e9713c64bc@siemens.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: FRYP281CA0002.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10::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_|AM0PR10MB3457:EE_ X-MS-Office365-Filtering-Correlation-Id: 2f3ad5c9-82ae-4cd1-b993-08dc18c327ad X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bZ9cWIdodRlvr09aODtLYxfvqhnGhay6ht1JTa2c3TuxVkt/n+WO1/kdLfkrNEEHD7k12OrBZjaB3NWbYf8TEvoB0IZOx7gSAACvzDtrRL/MLosRybPn1dXQUibs5NgtTr1T1AcUv1tyE1tJOa7ADqh4poHYtWgkit2GU+vvzinRCrLMWM6vQsPvKu6JHpNKQLLlLYnvQFm1iYae1Umlj+b2Emd8zRduRkk79zPWvBsmAaU9r2hr9mS64do6Q5xQSQnTng0KRgpIv/g1+HyZU0Hv/2ZiiJmo8CB9t9L1hdjPRAov9nyZ67loCrDMXCh23KIH8gqWZRM09UBeO/SrESferhEVB6RfJdRwMH8VSjDAam6TuOg3Q7zSMp+/a0XGP7XFUBwJEQl+a1H0IKacjjmdVoZXE8w3oj0TgEbo/qIys3ef1zpKSMFS3vFl1oUpsaH1xyBTy2gS0Jyn4cWsvF+OktQZLEiyaqPtha2yC4jX7jc8AziODcav1uGOaqjEfGrfNQoQMGKJRxMss6goYDqYbJ3nqro58P3AESgC2nO8SvDTWWKoV6kPPDXnm27BG+45girlKDzAt0BYhCA9heyiBDAuzyHERRqP8KXALde0slbeaKFyBCetklCG5zFxJtzSoY4qVCLfc4830KzO6WaesnRcUmm39fKUvxlPUNDLvnY1XCulsCbEkE8bM5UB 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)(366004)(39860400002)(396003)(136003)(376002)(230173577357003)(230273577357003)(230922051799003)(64100799003)(1800799012)(186009)(451199024)(4326008)(66899024)(8936002)(8676002)(38100700002)(36756003)(82960400001)(2906002)(31696002)(86362001)(41300700001)(44832011)(5660300002)(6506007)(53546011)(6666004)(26005)(478600001)(6486002)(83380400001)(2616005)(66556008)(66946007)(66476007)(316002)(6512007)(110136005)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QzNMTzdEQmlnL3BzSUwxbm01dnV2SVhFSUVZZnBrNVlSVmM1Zjdia01aVERG?= =?utf-8?B?NW8zaWg1WnhRcmJvb1lxU3ZVNlRaZGlWVEtrcmh1dFMvT3A5RytMeTFTdEQ2?= =?utf-8?B?ZHhYTWVianJQdmprR1pLRzdaL1grUDZ4UmFheU9jL0FMZFJLbDlEQTJmOGpa?= =?utf-8?B?NnFxS1RDSk1uMFZ6cVQxSVdXelkwZ0ZtSEtQVmJUV0Jkcy9VMkFMQXVDM3o2?= =?utf-8?B?aFpPaDBicWVnMGFHNEdaUkpQUVFkeDBqbWVjSTZKdlFRY1pvYWdvS0hRRVMx?= =?utf-8?B?MVMrbmFhTUJTK0k1MlVYdy9YNXIzWGE1Y3hTUDY0bzBUODB1cDBRd3A1ZGhC?= =?utf-8?B?OE9tblRjZXNveHg5YzU0ejRxYVpxSW5yUVlBSTVqQ2NCMUEzR0hXdWdkdUlL?= =?utf-8?B?blYrRWV6Ny9weGF1Y3o1L0ZZSytIbEozZWcrNzhCMDRsUXdIQlFrK1RUSjdH?= =?utf-8?B?ZC9STmd6clN2a3ZmRThsT0pTSlFyc2VxSWdQeCtUK3R1UjFLd054eFpOK25Y?= =?utf-8?B?ZXQ3eU5vaUJYY29mYzU2S2VNNnYvS1hoUVArd2RKdnBQNk90RGtXZk1BbmFM?= =?utf-8?B?Y1M0OVViK2JPU2RDSnZjRWN1cjhKTmtld2E1YjUzckpyTUt6cXlXNUUwMnkv?= =?utf-8?B?R3VGRTZydEkzbFJ3TkR5TE0vUzJRcGJVelNCMkZhcm9QUSsrSDEvelpIeTZJ?= =?utf-8?B?YTVKekJjZW4yMG83WkQ0aW5uR3hOVzBjeCtGWFlJUlQveTFJdVkrNUo2bjVY?= =?utf-8?B?WndLSDY0WFlRVUZGUUY0aEVhVmowSSs4KzRqRjc1MkhCMUFMNFhnS1FTSGFZ?= =?utf-8?B?QThKN01CZmlGc3I0aDZFVDI5QVlHTmx5ZFFabWtYWXQzM2l1UklZdUZoNk0x?= =?utf-8?B?WXNaQ1A4azVwN1dBeEg5dlpkeU1uYko5SHlObGJldEVUQUQwdUVXVjdqcDFN?= =?utf-8?B?SmhiVTRYMHVkUmNvZEJmeXhRQ2tReXlSVVRzQjRIai91NFVhcmZuS3hzUDY2?= =?utf-8?B?bnEvYVZVUGFRaEdsRk02a3RlUnFZRTJjNHpvTWRjdW91UGVaWlgvdWdTa1FL?= =?utf-8?B?VVVGOUdiUnpSWnRkSVJxcmkzbXEvdXh0c29GZ0hPMmIyeGFYdEllVEFYWDhP?= =?utf-8?B?d1Q0U0JXT1BHT2F2VDlwTW5iVE1BNXBMMDdlN1N2Z0NPSjNhWEtaMVZGbzZY?= =?utf-8?B?WncwRGVzdEZNS0xhakkvSFltaTVWZjE3WHFYR3FuUVdMdFVQVEE4V3F1NTZO?= =?utf-8?B?bGFoV1dvSmRCVkNpVjE0VVFRR2JvY3hKUGV0NzY2U1hqQVpidUM3Qm9DOCtH?= =?utf-8?B?Tzg3Rk1kcU1INzN2VlUvbUE0TXJmSWtpVGoyeTM0NUxadWROOE9tSHpKSHZB?= =?utf-8?B?cTlJSTJOS0ttQWdXSWUxRWtZV1RqOE0vb0Q3SzJIa1N6UnBxT2QvU04vR25F?= =?utf-8?B?R2R0M2wvRDB6TFNwbzJtek1mZTNVMk1VMFM4Ry82YzYybnpDVFNCNElDRmkx?= =?utf-8?B?eXBGWU40V0VMRHJIa3JGQmlvL1NBY2E1MjczaWQ5eDRFZ3h5QmphbFI5Z3oy?= =?utf-8?B?K2ZzZ0thSFQwUS9xU3E2bHRMckRhMUpGOWdzQnVkeEJWZmpFMGVsckpHdmxN?= =?utf-8?B?cmdMRmFTUmo2c1V3ZTNmYXJma0U0ZEt2T0xBeEFXV0xVVjJNYU9IYi8rQk0r?= =?utf-8?B?QXhiRkN1dE93LzlPb2Uwc2F0RUliU1hFQzlpQTBSMjFvb203dUJKM2VUbGVX?= =?utf-8?B?Vkw5U0taTVk5Zk11cUkxTlNnbmt3R0RFL2dyVGx2b2RoVzlXdVNmQWlISFps?= =?utf-8?B?RGgwRVI2Z2VWUlNpY2sreXVxbUM4bVNwU0VxaFlPY2x0bGZRMityTC9aY0pQ?= =?utf-8?B?eXprZ0cvVkxnWHVZbUxBY3U2SmJ5M05kMWZDTW50b2JtN1RCcE1NenhyYU1n?= =?utf-8?B?eElZUnBXUzMyRkpIV05SVXpPdlcxejhDcEV4V3VKbE40Qlp0R1ZiZ3lVVWRr?= =?utf-8?B?akRWZGJzT2MvaXNUQlZwdlhOdDl5WXlZWmFPZGlzdkZ3YWtPNFhZQVFqdkNw?= =?utf-8?B?UVVMMnkxUmx3SEI1cEZRbFlhNzlqRTZIZ2JOeEx0Ylh0c1F6TlByd3hBcklh?= =?utf-8?B?WTUzUHhIcXJPUktBTzNHdkk1M2VVdVVlWk9QVmxEUFhiOGtVVzAyUUo0VFpk?= =?utf-8?B?T2c9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f3ad5c9-82ae-4cd1-b993-08dc18c327ad X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2024 07:49:24.4392 (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: GbBR3DyBGQiE6Pou/gkY9u66va8rtddRQNc+O6Z7MiDzRdhdBWbr6PEfEh53/rhrrkclfH+CP8kRtZQZm1J9KA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB3457 X-TUID: XzD83bK5qoHz 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 -- Siemens AG, Technology Linux Expert Center