From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7169469243442855936 X-Received: by 2002:a05:600c:468c:b0:3cf:7c81:caae with SMTP id p12-20020a05600c468c00b003cf7c81caaemr31150335wmo.135.1669635954476; Mon, 28 Nov 2022 03:45:54 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:644f:0:b0:225:6559:3374 with SMTP id d15-20020a5d644f000000b0022565593374ls11011350wrw.2.-pod-prod-gmail; Mon, 28 Nov 2022 03:45:53 -0800 (PST) X-Google-Smtp-Source: AA0mqf4D8llQMvEvgkocD+QXuwPl2KVyjG4+RJKX3mgm1Jd1IMBW28tJRsvkCYECl9wRHSqj1Rqt X-Received: by 2002:a5d:63d2:0:b0:236:5102:bd4c with SMTP id c18-20020a5d63d2000000b002365102bd4cmr30239988wrw.415.1669635953142; Mon, 28 Nov 2022 03:45:53 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669635953; cv=pass; d=google.com; s=arc-20160816; b=qma17bu0MwND/xWnVeuhCW/hgwmI+NH8F+zraj1rg3ecM5NsexdrZtmZMeYh5zMP0/ wHn/ZtebuYVAguETt5BCmTA9iQG+xGjE8Hbovi8hQbCFORQNlsuYN/wY6mp6MBE+O3XO bfbQCdqCQ86sZaXIR1caSszWo+7jQ5GAFtYfBKvgVTl696NKc0XyGoHX1CQjQQmz3a0Q YCkGksJ/98njmbWdqc1sGJal7eqnOF+RJcTV+YYM82PTdIYhVpNq1q8fqXoRcusoG9IR KXsI9ObFXR+9L+ie6eHGNnedrL3WWhUhVuI0STRsZ9TNQ1ztjSw+ex3Tl5tk8qMjGlXy PeFA== 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=LBklCdRZxD2s2KtzkM9JNjjMq3CTKFB/MGvVTxPIkDU=; b=Ld80xCw2UcYlPIqJ8rBqCu8nIJoh2L97ElHw1cn1cJIWWOfagUPxf7EVcp66RylIHj XOjJQm92EJx4hYjY8xqN5MkGYofcMM1b5AAE78zJBR6w4nweuPsF9QQi+zVK9tFRGoz+ HddlJh8S4ZtD6AbVo1UZstaKwzJBQmCFJQyCgLxvOBuNz1v1tbd77uFlfbuhT+wbhhWF kUBpU80Rq8Xj7sPJnmrLX45kJZapvsnkOsFzOhEmDPJoXYATYIjoADeEd5icKViTeq1b Mzr7WGFD9WpWUu5z+GWrU4K8ly7QYrvPRrSMexClXmSFP7tHQvfWg8euHcE52OqblYH9 sFXQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZsF13tGx; 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:fe0e::611 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0611.outbound.protection.outlook.com. [2a01:111:f400:fe0e::611]) by gmr-mx.google.com with ESMTPS id v6-20020a1cf706000000b003c4ecff4e2bsi614230wmh.1.2022.11.28.03.45.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2022 03:45:53 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::611 as permitted sender) client-ip=2a01:111:f400:fe0e::611; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=ZsF13tGx; 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:fe0e::611 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=HZrAt+r8229b7UbG+HQ6JLBIrpFHtWaFGU35+Memnf/ongilTzfMO3ll5pSGLzVC7nzAjH1by6hKc0LmxJlkGbOf8HprEYgzw86k8t70sXdnFmKpFCXj3uOuQRuP7rELod/AzIzBDmNxFE/DAjE3p+0N49RnCQHlqCwVCTiMISyCeUz9AdI28cLZhqBlp5bUZVD2f+gqmSIFMo2Eh0Qr4xXtoJhb5wALUwLzQVE3LYJ2JuUsY+xO5CK5TvMwJfcjf1KfwNkNLRCIgTFfMp3H/nL0vh5a4rXzQ931CRHrJt2ijiCm6Wps8WYJDQGOS9lXkhesgwhEtnWxq6u/CtDZTw== 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=LBklCdRZxD2s2KtzkM9JNjjMq3CTKFB/MGvVTxPIkDU=; b=a4mM8NJBK/SIwbwHLwSdXOtk1DzOlQ6CmdC8eMzJ0F1HthA0yxroT3IXqLsLgED++FwXYbw9tf9QVDlOE610yoPUcngJeg9nGjUUJSpcaeNAGJ/bbydG0ez/5clP1zxIyEVf8LcknWjymYtuTbuuLJp35EcAZ07eIgW2s7nXC0V9QrgLK5lSAOnlaKpqHXhZLSWvlJil5ZoIrcbayS+4alPqIIIDR8rfEbRRqajlMXEN0Tufa0K3LqqezzFgSdSkUB5jLIM9p0PNRbakT8NTtueu5b5UpvYL4XKePhLXrhKahWmtocSKhHzASRP0WwVC75S10eOM+QbL01HCno1PNw== 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=LBklCdRZxD2s2KtzkM9JNjjMq3CTKFB/MGvVTxPIkDU=; b=ZsF13tGxgi60vhcEimiVw1ktCBcjlGHNE6SMtBqgPqiy4ym+JgOt3X5d8+6pvzmXf+XSPz4GPCqEyKRYWEY5nnmuu9gp800WYFnbZ4Ly+HqiaozI0dEMfahVwhnZ03aN48ph04jlmtAIIWzqIauABzHn3x4UfydwuIDeLQqVV6HVAboBmdfI/klHa5CzcF+C7ftLRKFPgJ7Bb9+G8U5Y1R2gFrioky3n9qpqgAdBmdrcHK8g2G22Sr+UVoJ8WVL5TyRleT+jKVPU7ggHBsPB1w6ru/8tkntCZW+hfqk123rBAa0PNRxVCZ30UKghu4KFRP0ZY20ikHrudOmVG91Tng== 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 PRAPR10MB5154.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:29c::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.23; Mon, 28 Nov 2022 11:45:51 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2957:50e8:8ce6:124a]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::2957:50e8:8ce6:124a%8]) with mapi id 15.20.5857.023; Mon, 28 Nov 2022 11:45:51 +0000 Message-ID: Date: Mon, 28 Nov 2022 12:45:40 +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> <3464852.dWV9SEqChM@home> <9441047.eNJFYEL58v@home> From: Jan Kiszka In-Reply-To: <9441047.eNJFYEL58v@home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: CH2PR18CA0058.namprd18.prod.outlook.com (2603:10b6:610:55::38) 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_|PRAPR10MB5154:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ecb0cdf-b22b-4b3e-62e4-08dad13619ca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: z/+FLtbQNrKHnDdrNRc6T1PwivbgPx3mk82EZRPkw93adkbFd9dhmBUf/vMVkSbJZYQR+tVbN1thNiqhNgfomJimvsEocOJghrDCShLfznuFU66dVjdNPobNe8W/s19/yDI+tf7g2bgypqcWwvZXHT0SpsuO/7iRnjD01jQJ0OJUVDHN/Y6psJUqhYgahcFfCYXS0anRRfifBROTPrf6ya4J4lZtueeAonAiAoziw00lgxrs8SC0TGmhn6+PPYlewExbaUpJUnxiFZ5kyAJ2CmWHM7JwDUkQVY7Sww8yn+zTZ0V4CF7VrZ+G/YpCweOPbtH2BA5S4nd0dnyWSIVbRQbD+l21dzlY6TecKiQiTcr2upHJ/b/CxfoFBGO28waVoNL9z2aHBTzi85KLyoy0f3fBRAymzSH3v3DGppuFR7CA4NigrR0I/zTB5d/SZGw9V1wLN85avxwp6S2ZIk0fy57tFXkEjymdyXV772yQGDW9VYvltPnjSiZhc0GFSDRgebTAaUtc1Vz3b8KcGRzk3II8gwd7aNiHldDwl6Z0MGTnUK93utJYYoABPX5UHULLoOTLZJiOFa+foz3+zd/ZP401yQ8p8sqUwbkvR2CBdFV0gbdwfVvfU1lCPHaa2ydFb62GudXRVftyJbIAg5rE4HLYaJ+0DWNa4IJuBjwgmU+KA4zUqDTfbtrSd2rEPgvuZh0KTnb32vOuaeY1087WbG9ERQAFklcxWEVvEylxyH0= 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)(39860400002)(346002)(366004)(136003)(396003)(376002)(451199015)(82960400001)(38100700002)(316002)(6486002)(478600001)(41300700001)(8936002)(30864003)(83380400001)(6512007)(2616005)(26005)(2906002)(186003)(66556008)(8676002)(66476007)(31686004)(31696002)(86362001)(53546011)(44832011)(66946007)(36756003)(6506007)(6666004)(5660300002)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R2hOUzZOV2IyMExCZVJ4WllpMVFrNERnV3BUNXhUQWV0blh2anVINkF5Ykk4?= =?utf-8?B?QlE4YnRhNGt4Zm91ZkZlUzhrVm5pT0Q0SXV0SjFnVktZNk1kQVU3L0liQ0tV?= =?utf-8?B?d3I3ZEFWZUxwajJ5OG93NFdYa2tOK1RlRnNEb3lzQVZ2bkxOZ0w0RzhrTHJV?= =?utf-8?B?bWJ2R2FEYjFJU3lUTGJNb3NHbEJzeTl2SmdIRGZtd3JodVJsaXZoenJDRUZy?= =?utf-8?B?TnViMjhDQWgra1lMYzk3Mm9PSWFOdTd4RFdicGplV2RFSTR2R01hWHVEQ0tP?= =?utf-8?B?eG1tdytSU3h6a3lNZEFGckUreUNia1UyUEZZS2ExZDBPbXlLUnJqaUxPTCtm?= =?utf-8?B?L3AzbUJQV1RzTWs1emVQY1pjMllWeU1ia21QcHBTQVdYMDMxdmIvRW0xNWxj?= =?utf-8?B?OEFsbDVRVzJ1cDJHMGRiTjMvMUxrckdVK2I2S2l4TFFMUFF5VVkvVnRES2p5?= =?utf-8?B?elh3MU1jQ3BNR0JZV2VxRVNIUitzMzVuNHpSSkJ1NmxhQzZYcTBMQ3VQVTRD?= =?utf-8?B?cEZCU0tDNHo2bHRpcFZVQmxaZkFSM2hYQjJpMWJoYmtkelVtN3luN0J1eU9m?= =?utf-8?B?K0pQRjRRb3lkbjA0aXljeUtxVlZxaUF1Zi9CSUZqNVVjR2lqWGJQRVFnODlI?= =?utf-8?B?eVN5WEJTWng1NFBVclNlbjJsRlFtc0J2OXBVczhjQWVRRnhUQ2w3akdnWmhr?= =?utf-8?B?d3pDWVQ1ODRiU0ZmS1plYTdWcG1XV09xdmlXbWJPcC9WMXdDcTRBbTQwOWpL?= =?utf-8?B?UU9kaGxUTkpoeFJLQnZFOG9xMVBXdndva2pZaGs2MnBZS2ZGMlloNDlmOTlj?= =?utf-8?B?VXBhZ3djUUxBWSs5VDNpSHdjczBObFhFaXhjZitxU2R5YWZUdGRSeVpNTXlI?= =?utf-8?B?SktUa2hEajA4Y0k2QjBCb0ZUeHZPTjlhbnpTSDdsc01yNmZEMk9KVmlLaWw3?= =?utf-8?B?dVloUHdyVHhzcmNVVkh4UnBISTlRa0FqS2JKbDZMZ0NLZVB2Y2N2V29KRzBQ?= =?utf-8?B?NXNkOTJZUk05Mm43bGUyNUZ4Y3JmbkpaTCtBRWNwZ2RwdGkvOGE0NjJmMTBL?= =?utf-8?B?OVAveDRWYXExelIrdEVCdUE2b2JWUzFvZmZGaTVGQVF0SGZYRTRISDN5SEZw?= =?utf-8?B?ODdDNEgwUFVtN2pXVVFJczNncGF6RTRaOFZuelFrVUFzSmRVUTlBWlM0OHlX?= =?utf-8?B?M0dwTkdoNFFyS0t4T0F5TVREeENDbkR3cWN6RXN5S01mMUFvb3o5eGtTUG1u?= =?utf-8?B?VktTK3dsM2dNM1RoanhrdjJaRzJIYmF6OWU3RllMNkNtblRXNEE0YjVkNGtO?= =?utf-8?B?aDA1VXBTdVJjQTExcElWSFp1YkgyWmJzV1VrdjdTeS96cmRxRVEza1gxRnUr?= =?utf-8?B?WEtVSkV3dkVNWTNTNUVwQ3VmV1I2YmFsbkJFYU9PV0Y3T0t0cWs1eXgvZmc4?= =?utf-8?B?VDdsbEYwQ0ZxVmlRbXIyakJwZndHRnNoRUxOWjhwd2krMHlaeWhScXlYalZI?= =?utf-8?B?dnh0R0U5Y25NYnpGb3EvemVrYWF3RmFFOFg3aDJtOVA4Q2xuT0h2Sk0wK2RP?= =?utf-8?B?WmJDcWZXSEVuVFQwU0dNTnh1djNwSWNTODVhblZ2dFdiOUdOMzlmQVViZHFN?= =?utf-8?B?RjBSMkhiT2ZidWRNcXpna2NBWldWTGFlRDR6Z3gyTGdjSHg2Q0dVMUxlSko1?= =?utf-8?B?Vkk4clFlazQzYmR0VU44Yzd4R2JKUkgvblpxYmxKWk8xc0RySFdxSVd6TXdl?= =?utf-8?B?azZrc1FSQ3A0V1krK0VEN3d6T08vUDg5Q0ViZ3g0K1F4eHQvV2NRU1c3SnpQ?= =?utf-8?B?czIxZ1pYeEc0Z2FXUGZtWjJKa3BGcHdXWGMyc1VSQkFXbVVWYlBJODVmaXls?= =?utf-8?B?aWxSY3hXTFdBREtCQkRGbnlkK0lCOWVLWmIvTTc3K3duVGhvU0pobC9ZK2ZZ?= =?utf-8?B?cWRBcHRvdXVZbk9XV0ttb1pLTkdmMmZiSFIyenJJQ1F0NlhUS0RTLzBNbUFP?= =?utf-8?B?UUJSREdFbCs5ZkpOeVh1c0E0WjlINzZZMnk4SXNVSHhZWEhiWmErWnY2NzBm?= =?utf-8?B?UitKdTZ5eWJhTnZqdlpvdUdVTGhEZDZwS1UwcTl5Zngzd25Kbi90cHhETnJI?= =?utf-8?B?TXBRemx0bGVLQnE4QXIrS3owYnlCUzIyVUFCN3ZyVTErcmpYaGVacmt5OVJW?= =?utf-8?B?T1E9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5ecb0cdf-b22b-4b3e-62e4-08dad13619ca X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 11:45:51.8416 (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: d8YBxiIw9ceXyj1Nz0TocfmWBsjX5Yhx7Ho44ab8mBUGds98IPYhH/Epr+MzipW7Qp8ZklTMZxWbpUSqI9Hqnw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAPR10MB5154 X-TUID: Zz8cedxGXU/4 On 28.11.22 12:12, Uladzimir Bely wrote: > In the email from Monday, 28 November 2022 09:51:12 +03 user Jan Kiszka wrote: >> On 28.11.22 07:41, Uladzimir Bely wrote: >>> In email from Monday, 28 November 2022 09:32:22 +03 You wrote: >>>> On 28.11.22 07:05, Uladzimir Bely wrote: >>>>> In the email from Sunday, 27 November 2022 22:05:53 +03 user Jan Kiszka >>> >>> wrote: >>>>>> 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/bo >>>>>>>>>>>>> ot >>>>>>>>>>>>> st >>>>>>>>>>>>> ra >>>>>>>>>>>>> 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-ap >>>>>>>>>>> | t. >>>>>>>>>>> | li >>>>>>>>>>> | st >>>>>>>>>>> | 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 >>>>> >>>>> Why wrong? >>>>> >>>>> | meta-iot2050/build $ tree -d downloads/deb* >>>>> | downloads/deb >>>>> | ├── debian-bullseye >>>>> | └── iot2050-debian >>>>> | downloads/deb-src >>>>> | └── iot2050-debian >>>>> | >>>>> | ├── openssl >>>>> | └── swig >>>>> >>>>> `do_apt_fetch` works with `${DISTRO}` and downloads sources to the >>>>> corresponding directory. >>>> >>>> deb-src fetching still lacks base-distro normalization, like deb also > has: >>> Saying "normalization", do you mean the following: if ${DISTRO} is just >>> renaming (e.g. "iot2050-debian") everything should be downloaded to and >>> picked up from the directory named "debian-bullseye"? >> >> Yes, just like you did for binary debs: Reduce the DISTRO to its >> BASE_DISTRO, then use that as key for the cache. The current situation >> is inconsistent and non-optimal, even if working. >> >> Jan > > I've just pushed v4 of patchset that still doesn't include this wish. For now, > I would apply it to the isar/next to have cached cross build working. > > We have some plans to improve base-apt in general (there were some PoC patches > on list), so improvements you mention could be done a bit later - for now I > need to switch to some other tasks. > The problem is in meta/classes/rootfs.bbclass. It lacks normalization of ROOTFS_DISTRO to some "ROOTFS_BASE_DISTRO". That also explains why you still saw same packages under deb/iot2050-debian - you ran the final rootfs step which I didn't (due to earlier errors). Jan -- Siemens AG, Technology Competence Center Embedded Linux