From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7325493263178137600 X-Received: by 2002:a05:6870:d149:b0:210:a49b:8ed0 with SMTP id f9-20020a056870d14900b00210a49b8ed0mr1236881oac.117.1705599311781; Thu, 18 Jan 2024 09:35:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:6592:b0:210:a349:1300 with SMTP id fp18-20020a056870659200b00210a3491300ls239172oab.2.-pod-prod-04-us; Thu, 18 Jan 2024 09:35:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IFvyz68ePadya5Op8bbCEDLMFZ46k7w9zDatURkABnokxQT+umOZzyWfzDQikGhI7OvNDQh X-Received: by 2002:a05:6359:2ea3:b0:176:1227:873f with SMTP id rp35-20020a0563592ea300b001761227873fmr1244177rwb.50.1705599310663; Thu, 18 Jan 2024 09:35:10 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705599310; cv=pass; d=google.com; s=arc-20160816; b=DXYqSlkP9nbAjEboyk7SSVklxvUlUIcry5kr76EtHFoxv5NaDzztxjim8SgFLfckqD xZi+W8giaDAnxeK3yl0rfCWF1yOBSlt17iGPB6sV36pGTS/X01QDBiBQcpMu5hhsHysg ufiLOP7Wwn/XyZ4B1D9y2F81wg3K6EEwS0TzhB0riBSdIkY0gZ4rn241A5s9LoQXoUJh RXppEBokv+M5qA+3Ct75evBWaOiWSe8+kVXBNDkrbqLPRJA5Iz8QRpwCyv2KqF9LSpjL C5DZIuzn5SRkFC17zxDL7xw7ol6EXEH/y3a8+Wvbwp2b9+gJLRoaXyelWXL0bo2bIJJw nkDg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language:subject:to :from:user-agent:date:message-id:dkim-signature; bh=DGu/aJHhgAXK5hRZzIXrJJUsV/V0ayfl2kIxe9onkrU=; fh=hOBXq6nisExkIRIwN8IDOmOCLKwX8PM0ANlxQbNMEqA=; b=kYSksnTJwxVaHCAu/mwSMhokXLzaSw9BMcRXtPRCl+xRo78Hl9Z4iRFIdoYcR34Ri4 3Zl8TZtnL8ToFLhC6EQbPYyYKsLxE9iPfiRUsRH324lfv9+QY6Q/VgLTyXox/oYpVAq5 n7rewz/Ujt65/6+C+zB4aN30xASpeyGLGf7oOnqKI5yhrjBGc4XQi5KcTFmEDG2F0OlT BV2Rj1xfZQKe77AKXJuk9SdEeQoySsZv6OSIc2XuP7E6p59+ycI8bWSzdCyVYxF0GWor LdMK2sycItQipC3ikqZmusDGKHHxFru9FMgx0BQ3b/4YW92wYVPznPXD+G4I4Ho4rodi 5fyA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=B8yj7CUQ; 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:2613::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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com. [2a01:111:f403:2613::600]) by gmr-mx.google.com with ESMTPS id c67-20020a633546000000b005cd919bdadfsi178568pga.0.2024.01.18.09.35.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jan 2024 09:35:10 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f403:2613::600 as permitted sender) client-ip=2a01:111:f403:2613::600; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=B8yj7CUQ; 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:2613::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=JZaqBMUPA9fjGTRbbhKfxO5csemFJrAet0KIfZbXZGpK5M1QNT6plkLhnmEjepx1+eqVVIfhNT3+Tzm+IULHkdWhxRrC7W7HUlqem5/+VLCAZxqz89JvvDr/JN2lrD9HeAhP/m1CjqBvJyrPU+sqotUVkSmUhEoNJqF4ZSHOZnxsGqd6lAQKx66Phx6M5l9N6zVM8lKgAJfORFXS1yZZfQqJjKO3+H9tEEHqm4djuzG2jn8+VMB3+27AGm2Srvn6SFQUZCrRF+lYTpvyJTE83c2ew6fN5avNh/6aU+ej+2JGdytovj2ngW5hfbF1fPA29b6xk7ltDxhjeH5DNpnvTQ== 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=DGu/aJHhgAXK5hRZzIXrJJUsV/V0ayfl2kIxe9onkrU=; b=JBd1U1RgaB06TeJv58+J1aR4bb54S5v1aAwMIpJtIykNHL4kuQG3OO/3JDaulA4Mc5mmxkXT2yF7Mhg5yCo5wv/1LDRXTUFn8AKJnWM1mOx7JYsW/P+nu43gSt7A/fZoAtiN0HG6wzt97SrbaRJJTAAv0HpiVWv5x80/Nw7X8d7F+sqoX+9sAcHtEkiumLtzw+5nHvuqmJ51YxOQan2krw6QYgwsEKdUyxMg/y9jvE+AwJrot0nRfOLoKYCrE2pEKCMx2JH4UZ1YpPFFTI8wqYzp+vfm25lpyJbfy3dh9jIAn4wL6uiFO6t6Yx+ibCLBVwqW4oCaDqc8IKZPG1xvgg== 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=DGu/aJHhgAXK5hRZzIXrJJUsV/V0ayfl2kIxe9onkrU=; b=B8yj7CUQZcFU5q6xbsHCDBGd9oL4ZukRM51ErvIa4SeQ8q2+fHhkPYm5nzgBIUEgKGsrknoeC+1K2A9IxdjA1RgvE8DKGArbKyR9XwZAZL5dWUEDxp1xuKvfqyKgKWF/NOPVoITX5Qxev6sR1hvym+4krmHtcTLolDdU0rFEJZf7/zYXgl6jUAmo7Ym5irYeslo87Qzt7DNlw89ZzAA5xYs7YiP12lJvE/6rWf0j8aSPGw3j9KsG6LeqJ/jlRXtjgsFDKa1dl5NU0P7CZRMlXQpdAyWxFn8m74WJOd4uFXbsiRspHnAOfrzBlHcbdyaVNazL3H+MMLh3msz1UXc9kQ== 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 AS4PR10MB5574.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:4cd::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7202.24; Thu, 18 Jan 2024 17:35: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; Thu, 18 Jan 2024 17:35:07 +0000 Message-ID: <56cd7e53-f36b-4f9b-8c0f-703c45102ca0@siemens.com> Date: Thu, 18 Jan 2024 18:35:04 +0100 User-Agent: Mozilla Thunderbird From: Jan Kiszka To: isar-users Subject: [PATCH] dpkg-base: Fix and improve handling of multiple apt sources per package Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR4P281CA0161.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ba::13) 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_|AS4PR10MB5574:EE_ X-MS-Office365-Filtering-Correlation-Id: 00db758c-79fa-4a84-265d-08dc184bd061 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SV9BQZTKjxe0RVcqRuN78NNg/P+wVt+K7LbxkjqWP3+BxIfLsQzQmEnP403jf6E7E5Hi7yWdOut0LIfqVD7U/T8co8g0tKpL1whl7kdj+XO/ifHlmDrInETj0e9WIdnwquYQzen35+yV5OGEBjCWcKcVPjQqTdtObdjBEaCD0iye7zBNIF5UIrTMpfSNYg0OZLSj0tb+VexJ9CS96v9t57gQJ7DYM0l6nqn84TRSNDaZTGINg+mbY3eD4Kv5AophAwG+TVNPa0+n+VuwVoLPUprHcysjj2PCrtj9em6ZijQwfPKnolirT4ugwe/caEEv6iK9zWaiKekjUmjSrqipsOWgw3a+R7yFJ023b5+ihXi8GF78LTDXE63uW7fCmcCZDox6EzuGI4rupox8kxjshsVEQtUupSugx/vgwADKz6BEUR85Bh9/I1LhUuJM4LoD3QGEvVkn/N/ABB1Xh2NuvSoDqFHroEjjfSuTX8gMyMC2QXK52pMxiGpEn/8YGVwx79x9sY9j7kc6WINC3XMCRG8ag/gzbRyug+D03mcxyabXpLldpV3esAFw7ALuhHyL+nLGw2vckDrCU5xrFWg3icUp/0n5adwnshFN9TtrmJ5n1Y1klgGNalKcHyQpSu97lyfHmWxx5eaFn0ouGU09DQ== 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)(376002)(366004)(136003)(396003)(39860400002)(230922051799003)(451199024)(64100799003)(186009)(1800799012)(38100700002)(2906002)(44832011)(5660300002)(36756003)(41300700001)(82960400001)(31696002)(86362001)(6486002)(966005)(478600001)(26005)(6506007)(6512007)(6666004)(2616005)(8936002)(8676002)(83380400001)(6916009)(316002)(66556008)(66946007)(66476007)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QUhhZnFQL3U1bm5QVU9RaXY3WjBkYUJRSEVDSXRyekhNRGNmRVZ3Y1cwaEpD?= =?utf-8?B?b01OaDJyRUlFd0pzelV1eUhrM2J1anVQUGRnWUQxVC9wckwwTDdhNjBpNUFV?= =?utf-8?B?ektMSDZ4ZEx1N0U2b2RQaXp6eU9CcldoQThobzd0a3FmZHdOWGlWWWF6V1Bh?= =?utf-8?B?N3ZnVGxVZHA2UlRqbWo1WmxIQmhlSGx1NzVDOHIwS2x6VkhCTm9JWGU3OW9y?= =?utf-8?B?MWJqZzNJeVMvMWNkaEZFS0M1L2hUNjNsZ3pXckNZZ3NyeTBjeWl5ekI5cHgx?= =?utf-8?B?YlJuTEJPWmVHaVUwc1MxN3YxSGpKVE9GcEoyMmpTMXd4VTVsME5hbkc0bTNn?= =?utf-8?B?VGEvSms5VkEyckM0dk40NEdBYS9lQmUvNlVYMGhmNWdWdUtoRXNXZVYyRDZY?= =?utf-8?B?TGFRSGNwNnlxZll5RGU2RlFFTzJyWk9hVUhvam0wUEN6VmJwTng1L0NmZ2ds?= =?utf-8?B?Z0RSK0JrVngrNzUxbXdDT3NQeVFQbTBlVkc0c21rT0gwTGpaNlgrZC85ZXd2?= =?utf-8?B?NmEzY0ROWmFKWlR3UHgxSWRBM3NMZmhWUlUwSVdiUkJhVXN5WlA2WXlWeUdm?= =?utf-8?B?RTZXNmdpUHhPVE00WU55SlNFb1VNeTkwMEZnNnRxcGFHZmtqbzlTSUoxV0JF?= =?utf-8?B?ZVV0NG5qSGxlWWo5M3g2WVppOU1IT3FGSk1tWXRYdi9HcUhybnNqRWVNb1NM?= =?utf-8?B?Qko5b0V2MkZNZDJ0ZEd5Z0RaV3BkWi9MY29OZ0o2bGRLNXBzaWZiVTEwRWxh?= =?utf-8?B?bFhJY2orZllVT1NldVZpOU01dDc3STZOSHhxUDU2SzlrTkQ5Wk1Ed0hjVkV1?= =?utf-8?B?TnJ5eGd5UWtaR3ZNNDlrVVo1NmF4SU0wOStEWGQ0V0ZDODQzQ0hoSDlZYURn?= =?utf-8?B?WDNBWjNzdGJmTUJGbHE3VE1iQVdpcjU1NXNXdnd0eG1Zb2R6MHAwQ0IvZFpO?= =?utf-8?B?REZvK3dUU1ZVZzhSZTdTa24xWVFEN3ExNi9rYk1tOVF2MWNtZGVvdWV5anM5?= =?utf-8?B?Tnd6ajRDclNBWTVqZ3FXZkJuRUZxRWxkbE84dEZWRTFrdjNxZXdkSG1yNmlE?= =?utf-8?B?dGFDcUJwelRVT3ZiOU8wa0NPZ3dQcTFyaDNkS2JkSXdTRnJOYWFNZ2FGaXpN?= =?utf-8?B?SHFoQzlzcExHV01tdXRrMEZpTG5TVlUrZDNucWVPbXFBSkZWSncrZGlUS3hk?= =?utf-8?B?UlErTVlLc0FvcTRWNjJaNUwwT1dxd0dMSUlnakZRM1lML3hFQTlZRXhqUE9M?= =?utf-8?B?YVQ0c2tybEZ3YzdaQStGUnZlY1RLSFRlK3FZR1prbVU4cTdLME1uTi9pK3FB?= =?utf-8?B?ZGpKRFFSdEY3enE5MHBUYzFFYWRSOUpUTHViUUVqNXdRN3lPaWpCZW9taFM2?= =?utf-8?B?VmszUmtvMWloZWFlaXVGbVNvYXB2RlhPaW0wWitYMWxCZmlLemlyKzZsNzk3?= =?utf-8?B?SzVFYUlieWdJOXFPZjZTcXJFK0Yyc0ZDaE92QWN1S1ZrVlJFVFlYanRaYm1P?= =?utf-8?B?TVNmMDFvL0V2NExZWTAvdXdKUjMrU2NZaXA2ajhjMUIrRWpBcU5yekdOQ3I1?= =?utf-8?B?WFk3MzRiZmFQSGk2RzNvREUvUHdzVjlRVkl4eFJWVVg1SnJrT0VyakZ2SjNT?= =?utf-8?B?eWNLNkxvVXh3cVFJMUpkRVY1ck9RT0NXZndBR2h4M3Y5ZE5ZVk5EcDMxMjNF?= =?utf-8?B?aFFSQVh0aEx1ZERqblZxQWpBZUFlNUhnamoxSWJJUnRza09xenhwb3NtR3c4?= =?utf-8?B?eGJFWmVnZ0dYSy8wNHpCMzVpV2dOSVR5M3c3MDhyRDN6NFUvb0V4elgveW9w?= =?utf-8?B?eXlzSkgyTUxlSGtqSVJvdkZlbWl2UzBRTFlQcFFoeGVNdHhMMzZBKzZOWGh6?= =?utf-8?B?cHVSNTkzRjcwYzh2YkdFaWlnWVhqbUZYdE80WTJYUm44TFl1MnBoZjBRdjlk?= =?utf-8?B?OGk5RzlEV0g5UzZ1K2RKQURpcVVnSERDVXZZbUFRRFY1eisyWDQvTy9KV1Fy?= =?utf-8?B?ZTVCMEZnK0hnaE1FWUNDbEZiMVl0bjdkVkMzY3RYak1iQ0hoV2ZBRU10aHNO?= =?utf-8?B?eDd4Z3V5VzRRMVFTOE9hV29GWXFqWDk5WjdHcy80L1B2cDRGYi8zajFaVmxh?= =?utf-8?B?bmtweU95dWFxSWNXUTVTVE85azVYcjRwWTlnaUNicVVDbHd5RkFSQmdPN0Zx?= =?utf-8?B?aGc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00db758c-79fa-4a84-265d-08dc184bd061 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jan 2024 17:35:07.8734 (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: QWOfBPdUnZ0CeIzCoPCQFj58CzxANEFHS6fzizA2HJqagBGK5lfawNkMut7tSoBJ34MwhbVbl9Hm7a1sWHLQBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR10MB5574 X-TUID: M08+WTJ8siG1 From: Jan Kiszka Due to overeager quoting, multiple entries in SRC_APT would have led to build errors, rather than mulitple invocations of the fetching and unpacking steps. While fixing that, also avoid pointless re-entries into the schroot by simply pulling the loop into it. Signed-off-by: Jan Kiszka --- This goes on top of https://groups.google.com/g/isar-users/c/k8ZNw3OkWLw/m/mnzo45T0BQAJ (v6 of "dpkg: Restore support for replacing pre-installed packages in sbuild-chroot") Not urgent - this bug is by now more than 4 years old. meta/classes/dpkg-base.bbclass | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index 80686677..80e31d80 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -115,10 +115,15 @@ do_apt_fetch() { schroot -d / -u root -c ${SBUILD_CHROOT} -- \ 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} -- \ - 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 -d / -c ${SBUILD_CHROOT} -- \ + sh -c ' + set -e + for uri in $2; do + mkdir -p /downloads/deb-src/"$1"/${uri} + cd /downloads/deb-src/"$1"/${uri} + apt-get -y --download-only --only-source source ${uri} + done' \ + my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${SRC_APT}" schroot_delete_configs } @@ -139,16 +144,16 @@ do_apt_unpack() { trap 'exit 1' INT HUP QUIT TERM ALRM USR1 trap 'schroot_cleanup' EXIT - for uri in "${SRC_APT}"; do - schroot -d / -c ${SBUILD_CHROOT} -- \ - sh -c ' \ - set -e - dscfile="$(apt-get -y -qq --print-uris --only-source source "${2}" | cut -d " " -f2 | grep -E "*.dsc")" + schroot -d / -c ${SBUILD_CHROOT} -- \ + sh -c ' + set -e + for uri in $2; do + dscfile="$(apt-get -y -qq --print-uris --only-source source $uri | cut -d " " -f2 | grep -E "*.dsc")" cd ${PP} - cp /downloads/deb-src/"${1}"/"${2}"/* ${PP} - dpkg-source -x "${dscfile}" "${PPS}"' \ - my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${uri}" - done + cp /downloads/deb-src/"${1}"/${uri}/* ${PP} + dpkg-source -x "${dscfile}" "${PPS}" + done' \ + my_script "${BASE_DISTRO}-${BASE_DISTRO_CODENAME}" "${SRC_APT}" schroot_delete_configs } do_apt_unpack[network] = "${TASK_USE_SUDO}" -- 2.35.3