From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7169469243442855936 X-Received: by 2002:a5d:59c5:0:b0:241:e4cf:30d9 with SMTP id v5-20020a5d59c5000000b00241e4cf30d9mr2382890wry.186.1669575963591; Sun, 27 Nov 2022 11:06:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:644f:0:b0:225:6559:3374 with SMTP id d15-20020a5d644f000000b0022565593374ls8133689wrw.2.-pod-prod-gmail; Sun, 27 Nov 2022 11:06:02 -0800 (PST) X-Google-Smtp-Source: AA0mqf4xcE0HIKw/xEpivS9tng0DhbQ5dTgywRq52rgIHZwsBoo9qygfgarOb9nfs9UMj5WJRV3L X-Received: by 2002:a5d:52d0:0:b0:241:c340:d1ea with SMTP id r16-20020a5d52d0000000b00241c340d1eamr22392384wrv.434.1669575962192; Sun, 27 Nov 2022 11:06:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669575962; cv=pass; d=google.com; s=arc-20160816; b=0iuXAkYi55Z1AcSrOtSeeVl3D6z7tzvs49LLoyrujQZMR20jvH4PtJpGG756drMGE3 F4u0X6iIc77OlpwfmgQckxYayHkST3AYJ/H21AgT4+FqVlWi2U2mVbS9iG0M2kc3y+jJ OBofggUjXTCYCsCkQ1cSe/qetMkywBETnJ4bTfLnDsb01ZRMarCNPo2MlFwtC0wgU3+e Kb7XJnreuPZXPPrptaFTcCvtTY2IQ/QtiKlx32+0cropa09/1eOlgWCynwrapbxMEdVJ 22VpUWlMxs5ZSUQrMmSO/160MiqBpHho1Jlrv3hNRgBVAIUllb0+GOjLw0dJZFqFTpn+ kbKg== 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=d1SaDl0NhgXT/SqLpBb+WHGXtj5u6h8pOoRhTXyN/QY=; b=dQJEqIMuN1UjDVRI7lRW7U3LYjJ06WYYJhJOtx679PcrVNL4tjoYW6v0iUP/PQ27tX MP7nHOX/V2GWyHsJejstCchMruzpQAbbq5RfaQ3ZJNZICQmPbmJhqkbRXd8Hl2Fx5P+J 7cKUqViclvYOPPxCoE43NX/K3GxM1AEW/c5ZgcPOyavDw9JXdjOHkM6cHD6msY/HO+ip /oifRzAxALMLrKHi44VMy/nxAWXeOCx6mR3nCI1iMHSAg8VzcxX2aNGUrYMsTqUj6IRh N267cIiRD6lEXGrwA7jYjhRblu2UgeDPURybC2/7g6pEsCIQXlcqmY3iZpPfZelaiYWj kDvA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="mOh+3d/V"; 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:fe0d::60c 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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on060c.outbound.protection.outlook.com. [2a01:111:f400:fe0d::60c]) by gmr-mx.google.com with ESMTPS id v6-20020a1cf706000000b003c4ecff4e2bsi520092wmh.1.2022.11.27.11.06.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Nov 2022 11:06:02 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0d::60c as permitted sender) client-ip=2a01:111:f400:fe0d::60c; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b="mOh+3d/V"; 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:fe0d::60c 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=kPc7okUOX3UOcoyJEEoS4sBq+bmq6AXZekKka/Z/Ecu7zlJpMF3yDvnInOUJzKZCt6sZMYKs/GX9rbZL1vHaWj6tgeZ3RD2c8pReFsBP5H3dJ7I1s4M0yZ7pcN6O3AJtD33LNhHWxnfaLGV3UsbGBpSDEyUt7wZGN7LuLOo5V5C6zGTRE4JqlNprrfia5xYYw5jRJxj+LmZTNny+HH9ukJfNWWYEe9CSzMps4ZyNPZVkhshMvNd1XTvc5HswCFjoRIzWz8l2gAdqicEput1xSzVaDbUaRqGZ9joH8xibJOCw/9vaJYalnssVH/+G1zg7HWBXQY2t9Y6pf3FxadygxA== 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=d1SaDl0NhgXT/SqLpBb+WHGXtj5u6h8pOoRhTXyN/QY=; b=IaQlQ5x7MfDtBWORimHBDOe2AxRi0wrhnNeC+SqOmfoexDMxViPi2uoJ5xwAV9JFxH5JPcExtK/DptKBagyigeB4J9juYg7sCttGXb2POvqSjEKAT9KJvp9YHk6gxrdAPjs08HomViRY0c+o/HLhYdDu30UhO12nEdZUiT0rvTq21sz1NGJiYUclTZIi/EeHCnRzUazb1YD+Ss/dOEsB0rdtSRJI3MggS5B6ZGt8SfOgLnqPAz0vS0hUr+kjr7ELMC3rKvzYuX1hp7lTlEsa2R+PAEU3fPk4Z5EdrN7Oc/UyVbqmlhDJT73pDjKfmu7UN9NS3mLhqaytPxanGxE7CQ== 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=d1SaDl0NhgXT/SqLpBb+WHGXtj5u6h8pOoRhTXyN/QY=; b=mOh+3d/VprzTiZs58pAnAxXqLha2ZwzTuKqBOfN1kwu303J1AyefsTjmGJD08rgK1VoYZj5zGc+XRnCwLL6ZkouUggddRU/FOiD/8plCA5U71QXP5ZPCftnQNjb3XsEGaiKIb50nluFjXng2SOx/FwBMuT80z3AMEtyQuQFhNtlxN23K4/JDSNOqFc9Nrfn8qn5jyI/8rM24ewm+1Y90BvGbuePBITvGl8LYaulhY2fREXvbLl8wjop675u6v1MHrMnVIZFHkvoqnHjcZ/SFp3KXJuQ4Lx48Aqcyi3lIMqli4bxZ1YHhZx+woO9IyJSZx2BDchHCb4j70T+1pxQ4fg== 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 AS8PR10MB5952.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:52f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.21; Sun, 27 Nov 2022 19:05:56 +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.022; Sun, 27 Nov 2022 19:05:56 +0000 Message-ID: Date: Sun, 27 Nov 2022 20:05:53 +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> <3531707.aCxCBeP46V@home> <9bd3bdad-ea34-bbe4-ee94-46e789073ccb@siemens.com> <6502643.MDQidcC6GM@home> From: Jan Kiszka In-Reply-To: <6502643.MDQidcC6GM@home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR3P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::9) 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_|AS8PR10MB5952:EE_ X-MS-Office365-Filtering-Correlation-Id: 4afd53b8-773a-4e3d-b08c-08dad0aa698a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O38mFVCeNeL3yQOETr5N8yUO/l7yJhPimaq8Xwj4MWKOu2tICGlo/6jSXY2JYRsZ0HMemKEMUUIV92Vgf0Mv2ks8wOD5oNSzh7dq1FWlFUjsZrMLRVTA5vMOYNKnw3zhss125337BQ3GkuEgHNpcOTAT0ayXUsLaol7c+Nx/EFFgUTQJ97f9Dm04jcBbGnnYmbQnaz/KHORgcaLZtFS45RjqHXW9yaAv+3mtc9p1buVicygM7ck93uOB9VyHZknxktw+E3vVeNCOPL23Imn3Ldmng0XmCR1pO5QF3rHDcLlY8qffJT/+AN+I/w/fN/JN0O3uBdrPvumwlOXvbvs4x7C4rXH704nxH5+ZASbMPEvtWuXAAfnXSUKb7AXeLYs4PCmugqjXWMNZOEZQxYQZ3mMK19EUjTLgon+Av61Y+0lV9JFZ7AvvBRa9oChqYJZcgrK4i3r04Yz6suR3FADDIUbfO+dOphMz+baF4aETAALhEIWD1wovZGJdJe/zkfUgmMdJVemfj7anXiiGPzYpC5tthfpSSs8iZEnY74EKx58mFhd2smB9fgIlDQ2kZZTKP3GrFrxQxBCjEhjvUISWZae37DkTkoqvnj6YGEJ//0TYxiEZPRS8ZFw8t0Fd0mch4fqjZlti9F0JpqIQ2HUk7orSO1QiwREW0HZcwr0rpFMGpL7cV53uvgtu4u99BhWNobqGnseKiLIyqMVCnS/Cn13InUSdOyFVcczPvJa6OQo= 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)(376002)(39860400002)(346002)(366004)(136003)(451199015)(8936002)(83380400001)(82960400001)(38100700002)(2906002)(41300700001)(5660300002)(8676002)(44832011)(26005)(6506007)(478600001)(316002)(2616005)(186003)(53546011)(66556008)(66476007)(6666004)(66946007)(6486002)(6512007)(31686004)(36756003)(31696002)(86362001)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TkZVYXIvYTFYM2dIN3V4UWNkUEd5cUZwaGsrcHhlUWNoTGFkSnVIUUJvdkRM?= =?utf-8?B?OWE4N0l4SndKR3JETGREdkNvTkFaSXl4d0ZhOHdWTVRwN21mQldGT04vR0FF?= =?utf-8?B?Nnd3WWdLS25kRnBsQ1YzaUlna3J4VlFtelkzZ3JaTm5aMWZKVU9SbFAxekpE?= =?utf-8?B?NFhlRzNtUHdYZkt6dldXOWU4ZlBMU3BuR09ObU05RWRYb2RsVWdNSDVwTXMx?= =?utf-8?B?U3Vsenl6TFdQYlhzSUUySlNWcFhTSTVjendybWplMHhqai90VmlLNzU0OVFm?= =?utf-8?B?eVFJQjBiZUZtSk01eVJqZFNIR2tiTlJlVHlLT09zRjRWYzJhZHRFODJ3VHhD?= =?utf-8?B?UmFCNjJONDhDTnRHNGxqQmpocjJkcStlZjdLOHJsSVUycXdIa1dPL2FlMlJT?= =?utf-8?B?Smd6czlUSHhXdldFOVczZkJ5RzRVY3ppVmxOWHpxWE1FMWtjWUtlWHUyelR6?= =?utf-8?B?VXhCcUlmWTdERFh6ZDkvNkxsc0FJUEtTdFo1NTIzRWtmNTEyK0d2aGtUWlVB?= =?utf-8?B?VlY5Wml4QXh2cThFMVZPb2x0VTcyWnR2OUFrRXZyN3NiTXBJVFBRb1dHZGFE?= =?utf-8?B?dWZwWm5lbTB3dmlJZ3ZPNTNNYW1PTHVrZnk3a2NDaHF5TWtRQ0x1RUlwVTl0?= =?utf-8?B?enkyUThPZ2JtNnRVREJRbHJ6Y0pWS0F3WkZxYkZuK0hobTA2a2Y4NmxyN3hJ?= =?utf-8?B?QlNsRis1U3hFY3l3aTMzRGFvMS8vV3c3SU15cVBRSVNyUlhGVDE2dytpYjRQ?= =?utf-8?B?QzFSd3NkYkU3cXpRNUM5QnJueXYvWmtrMGkzM1l4QUZPVXBIMWcyUG1rVS9B?= =?utf-8?B?SHUvb2QvdlhEaUQxSUxLV2dWcTVuaXI3OGRKWE5MUmVJQi9EcmY4R1RqZUJF?= =?utf-8?B?ZlYrZElEYkJvUXhsTEpleHVVM3RZUTVJLzB3SkkrY0VwdS8yaldlK1RVQ0FD?= =?utf-8?B?dVVOaXpscUx1dVh3L3lhSi9HWWJlYVlMVm5uaWFKdGRXOTVnNkh4eU43ckhy?= =?utf-8?B?bjc1Y1hrdmkxaUhoczQ5NzdoeXlQMDRadDFQT3dxZUJrT054bnQzYzJQcWFB?= =?utf-8?B?bDdxU3dHaXlYWXdSbldVMlhUZmpMZ2hRNTRFWDcwMEsxWUt1bHJZRk8wL1V0?= =?utf-8?B?TG1HaUhvRmVJckNuWWFnNHFWelc0N0dNNytpMVRkYk1iYmw1d3lOL29XWXFG?= =?utf-8?B?RWdJWWpadkg3WjNZUVAyZk9KVGdVUlNBVGN3YVJicGJiNlRrNUthUkI4L2JK?= =?utf-8?B?ZmYyODgwYTNrdWltU2F1eUVYVndKQjhHV29LRjhuMHo2alhzNGlsQ1JES0VO?= =?utf-8?B?WU91M2xrdTVjNU9FOXBsb3BDMXJ6SGVUVzVLZW1hNFRUK3VQdTVZVEY2ZlU4?= =?utf-8?B?T05lRnJUY1ZnYmpwZlJ5L3d5Q3MzMWVXOHoweVZaRENFMUwrYmp6M1paOTZk?= =?utf-8?B?Sm5vYUtKcjQ0OWZYUWhYOUxVWlhrdDFGQzFuaExHRjNxSWp3aElDYng3czFo?= =?utf-8?B?ajF1U3ZXcFkyNjJncDRlSHRyTlNKZmpVcHRkUnZuQ0IwalprV0svc0U5MndF?= =?utf-8?B?aS8yWjAyZE44RGgwRXlEQkdsd2VneEgybEVRWDJaUktLaHA4MTJXZFBpWVdN?= =?utf-8?B?TU5lTjFCR003YWhmOTk4eVFrSDhUZHkwTHUwemVoYjlEYUc4K2swRk0wWm1p?= =?utf-8?B?SVV4SGZQOUwxZnV2OWJCSFN0TDZ3SnI3YjBpTVovNytTaCtHek1VQkxQRWN4?= =?utf-8?B?WTVWWmpkMExxUjNXOTRmRWEyRC82SHMweW1XeDY0T3c5ZTRNRHA1VXFnSnox?= =?utf-8?B?TDB4QXR4S2dPZUZ3VkgxUWtleWxROUloZlRoUUpZbzE4Z1VIY2kvRDJUV3lP?= =?utf-8?B?UC9aazVMTU5HRi85Qy9vZTh6bi9TRVdvbURRVXdhTkhXc1poVXVKU2lpRWJ4?= =?utf-8?B?c3JrMk9XcWRFM041YTNpSFpMK2t0MDNqS3dTcjlaZDZRaHBSMEhxdEFTczZV?= =?utf-8?B?ODFiVVFqV21UclZKRHJDZCtHdEhId1luUTVsOTl5cnNsd29Ca1oweWpNZmZp?= =?utf-8?B?c3dOcnpyajFtRS91T1l4Y1Bxcks5bFN2bHJkeFE2TjI3aUFuVFU3VDdNdk9t?= =?utf-8?B?bWw4cXRQQVpZaUh5UnE3NnhCNysvYThFemNpRkxIbmJ5bCtFMmIxUWI2NjNI?= =?utf-8?B?Umc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4afd53b8-773a-4e3d-b08c-08dad0aa698a X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2022 19:05:56.3185 (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: PtqUZmWzMmq8ypPQOX2zi8TzAJrVHV8XjPqWB78F9QKDq0OW3MZX627o/lul3fB2c9enkeBeHZ7NAsOX3m0NCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB5952 X-TUID: P6kXwp0iylem On 26.11.22 06:30, Uladzimir Bely wrote: > In the email from Friday, 25 November 2022 18:40:39 +03 user Jan Kiszka wrote: >> 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/bootstra >>>>>>> p" >>>>>>> >>>>>>> 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. > > Checked the patchset with `IOT2050_CORAL_SUPPORT = "0"` and it works > ...but it caches to the wrong downloads/deb-src path, no? Jan -- Siemens AG, Technology Competence Center Embedded Linux