From patchwork Mon Jan 8 06:50:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3266 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Mon, 08 Jan 2024 07:50:55 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-qv1-f61.google.com (mail-qv1-f61.google.com [209.85.219.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 4086osnR015126 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 8 Jan 2024 07:50:55 +0100 Received: by mail-qv1-f61.google.com with SMTP id 6a1803df08f44-680118b101fsf39095586d6.3 for ; Sun, 07 Jan 2024 22:50:55 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1704696649; cv=pass; d=google.com; s=arc-20160816; b=QSwuY1udl31lt0Gi2Bd+zHsUvfZaBuEiSQ7CWqGo3mbcSgx1w4Ey6ddr7psrTHUIh8 ZjjAdNILMn/YKxy0dtr2VDJJBx4EdFV6ReTlbt3U+crd3GXwUxWNSVqo+Sc40iEEmGM5 +q5lgOk2vBRLy657Y5Kp1JGl0q67vNn4Eq/uzGz6q5O2PLHQv7yFGZVs4aS76GjpTcih xFZKKd12FJCtFlyu23knbw7+LwGUVwrZSTDGaRJyd5enTpz7lIBd3m2UKseE3CYDDr2m npIWUGOuxw9kZFoPgq67OSNf6yILnba0A875ZXaQqzTjTrmyOoT4t8MDhpaLX3KMSECf M40Q== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:mime-version:cc:to :content-language:subject:from:user-agent:date:message-id :dkim-signature; bh=NFqV72sMWvH5pW2I8FDida/rBG4f46cQ3e+1bBkUALU=; fh=A1IlHLw+Fveh7VW2X6QMbjy8A5yX+mpETcSN2fuTDZQ=; b=Nk6haFGTqmFm72q9Y1+K9snUU1XgqWvIPy8ptj4qDIaI0VLPXa3BL1ii5qnixWpTGb Tp3KBM8p/cswtxHLR+qcyR6uEefAJ3opLYZ3CHcJWGg5rJen+/jbTOjZoF0hQMOmeWUF ZzpBit70DSk9yMR697ap2GJYHzC+p+Tga2z7TXGbujoVkqm2VrB6lgJOSukcPyz54M9s fXNkAX2v+4E8m1SmuYBpAB8GmXg5wMSba/VdIz2jJeiq4IdMXm3MNRjCDBFBSvzGjxth A+dygJ5ZvgBYdXD5Fq3vqpC3W652Qkk0VuLzmO7b6Viv46AOtoDfRE79xcSOkO3zp1j4 QKBw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=qpjaaf3Q; 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:2608::600 as permitted sender) smtp.mailfrom=jan.kiszka@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=20230601; t=1704696649; x=1705301449; 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:cc :to:content-language:subject:from:user-agent:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=NFqV72sMWvH5pW2I8FDida/rBG4f46cQ3e+1bBkUALU=; b=saabGgE8UBgxhvicjbYu5faL3jUphHDX5hgD/L7RlQyq4qaTABkmvQRQ0tB5jKbN+B RYRS/gYi5LdekGwtD+xzsG8Ygxr/TDbXpggo553Z4hgBR6AOLE3XfkliulmqZFo8TLrF MDwwxjPkvmSUby4seugRdlDhFerZZmjXW5qOK0nxBHTKhnZwW5I3r6sHdUE2MZxDSgYu +5SUpS0lKLtWF5cJBMjyAMK69N0EevKficlk2t7jlmcmg3SEdw8yYw1/02/Dm06wkO3a vS7MOZ9tEStd5s3skF7fcXdKpsiyF/K07pHWSQgB0OUW6Rwuh2Rx2x55ISNE0EIVJCRj XAWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704696649; x=1705301449; 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:cc :to:content-language:subject:from:user-agent:date:message-id :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NFqV72sMWvH5pW2I8FDida/rBG4f46cQ3e+1bBkUALU=; b=dUuOmfHH3Pko5w/BYMbgZB27yAmIU1b4DiEBuvm+asN21vUNAlsBwL8HEmwsgl9h97 TLI6YCQ4fD0YLvbgtevdYx5pNHMfEBNPuBocrANcALoefoRihVafo3jY/DbaJwwR60po MxGRhelId89Lm1+lH/HaTfxnm9Tp00f4AODnt8cy6pd3zgM4ds7bhj+YN3/NeYobC6zb 1jjsulCE3BDZEKgyFj7wb4z/CRSeB+UpLfXgALVEckFWeo7oktocF6Tzn37MgPjVnQX3 JiciQyLfwW2DOo2KW5FQWkmg7nP00jW/MKwHCYMKvPB2jBPh8FKfC2KwQqHuoX2jg4So 0ymw== X-Gm-Message-State: AOJu0YxouOCvafcVEBm/u49B0rQ23U343p7vCQtO3/bkrMwMFhw0WISU ehiCrEoG45ve+zL8GL5jwD4= X-Google-Smtp-Source: AGHT+IEv2x0TKtp0ioOe9uz/IFurVuaIrz2eFmKlZbr3lRVx9IB79B+KssMKxksbHk2cURZyjZFhPg== X-Received: by 2002:ad4:5ccb:0:b0:67f:b9df:17e8 with SMTP id iu11-20020ad45ccb000000b0067fb9df17e8mr6122810qvb.96.1704696648800; Sun, 07 Jan 2024 22:50:48 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:260d:b0:67f:38e1:6983 with SMTP id gu13-20020a056214260d00b0067f38e16983ls2117537qvb.2.-pod-prod-09-us; Sun, 07 Jan 2024 22:50:48 -0800 (PST) X-Received: by 2002:a05:6122:a13:b0:4b6:bfae:3285 with SMTP id 19-20020a0561220a1300b004b6bfae3285mr743830vkn.4.1704696647946; Sun, 07 Jan 2024 22:50:47 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1704696647; cv=pass; d=google.com; s=arc-20160816; b=duIVc+6DZ3ZCyLfc/hxo2vHFIaPinTjmU74xRVctmZ/1+DzvKOtO6RgvaqfE8nKKP2 1ODq0s6n/NxPr1+LKXuezFqB3R0pQSsehpCwjELiWrjcEQvJcz1HtVEjimYdHgJLR7o9 mQDlpGED6hD6i/jQGnsr7eaOtiu8wueVaTpuRm0rSfWZ1UQz1oD6VE2ZeAF0ef0cw6/8 WXEWV04eXked2drtU0Dj0DFpuW1OpFaVuNDi5UpE+792GeWpIkPRLUeHL4/z941wZqKE 9vwlnaf6Wnj+ROL5U1tp9jWrZuBR8lPi+uGzxP17BPL4QNFZt1n5b+LpD4Zmxl9mjNE3 9wEA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:cc:to:content-language :subject:from:user-agent:date:message-id:dkim-signature; bh=UBklQSLLeFf/tO5jhdeAlP5W1QPLxLb5eVUsKe4KGAI=; fh=A1IlHLw+Fveh7VW2X6QMbjy8A5yX+mpETcSN2fuTDZQ=; b=Tex8J1jsfYYNGbDTo3pk69GSPo58BmsoK07UGMi2EvaeNriWHR5acpbvtuYB+ea850 neOrP8weS3eglmyt53jd/AMQcd/oPRxTDaB3nwr5mKDGGMtB0Jjrg3IV65EjuJX1o+/Z dSQc1GUo2I4hDlkRUYD+yMkKoO41UzU1FceFEypS16XLY709pXUAs8KC58Vol/GULA9g 2dFJtmGrJ/BKh2j4tWNP9ONXZUz3Wx8RJgq6stKaiD44yteu0qjbqclJyLNXbFtL8NS5 PEzmIzU1TcpUeAtJHE0a2NxCC+BlCMOWxJbHzXXQB/7yWMdmOkgXlUQGm70WKPwUl/gq N3nw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=qpjaaf3Q; 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:2608::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on20600.outbound.protection.outlook.com. [2a01:111:f403:2608::600]) by gmr-mx.google.com with ESMTPS id x193-20020a1f7cca000000b004b6e4ebf74asi920092vkc.2.2024.01.07.22.50.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jan 2024 22:50:47 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2608::600 as permitted sender) client-ip=2a01:111:f403:2608::600; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RrMkqX4ZshiRb+fc91+k6nGfXNFg5u0JWPShRkMWkD7oNuJ1uOKI7QjpnhtHLKrxD2GMv3J1iYR/9J/u6GguNcMjwr/xNOmcCMXMQQrpCo+aJhnkkrudUWvvnfmlb6FIFt6eD0K5ymPNDZFl1zA6zmFIkBTwIH3z1J+Y/1FSP5nftQ4s28r332UyX16hh0p1m+0WL8jNVduMKd5WiemWpWWIBf/n0QOtRXhJIBkG+VgWUvk7vrRwWjDpZEl4VPUion4FdqRstsKoWXmtHd0+aSiq60C2hih/ftJD4hqofjT4tsPQylTuudc/sDg57tQ+DEBlTq6ovgY8l9pe2hcBoA== 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=UBklQSLLeFf/tO5jhdeAlP5W1QPLxLb5eVUsKe4KGAI=; b=eIXDFUznQ8FZAEZWebGrH0B3ZeIPPuDh6ZU8duL9L05fw5LLsBZoTpCz+x/4BFb7bsCH57G+Ka8On1x5awAqu+8HxMHMRQxfAIwIhNoayGSiZSLqb+0DExaFkd64+3pJ1p4A38/hBH7SrZip41bZ6KgTBTjKoP3T5RBXRKpIpOsf22GHp0Y2b2eolSDud2Vaj+iorKnm5j02on24VKg3wmkZso9fkgL6z4FmbVXinUhFULt+XqLLYUeWhYWfyCjXtIkjoUT8ADad9aSjcw8YW1AltjbuHoS41kLkc6k/F4Z64BtU8t3lDJh1q/QSwlUcw9kN0b4vXPCgGNMcGJTakQ== 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 AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by AS4PR10MB5695.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4f2::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7159.21; Mon, 8 Jan 2024 06:50:45 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::96c7:d239:1723:8761]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::96c7:d239:1723:8761%5]) with mapi id 15.20.7159.020; Mon, 8 Jan 2024 06:50:45 +0000 Message-ID: <8e49d54e-eff4-4fd1-9988-6a52832c0e01@siemens.com> Date: Mon, 8 Jan 2024 07:50:43 +0100 User-Agent: Mozilla Thunderbird X-Patchwork-Original-From: "'Jan Kiszka' via isar-users" From: Jan Kiszka Subject: [PATCH v4] dpkg: Restore support for replacing pre-installed packages in sbuild-chroot Content-Language: en-US To: isar-users Cc: Srinuvasan Arjunan X-ClientProxiedBy: FR3P281CA0052.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4a::23) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|AS4PR10MB5695:EE_ X-MS-Office365-Filtering-Correlation-Id: 79adf5c1-d738-4334-d39a-08dc1016238f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xGXSD3UlNMb6lG2S/7GyhE90xM8GZUnaAWgbLuDvDYAdQNq9/g2rpnrTaya31vgiZRnYuDAv5XISwM/m+y/UQHkfd9fuO7Tgj0QfaGSRSsSU62E11Jc1TiDX7VCLDoEHXq9eTIPJCD+zG3njO32tg6Bb3mD9icJSPeK54i8IOZmdUwBfRnl9xhTf8hSbhNkaJOsBQauq4HhAMSKDZ+81gOPkDguhed5+myJ49iWMdni5GazQinJ0FnFl2D/WINgZHZi2OYnCAYUQtIGAMMbW+ABSpWSoQvV1xonXsVqELhFtrHzc+TVEwZK/UoJIC7mzgPKdl2UcrM+wP5DggyufxOgzeYDB4eRHBpvB95Z8KbPlzd64Yj0l+fjNwmujdRBBo2L5v3R2BXO4R38Vrl8R7AaBlCwPJvtFQqifoktL/PV/lcD+Bqn7EKkyJi2Lwz9lCee1GE+0/PTgjY3MhJR1RmXkC+qqLgRgC6msbydR+nIDid6wYxHWDUzYjUZ72Zdfmxex+ItegJoceGaSPVjvNXrrlcRQi0TRWN9BERLMDOKI4FgMDa4LlebArs0XqbifTkqSt2KVfNxfJyyIuPDi3o1Y8P3yaM6wmdNGRYCgMoI8ONPoO+WuIQ9F7s1BAu6jQEsxGunuNJQAU4TYuKbmQaEbj89fjCBePidWR7lyXBg= 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)(39860400002)(396003)(346002)(136003)(376002)(366004)(230922051799003)(64100799003)(186009)(451199024)(1800799012)(316002)(86362001)(4326008)(66556008)(6486002)(66946007)(478600001)(31696002)(6916009)(66476007)(38100700002)(31686004)(82960400001)(26005)(2616005)(6512007)(6506007)(44832011)(8936002)(8676002)(83380400001)(5660300002)(2906002)(36756003)(41300700001)(43740500002)(45980500001)(360504008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?0xL/8JpK3afXEJTdbWTslOj4PTV7?= =?utf-8?q?r/uBr3TKIwT9dP5ddjmlcRp/GA7n3LVrIHb9CPnZLyAdHKaz+W4eP2BNg3WJKwZGE?= =?utf-8?q?onBh97rZIui4LMZaFBpkctkpWFpSPK9lQVAvPVY2XsKlXLmXJvNnAH3KrwJJLVHrM?= =?utf-8?q?SYBCFBBaJkVM0BJq6MBAS/asWuTkDoHcSQ3o3RFrRwzAYLh3ZBPH+hWL/b7xEKy2H?= =?utf-8?q?ua5GEu01JN8sPyHnvKv6RVhOspjhPzPyBLYIxkps1HvMst4BjbodZsZ211nHlNdOJ?= =?utf-8?q?9ZVoZKSQPI6R/47VhEbzmXsiv+WQvp+jw6U0O+PxoitdZOZ90eZpHpuqTwwVoIH+z?= =?utf-8?q?1Lksox4LsEr3qhVzRDf8fHWFWrOmhKcuHVzmqFO5MH59cqBAFeo2l/X3D/8rgJnrt?= =?utf-8?q?vwEZbD+mntoaCHMi995i2d8Ho8eI3upGG9FvED19jGGzv4h+dRfEy+eGbvmPBP9Ro?= =?utf-8?q?5VFAnhkXZ4erl+ZigjCdYPHQauxHBb5cIlb4HmlXZFv7VqNm+yBBy3smuyxs0bjAU?= =?utf-8?q?CUlBUh6cOsPxPr58oblSpC1bE324dU93SornZLMi+KYqFKUZYgk2rNW0B8V70VkhU?= =?utf-8?q?PDIk7rLyKGeXEpM/x5rYL9ITwXhsSItPU4OTDMkHbNgGc4yjCcOaSzprEaw0eeXgu?= =?utf-8?q?SLkAnp8SuUGH9EO6OmlknDNmkKqvK2v1maXbb26YJSeZuNdUZIrWmUtUe7P39GiXo?= =?utf-8?q?DT+bIUXqCtL5VJk77MzgwKIY1KN3hbOqeFWrcd0vCWb7dU/dvzR95I7GPcfNmtRFh?= =?utf-8?q?llAlXPDDJFqOI5GTcOtJR8ol3oRtJ/iXmD1zCWk7aaGFGI8mjU5Z+NYcww4yhtmIA?= =?utf-8?q?JOCvfEagiBHqMJ0blBCbJZurEDM8E3sbjMauk4EFMQueye1Xdm6FXghvKDX0ekGTR?= =?utf-8?q?Lp/IK2m5Mz2GcLKGYvu4O0i5eUxYbt84hezwKiH0uZ1cPGcMFMPXtYNiw2k4MS02A?= =?utf-8?q?WqLuDiVWYCpDA/PbxcrYy/csozc65jSnJDZnUHN1t9nMMfTVqTJfnAUtvU9KVDEhT?= =?utf-8?q?XEWVu7U3Ilg12ZlKJ/qbXgkhEj6lhIl6pzAwv+own94qhA/RiwkSWgvXOlB8ykIB4?= =?utf-8?q?SMtV/+60DjnDTLMnG5XV8QcvHyrd6IzonCqAk9OfutGCyB6nrif/H1e711RNjOOQy?= =?utf-8?q?tuv+9YT6kfKoA5EsTk3JmwImS6puFnI1fRgJ//aM6EwIKCXWj1eJkXPvMlVXebkaa?= =?utf-8?q?C3F3zUIHYXQzbLRi3wyA4eUwvz8Z6TB132IhqGM3Gjy+sfE4e6rwFPMgUknZcWBkj?= =?utf-8?q?Kk3ajWcrEjusYVAYcUGs8SeAg+gHdmdTdYQKAMFhXtq+E+HoJ13NogdseCIxkLoWM?= =?utf-8?q?mlN5e0ofae5RsHuaTjaj9BCw4MwKUIKl8aAcWGmuxwWNTv3uAJjeOCa4GUul3ct+P?= =?utf-8?q?NKlC5sLKU0x8322PGGRV14bGMizMoyHpAj6IU86xPou5JqhdIdbSH8H1kCGWKsk/6?= =?utf-8?q?fz3vZgxJjbEK4Soml4D164CUResngutazF7oTwKHFh8xIbH5P2oTEQGSLZMtkn0jR?= =?utf-8?q?oPkM+osFmj2Z?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79adf5c1-d738-4334-d39a-08dc1016238f X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2024 06:50:45.2797 (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: Kt2PQCPoEdxHV7iXtopy/XYGBlCaRutdkq7JYlZ+4c4uA7TDs7tqJ9mOtAaFUhjfIpDsYpv46YQAled4dw3JMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5695 X-Original-Sender: jan.kiszka@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=qpjaaf3Q; 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:2608::600 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Jan Kiszka Reply-To: Jan Kiszka 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=-1.2 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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?= 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. 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 v4: - pick up cleanup of image-tool-extensions by Srinu meta/classes/dpkg-base.bbclass | 27 ++++++++++--------- meta/classes/dpkg.bbclass | 5 ++-- meta/classes/image-tools-extension.bbclass | 13 --------- .../sbuild-chroot/sbuild-chroot.inc | 2 -- 4 files changed, 18 insertions(+), 29 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 7b054d3f..52baf169 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: @@ -288,7 +295,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 +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,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 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/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