From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7169469243442855936 X-Received: by 2002:adf:f60f:0:b0:22e:6564:e987 with SMTP id t15-20020adff60f000000b0022e6564e987mr23891209wrp.401.1669390845640; Fri, 25 Nov 2022 07:40:45 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1d13:b0:3a8:3c9f:7e90 with SMTP id l19-20020a05600c1d1300b003a83c9f7e90ls4569562wms.1.-pod-canary-gmail; Fri, 25 Nov 2022 07:40:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf4pZHLB7p6xZGD++myO/lQcPs+9kyaE3own6peV8VvEoEwkpKP18fxKZBa9H83UZkqRnyS6 X-Received: by 2002:a05:600c:4894:b0:3b4:91f1:da83 with SMTP id j20-20020a05600c489400b003b491f1da83mr17920544wmp.127.1669390844360; Fri, 25 Nov 2022 07:40:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669390844; cv=pass; d=google.com; s=arc-20160816; b=ZlphwJvAtQDFuce/ZK1ZfDrnKbwVx+lBTH677vqQTBm2t0BQuoUrJywvWmgH+CMEQB TmJkZD9e3d7GeI8GtSeLEcfxtS5rzRmoNiK3O3Cw+hhmCdWHu1R+XwS+gOZvgI9Zddmm HdnrY7DcdRLFy2Lf2wzxB8Gn8cJFOiBTwMM5IHuLqSeyn0Cvhn/YGSbv8HO4li71CTK8 UMd0PI0EQbogtEf1VwHXH5hHv1LtfRrr11nnRTUwpfu2VG8lmOPh19PzpeLztb8/Xj5z 6vb7Rh4gCxLYPxBKtc0u8EqIigHdP7EKG1LtiTPliK6YAJQZUacBHUWWTMgyLWG61QEx kFpQ== 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=+xS9XTaSu7dJXj6iuB6ISaHcQPesI02Pp05yNF74EHg=; b=mBUVuz23fUzrX7lHlOV+If5JlnEuvHfn/tZU9Rx/5DTff/h+eh3fvwyELUW57qWqLw 8BJpY8Yuja2PTUveRpWfuf6U/R8zb+CAUKy/AzRyuGK4TxSnZAIh2iaxBbQFdt8qwSpT lEGnbMMaAJYjNYpUrS6b7ZHYIM8DEuXzchHYEOhfNExuE5PyE8iyRFziC5hVONsR/axM PWd0L+Rkxc66ni2mb8GmZoUzNDhapf/K3OX+oxYL0EQMjucYPi8UmvXZ+21XUZ/8Lu6T ABwXT2s+ULMizH2pi/fuifgO3Q0zRXaN1ubzW/sCGqKuI8k5u+obpMVchzwpC/aHBx3/ rOBw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=J5KClYMS; 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:7e1b::614 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20614.outbound.protection.outlook.com. [2a01:111:f400:7e1b::614]) by gmr-mx.google.com with ESMTPS id l42-20020a05600c1d2a00b003c6c0197f3dsi357452wms.2.2022.11.25.07.40.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Nov 2022 07:40:44 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7e1b::614 as permitted sender) client-ip=2a01:111:f400:7e1b::614; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=J5KClYMS; 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:7e1b::614 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cPV583tsgyZYhJ1UiLgLkBXey6MRL6wf5ahCWyN+nd70TaFrdE+zDDzORywEBtLFzeQLKIDtA18b0AGu7hWbgM58Jk3cBvXBmrYsonU1+qc4HDFUHK5lO8pKaUSs2xw4kUQLl/0C/yjDM8VYr9M7ifbGTu+wg14XS46Lt4erzBWueQAgtEj3ELmkhSSg4slbiuk6dmt1DvcJPWaW/3CFCDU2G+1pRg2Kod8PtXyWDhAATsDEl7pgG0XLAT2wodyb7xiuckkXi4uOhMFyi0HdBCmbHTzvx+rFcHutHugwuqW5uFFNdTeeS4Yhds/CuxYscMK8Hz0NUz4s2NzzeaOmpg== 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=+xS9XTaSu7dJXj6iuB6ISaHcQPesI02Pp05yNF74EHg=; b=ObKzR7xC4vwA/zAr7n7w66JQJqFI6AUl+qJFDZhbqEDfWSKG9qad2ZzRW4rvik095/ZlnStpc5XbI1/0PYeCJCVTvBE5v9RvBxARndtMBkG/OpysGgmwMfmXRohsa+M+tPKdKdHL5xDP4XWNXQfmpep6V47KspQjC44rxi6PTO7WeHFZ5mXcLX6gkw5DtYavW+oo9sdingHfNGMi2tvq3ww21RoJhhWEihaSklnAJsfAtKS2Z29b9rGstUd/9hpp7LY9Evp+4dhoRJB23CjriIBkLoUEfNY4LPApMcpkx/E6LzqWjSEz5xinQ4kKueXF4S3k+ifimjba8SFTGQGJnQ== 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=+xS9XTaSu7dJXj6iuB6ISaHcQPesI02Pp05yNF74EHg=; b=J5KClYMSsGwRIQrCurYFzdPjSch5Gkylbo1AXHsum4FsW7vcw8r2FuemgedJYB+FL/QvOWBSIw2dwOjB5cvm4Q/Km1X0P9huGjxhihbGpCihXPHkGNjSFUmyB7/XgGuZy14Gioc+aOnJZab4mp0KYb82MpsadDeMFgp5vS35itxFaAhx6EqLWt+Lk6ZGxYkQPk04mLmu+VxeGr1pnYdrX0Bt4YnGFj2vX4XhM/1k91gnyGmaKMXf7Xbl3iDhlNYmmhY1sZL9pAGF2kN7Y2FzcTlTpLhrs7fwcNiPfqvhqJRvscz+A4rS0dnoOzpS4TSnSVERJS5dVLJlHleArBwi5g== 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 DU0PR10MB7074.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:421::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.9; Fri, 25 Nov 2022 15:40:43 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2957:50e8:8ce6:124a]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2957:50e8:8ce6:124a%9]) with mapi id 15.20.5857.020; Fri, 25 Nov 2022 15:40:43 +0000 Message-ID: <9bd3bdad-ea34-bbe4-ee94-46e789073ccb@siemens.com> Date: Fri, 25 Nov 2022 16:40:39 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH v3 1/3] Populate base-apt from both DISTRO and HOST_DISTRO download dirs Content-Language: en-US To: Uladzimir Bely , isar-users@googlegroups.com References: <20221125064253.21907-1-ubely@ilbers.de> <2134415.yiUUSuA9gR@home> <1ac6d801-703a-8a1d-9905-2e55e4ea608d@siemens.com> <3531707.aCxCBeP46V@home> From: Jan Kiszka In-Reply-To: <3531707.aCxCBeP46V@home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0127.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:94::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_|DU0PR10MB7074:EE_ X-MS-Office365-Filtering-Correlation-Id: 0592dc9c-3d84-4632-2d62-08dacefb68a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5ydA5qqvS6RYDfXm2dtKMCpgFM53gbprNPNXoRGv2fn9N2PiVM7R1Ozb5lsZTZ+ZPtJiUpm6eQ1DBRw1Lf+CVd1TcCWUnTrHT0w1Z0T67WfS/IGChdZeW3RIv25UqzDjBUxCY3N9hwsduRiLqbxvHOpbO5GA8aYB5fo3h1Fyw5cMziUaH+/hzv+iHKagt7yZDXSN44XgQIwVP9xV4ft0ug4Dc2DlOGHkRyAqX8wADmNKn4ZjqGcQZ1odoj6Qm0latm2hHDkKp699wVlWn3p1QbI4iHZPMqqk2jqPP9kI5B+C1ORNpan2izzy/LfjV6mf20aV1gCUkxTUtmepj+Jl22Ed/SJalxSUkd0G6iJ3Vb+iKPrN0H7TVp3I0LdkC36StBATfPaww/nsG5HNR6B6XuIvu/ZlyN0+Da4aLmB7ut1PLDzN/MyuN0Sz+d7uKld0wsvpYH2TLEe++EFLNhNA0+FTVmJWAlJVMTgLQd6nhEAcd7lBWX8WzLLks4UIx7QHZF/4+IoxnkIuK5dGWE0uplRED+lPMJTpNtadoHWuyYP/yxScjhVmtWIoW0eFhRmUtb6ig1qya8uddm3VtxwfkEyk7YB5wwVzJGSpOtSFm8c3wNaZ3pNQ5A9shpUhGkrinSQsRBz1+5wM0apDIqAS+UMPe+GxcyEkb99OOX96cgwui0s3+psnMMpEYpBNcEjtaFV3PgJWujNfKuvQm0aJPqGYCeKcn/HhgZaaU3mTC0U= 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:(13230022)(4636009)(396003)(39860400002)(376002)(366004)(346002)(136003)(451199015)(38100700002)(36756003)(31696002)(83380400001)(86362001)(82960400001)(6486002)(2906002)(316002)(478600001)(8676002)(31686004)(66556008)(66946007)(2616005)(8936002)(41300700001)(66476007)(5660300002)(44832011)(6506007)(186003)(6666004)(53546011)(26005)(6512007)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OFBuRVcrVGhObmZLY2J4U1BBTEJ4V1lKYlJiNEluQ1g0Vm1uVnFaK1RSQTQ1?= =?utf-8?B?ai81Q0N6VS9ENlZCRyszS2d6UEZsKzR4U2JMU2xRR3FSNEkvS202TmxKdy9O?= =?utf-8?B?OElhMGMvdm9jNnc0dGtUaUdISHZBWU1ybHphNXRObTdiKzkrRERNUGF5Rm1L?= =?utf-8?B?a0thL1gvejNTRlVzM0lEcEZ4aW1HRVdFQ2cycTZtWTR5U3hDVkordU1wWXFX?= =?utf-8?B?NlV2cThjSXd6TEYwOFZuUEFuSXRvOGpFbldmdXhpT3B1bFhvdU5TaStUaEM1?= =?utf-8?B?VERWVnFvVDhXNWY5bGlmZlJzd2lGVlJ4Vkp3R1BhckI0VC80aFd5ZDZ1blBa?= =?utf-8?B?cFFVSThlbHV0M25YM1pWWjJjN2FmVHM0TlphOEtBWGNaR0JuODgzSVh4Y1FM?= =?utf-8?B?MUVZVFF5Z2JUNXlYSzlsbzY3U1d2c1ZCdmVZNVBnZUNZd1dpWXQ2dXIwUzJj?= =?utf-8?B?d2J3UmNJQUZybGlGZi9MRzgzRS8xVkoyRDZFKzNlZS9YM1VYMmR5b1ZHRWZy?= =?utf-8?B?dkVyd2tXOW14MzM2TkZET2Q1Z0lXMzRLVmYybnJWd21uSkVBWFhnNjd4bHFz?= =?utf-8?B?Qis3SXJEaHFacnZkNjV3QzBUbFZHOEpOTjVmcFpXSDdra0RvNUpRZFZMc2Jy?= =?utf-8?B?aERVTzV4cllTQ0hKakVYUzFXUmF0Yy9CbENFNzBuV3VKRXF2UU5YRFl1TFRT?= =?utf-8?B?MkJYeE0wTDQzOVkxbnZDZEo5RzNhNmZYSU0xWHlySnJScVpuMTI3bVVUc1F2?= =?utf-8?B?T2tMZzFLYnNrNDErTXZVeXV1WjUwWGtOMFZjNWJtUmZKc1BWbkpxMXVpMUZv?= =?utf-8?B?dS9JSHpscTZxeEY2dUw1Q3JJN2xhYTNXR2pSM0VXWUcvQWFINEppOXprNXlM?= =?utf-8?B?bnpuQlVadWxsZ3g5SkxiK0ZFUDladzA3U1gxWEpheUN4aW9uNGwzT2dqKzVD?= =?utf-8?B?dGtLNWpaZGthdkR2Vnc0UlRFTTlXSjRRT01Kalp3N0NmcEIyYlZjcE9Qd1Nr?= =?utf-8?B?YnNLUWxjTEpWSnpTQVhxSUsxdFRrMm9ya3dnSytxRkVmeXZnUXI5VTZEUlFX?= =?utf-8?B?UE9ObmlQZ28raGt5eTNPSExNb1BJRDcvRjhnUzZ2UG9ia1RzbjJkTXVwWk9r?= =?utf-8?B?eCtJMGw2U2VRdmZJN1Jsb1JUWVJONHRJd1k3dnRwdnFFOHRYU2tqVUN6Qllo?= =?utf-8?B?WjZZdlJIbXZXaXlWcGJUdW9xR1QwKzlYUXJ4NDUvMW5WR0gvcU41cWt6NTd1?= =?utf-8?B?UG1OcVJwSktCaUNSSDNEYXFjbDlzRTFWWm03QUwvVm5hckFsTzloektRcG81?= =?utf-8?B?RWFyY29Wc0krcmhVWml6d3VRR21TRjFJQ2pTY2V3K0xkd1FDdFZkZHBQdEgw?= =?utf-8?B?bXFlLzdRWUdPTFhWNnp1S0JlNE0wWUh0VG5KZTg5RXpTN2tLZGZwSURiZkZm?= =?utf-8?B?d0E4YmYzVVh0aUpYekJ0WkxTMXpjcmw5bGZMd3RTUklTS2hxcW9objJCekRC?= =?utf-8?B?L0kxNHdnbW1yampPYmIyQ2Rpa2kveENET2NPem05elNQNWo1VXVKWnc3RjlC?= =?utf-8?B?RXBIeXdkQTZlS0dsTExDb0FlbnJPWWtTaTd2SG91QUhGVkVWQyt1TnNaZUkr?= =?utf-8?B?cFA3M2tCS1NzWmhHRmlIWThCZXg3dkEvMVM2clhWbjRFZUxhNHhyYWlJWjZJ?= =?utf-8?B?U1JiUDhGQjB1ZXBTT1puaGVnd0Z0ZlFsUzhWc29VUnZndkl6SjBBdHk0ajNq?= =?utf-8?B?QThROEtiVlpHUzJZMzVQalFnc09IbHNXYmVDSEFrZU00NWYvMURLVlZndDNN?= =?utf-8?B?NWlLb3lJdTVad05iSzZpUVlhZFIySUhFM0U1RGRuSVh1cTZSNkRLN0Q5elVj?= =?utf-8?B?VXJ3QmM2NTB1NDFXNWoxdkFwd01Kb08rVzU4MlRqTlA2N1h4K2NTUVd5RktF?= =?utf-8?B?enZuMEsyVTJocysxaDlJNmpNSzQ3OWU2RTZWc3A1UGtNbkZkN0hZY1V5OXcz?= =?utf-8?B?ajZyQ0ljNnBOb0RCUjl6cy9JcG15UnhNR29pZGN2TTMyK1l5dHIzQ3IvZC9u?= =?utf-8?B?c2lYay9hVTVUck5tcHloWXFQT3U4M0hSRHcrSGhiYkFxUlZHbm5NbW5URm1H?= =?utf-8?B?c2dIVDNoYk9Rd2tnMURLTjc2WnRzOG01OEM3TnFpekE3ZC9BZlZReVNybTNh?= =?utf-8?B?cHc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0592dc9c-3d84-4632-2d62-08dacefb68a1 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2022 15:40:43.1050 (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: VSANxlxCSXkXm6wFqtkAyB6cquoWZkgDXJTQpxOWD88DX3z9zWQHl7u2wExnrd3w2FLQ6H7qdaACchJH/yjdCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB7074 X-TUID: UL/2ynlJHsjJ On 25.11.22 15:48, Uladzimir Bely wrote: > In the email from Friday, 25 November 2022 17:11:26 +03 user Jan Kiszka wrote: >> On 25.11.22 08:56, Uladzimir Bely wrote: >>> In the email from Friday, 25 November 2022 10:42:00 +03 user Jan Kiszka > wrote: >>>> On 25.11.22 07:42, Uladzimir Bely wrote: >>>>> Downstreams may want to change DISTRO to some custom value. >>>>> When cross-building, this leads to downloading packages for host >>>>> and target distros to the different download subdirs. >>>>> >>>>> While base-apt is populated only from DISTRO download subdir, >>>>> second cached (ISAR_USE_CACHED_BASE_REPO = "1") build fails due to >>>>> missing packages in base-apt. >>>>> >>>>> The similar issue happens with cross-building raspberry targets >>>>> since they use their own mirrors and DISTRO. >>>>> >>>>> Fix the issue by splitting base-apt by introducing BASE_HOST_DISTRO >>>>> variable that is used instead of BASE_DISTRO for caching builds >>>>> for host-related components (e.g., isar-bootstrap, buildchroot-host, >>>>> sbuild-chroot-host). Target components still use BASE_DISTRO. >>>>> >>>>> Signed-off-by: Uladzimir Bely >>>>> --- >>>>> >>>>> meta-isar/conf/distro/raspbian-stretch.conf | 2 + >>>>> meta-isar/conf/distro/raspios-bullseye.conf | 2 + >>>>> meta-isar/conf/distro/ubuntu-focal.conf | 2 + >>>>> meta/conf/distro/debian-common.conf | 2 + >>>>> .../isar-bootstrap/isar-bootstrap.inc | 9 +++- >>>>> meta/recipes-devtools/base-apt/base-apt.bb | 47 ++++++++++--------- >>>>> 6 files changed, 40 insertions(+), 24 deletions(-) >>>>> >>>>> diff --git a/meta-isar/conf/distro/raspbian-stretch.conf >>>>> b/meta-isar/conf/distro/raspbian-stretch.conf index c8f523b3..66d965c9 >>>>> 100644 >>>>> --- a/meta-isar/conf/distro/raspbian-stretch.conf >>>>> +++ b/meta-isar/conf/distro/raspbian-stretch.conf >>>>> @@ -6,6 +6,8 @@ >>>>> >>>>> BASE_DISTRO = "raspbian" >>>>> BASE_DISTRO_CODENAME = "stretch" >>>>> >>>>> +BASE_HOST_DISTRO = "debian" >>>> >>>> Better prefix it with HOST, to be consistent: >>>> >>>> HOST_BASE_DISTRO >>> >>> Not a problem, if you think it would be better. >>> >>>>> + >>>>> >>>>> HOST_DISTRO ?= "debian-stretch" >>>>> HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list" >>>>> >>>>> diff --git a/meta-isar/conf/distro/raspios-bullseye.conf >>>>> b/meta-isar/conf/distro/raspios-bullseye.conf index 5e4a09c9..7bd81dd6 >>>>> 100644 >>>>> --- a/meta-isar/conf/distro/raspios-bullseye.conf >>>>> +++ b/meta-isar/conf/distro/raspios-bullseye.conf >>>>> @@ -6,6 +6,8 @@ >>>>> >>>>> BASE_DISTRO = "raspios" >>>>> BASE_DISTRO_arm64 = "debian" >>>>> >>>>> +BASE_HOST_DISTRO ?= "debian" >>>>> + >>>>> >>>>> BASE_DISTRO_CODENAME = "bullseye" >>>>> HOST_DISTRO ?= "debian-bullseye" >>>>> HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list" >>>>> >>>>> diff --git a/meta-isar/conf/distro/ubuntu-focal.conf >>>>> b/meta-isar/conf/distro/ubuntu-focal.conf index 379b5b30..75da79a1 >>>>> 100644 >>>>> --- a/meta-isar/conf/distro/ubuntu-focal.conf >>>>> +++ b/meta-isar/conf/distro/ubuntu-focal.conf >>>>> @@ -8,6 +8,8 @@ require conf/distro/debian-common.conf >>>>> >>>>> BASE_DISTRO = "ubuntu" >>>>> BASE_DISTRO_CODENAME = "focal" >>>>> >>>>> +BASE_HOST_DISTRO = "${BASE_DISTRO}" >>>>> + >>>>> >>>>> DISTRO_APT_SOURCES_arm64 ?= >>>>> "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list" >>>>> HOST_DISTRO_APT_SOURCES_arm64 ?= "conf/distro/${HOST_DISTRO}.list >>>>> conf/distro/${HOST_DISTRO}-ports.list"> >>>>> >>>>> diff --git a/meta/conf/distro/debian-common.conf >>>>> b/meta/conf/distro/debian-common.conf index c18eebc2..d7a13f4b 100644 >>>>> --- a/meta/conf/distro/debian-common.conf >>>>> +++ b/meta/conf/distro/debian-common.conf >>>>> @@ -5,6 +5,8 @@ >>>>> >>>>> BASE_DISTRO = "debian" >>>>> >>>>> +BASE_HOST_DISTRO ?= "${BASE_DISTRO}" >>>>> + >>>>> >>>>> HOST_DISTRO_APT_SOURCES ?= "conf/distro/${HOST_DISTRO}.list" >>>>> DISTRO_APT_SOURCES ?= >>>>> "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}.list"> >>>>> >>>>> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc >>>>> b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc index >>>>> f32d192e..2ee0d4cc 100644 >>>>> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc >>>>> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc >>>>> @@ -29,6 +29,7 @@ DISTRO_BOOTSTRAP_BASE_PACKAGES_append_gnupg = ",gnupg" >>>>> >>>>> DISTRO_BOOTSTRAP_BASE_PACKAGES_append_https-support = >>>>> "${@https_support(d)}" DISTRO_VARS_PREFIX ?= "${@'HOST_' if >>>>> d.getVar('BOOTSTRAP_FOR_HOST') == '1' else ''}" BOOTSTRAP_DISTRO = >>>>> "${@d.getVar('HOST_DISTRO' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' >>>>> else >>>>> 'DISTRO')}"> >>>>> >>>>> +BOOTSTRAP_BASE_DISTRO = "${@d.getVar('BASE_HOST_DISTRO' if >>>>> d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'BASE_DISTRO')}"> >>>>> >>>>> FILESEXTRAPATHS_append = ":${BBPATH}" >>>>> >>>>> inherit deb-dl-dir >>>>> >>>>> @@ -111,7 +112,7 @@ def get_apt_source_mirror(d, aptsources_entry_list): >>>>> import re >>>>> >>>>> if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')): >>>>> - premirrors = "\S* file://${REPO_BASE_DIR}/${BASE_DISTRO}\n" >>>>> + premirrors = "\S* >>>>> file://${REPO_BASE_DIR}/${BOOTSTRAP_BASE_DISTRO}\n"> >>>>> >>>>> else: >>>>> premirrors = d.getVar('DISTRO_APT_PREMIRRORS', True) or "" >>>>> >>>>> mirror_list = [entry.split() >>>>> >>>>> @@ -319,11 +320,15 @@ do_bootstrap() { >>>>> >>>>> "${ROOTFSDIR}/etc/apt/preferences.d/bootstrap" >>>>> >>>>> mkdir -p "${ROOTFSDIR}/etc/apt/sources.list.d" >>>>> if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then >>>>> >>>>> - line="file:///base-apt/${BASE_DISTRO} >>>>> ${BASE_DISTRO_CODENAME} >>>>> main" + line="file:///base-apt/${BOOTSTRAP_BASE_DISTRO} >>>>> ${BASE_DISTRO_CODENAME} main"> >>>>> >>>>> if [ -z "${BASE_REPO_KEY}" ]; then >>>>> >>>>> line="[trusted=yes] ${line}" >>>>> >>>>> fi >>>>> echo "deb ${line}" > >>>>> "${ROOTFSDIR}/etc/apt/sources.list.d/base-apt.list" >>>>> >>>>> + line="file:///base-apt/${BASE_DISTRO} >>>>> ${BASE_DISTRO_CODENAME} >>>>> main" >>>> >>>> Won't this cause duplicate lines (with complaints of apt) in case of >>>> BOOTSTRAP_BASE_DISTRO == BASE_DISTRO? >>> >>> No, while I don't add new lines (no new "echo"s). I just modify "deb-src" >>> line while it should point to BASE_DISTRO even for host case. Without it, >>> there was a problem with "hello" (apt_fetch failed to download cached >>> sources from "host" repo, while sources were cached in "target" one. >>> >>> That's how it looks now: >>> | $ cat isar-bootstrap-target/1.0-r0/rootfs/etc/apt/sources.list.d/base- >>> >>> apt.list >>> >>> | deb [trusted=yes] file:///base-apt/raspios bullseye main >>> | deb-src [trusted=yes] file:///base-apt/raspios bullseye main >>> | $ cat >>> | isar-bootstrap-host/1.0-r0/rootfs/etc/apt/sources.list.d/base-apt.list >>> | deb [trusted=yes] file:///base-apt/debian bullseye main >>> | deb-src [trusted=yes] file:///base-apt/raspios bullseye main >> >> Indeed, I misintepreted the code. >> >> But I think we still have an issue on the deb-src population side: >> >> # ls build/downloads/deb-src/ >> iot2050-debian >> >> And that was with this patch applied. >> >> Jan > > Actually, I checked the case with the following configuration: > > distro: my-debian > local_conf_header: > nodebian: | > require conf/distro/debian-bullseye.conf > DISTRO_NAME = "My Debian System" > > So, I simulated renaming distro that is done in meta-iot2050. > > Cached build was OK, "hello" package (that we build from sources) was > downloaded at first build to "my-debian" directory: > > | $ ls build/downloads/deb-src/my-debian/hello/ > | hello_2.10-2.debian.tar.xz hello_2.10-2.dsc hello_2.10.orig.tar.gz > > and second build picked the files with no problem. > > The same with "raspios-bullseye" target - "hello" sources are downloaded to > the "target" dir: > > | $ ls build/downloads/deb-src/raspios-bullseye/hello/ > | hello_2.10-2.debian.tar.xz hello_2.10-2.dsc hello_2.10.orig.tar.gz > > I even tested the case with BASE_REPO_FEATURES += "cache-deb-src" and it was > OK (honestly, I don't know who could require cached build with this option > enabled :) ). > > Anyway, I'll also try to check my changes with meta-iot2050 layer also > (despite some packages in it are currently not compatible with BB_NO_NETWORK > option) Please then test without the coral packages, they have an own issue /wrt offline builds. Thanks, Jan -- Siemens AG, Technology Competence Center Embedded Linux