From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7169469243442855936 X-Received: by 2002:a1c:ed04:0:b0:3cf:d08d:3eb2 with SMTP id l4-20020a1ced04000000b003cfd08d3eb2mr36522355wmh.129.1669617151900; Sun, 27 Nov 2022 22:32:31 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:f211:0:b0:3cf:afd2:ab84 with SMTP id s17-20020a1cf211000000b003cfafd2ab84ls5653880wmc.2.-pod-control-gmail; Sun, 27 Nov 2022 22:32:30 -0800 (PST) X-Google-Smtp-Source: AA0mqf7W01CboOZ5TU5eSmrqdcqMICPasmIkDPrkRQRro8NcUnwYjFRLR4z/BWUkI48loA8OBGV/ X-Received: by 2002:a05:600c:19d1:b0:3cf:cf89:90f with SMTP id u17-20020a05600c19d100b003cfcf89090fmr26476561wmq.186.1669617150540; Sun, 27 Nov 2022 22:32:30 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669617150; cv=pass; d=google.com; s=arc-20160816; b=rfaewNWsnQ77d4vqKBmjulcK9Fg2NjTcpDMy+VZ+zKOIvPRmuQwwkbjuNN4p94pAft fXCdIPFyuz9+jl87tQmjzR6LKFe33iurAw/B92RuMo7nnIsxtxAiTvjxXVCEqkUDDBqY AeKXqr8q/Nn1Hx7Tv83nZU4Mqe7gWDr9z26EOO/7TZWeom2I0fOuWo6lIObfPnTFmfBs fp023tSqhcz5myYRfOddSIkGPiJmNJAvbSN3tjHwEDBZC3UFu1sZyzXa5PBbxhL2n8NQ nbRVAeOmxBWn2JSNGVkPmb27lOuL2tHlg0gFj9J1VrW9rrn3R+8zAxd3fnqQ55gsW9sU Wa+w== 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 :content-language:references:to:subject:user-agent:date:message-id :dkim-signature; bh=kuHWDgmfOUAkiBKWMMjMpBfFqbbh6FL3vDT3om0zMQ0=; b=Ac1DA6l98awTL/8zxvnIpcK8985hValbUMIvGPvGTsM644o8pDzgisXE/opNVsg8et 1WwqJL1DVBBPSxP6L53HJ/smccN182lGQ7dB2ZeA6sOQ+T23lIb7ZydsAICONDa1qRcc ZUlPDwlcDwGf2IgqnrGoVlcSs7oELmWyGsgdmaNb/1UdKMEvRzgSe/bRbmH9PzqfsL5J PWzHCcG0dwl7c+o3zp/f7/WUwyP4nlsnDLTIusckyUmD+MzcIuKHP3cKh84QkVt77cw6 h9QbQA6WlnGad9rdZQUhvqOC4BW+L0ClGkeRUw+ac1b5omhemO5NlA/hX4qDKGAJZ/k0 MnGg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=inPaOojr; 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:fe0c::62d 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-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on062d.outbound.protection.outlook.com. [2a01:111:f400:fe0c::62d]) by gmr-mx.google.com with ESMTPS id bu23-20020a056000079700b002367b2e748esi461068wrb.5.2022.11.27.22.32.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Nov 2022 22:32:30 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0c::62d as permitted sender) client-ip=2a01:111:f400:fe0c::62d; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=inPaOojr; 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:fe0c::62d 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=O/hZ849YMr3b8zrC8l3xRd8VVrZwBE/JYGTBfzvalKY5EPCfLxk2l9s5fuONgojjrL9qE1YkgEfk0Oxt7/UN6OpUGLwAqTNoEifkT5EsRmnn835XvnLKE/rdY7OiU9gnmthBT1hfLubD9FhXd4SaHjfTGqKniNFQ3SuIp17QJgmVvMlyzGnfipq35m6g/5NfuR0sXZ3kMnuTsjIwX0q94ByPycL06pxPry8OGZKk9DCD1fC030apsvVyQ0EQyb8MiQiZS8cCcv8PePXWOsdbxTbyhCKOJAfzHd9Ss9WVOQLelZM1Fm49rODtYBPrht/Xh1VSpu0bjw2cW1oIxLH0sA== 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=kuHWDgmfOUAkiBKWMMjMpBfFqbbh6FL3vDT3om0zMQ0=; b=JgIASAYVwdJkUi7k87CvtTlJ26wIuDHq0iL3aX9nRQsT9sDq9Rp9n4Yn8Ak8YlIfv7S6OlxsO8NiChFeJviJtfmQRkvfEr5D/n0xPxoGW7/Mb1hw4KlqdV3cznPZOhWmkyRVlnlaS4e7k5aO9GhGIPUZnAoKSKQ6JWS/badgU+jJyl40BLt5kTbByKeYX0c4mzXwtpr9AaDGC+bVid0Pb9zWXqRaQYJaFQBPjgzyty3QYeYYW6c2xtfapoZUaCtEDXayr7Xb3UEb7UNruxY85Ds0xa9vcbUl9gWTlLHCtE7dnXuYnE3pKQUYCWVdNx5a4cKjQ5BLCrFqKc7HwD3kug== 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=kuHWDgmfOUAkiBKWMMjMpBfFqbbh6FL3vDT3om0zMQ0=; b=inPaOojr2nr5h4m+4auhoYbhLI//PnIOy3NT52duChQksY241I2x5CGvAq2Hp3AWXepXKSwIxStsdOtHFHkU/mffnBY4VgG2xf4MWH7imXqoUrgFFTmPRGfhkwYU0CcsznmLERwSbjYTd5bZLK0yHFFSatNZISY9WdtRvP/s85yJgX1+HqowXaKB/5iRZiw/COSc15AiCAErkHiNpoqiTKrlotF9RKDzrGaMqeO9Y/RQ8z5QjBp9y94K7tYSfku/OANdehTarDESiqINGqWRZSGd6TzXJd62kqxRX/WA5HhsDrkK8DB01VMVX7Ssl7qO5l/c7G+FKk/HLmZb0XEfdw== 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 AS8PR10MB6361.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:537::9) 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 06:32:29 +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 06:32:29 +0000 Message-ID: Date: Mon, 28 Nov 2022 07:32:22 +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 To: Uladzimir Bely , isar-users@googlegroups.com References: <20221125064253.21907-1-ubely@ilbers.de> <6502643.MDQidcC6GM@home> <2082143.9o76ZdvQCi@home> Content-Language: en-US From: Jan Kiszka In-Reply-To: <2082143.9o76ZdvQCi@home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: VI1PR08CA0127.eurprd08.prod.outlook.com (2603:10a6:800:d4::29) 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_|AS8PR10MB6361:EE_ X-MS-Office365-Filtering-Correlation-Id: b8fe0034-607b-4e38-bd0f-08dad10a5289 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DTRHqPyFhv2ZtPi6sM+ohxGM1OcpO0k+2uBza3WtvkNKwql+DYGaeS6uBIsM9HS+XVOquAfya5aE5JtB9kA7WfZHuDFaYcUdbrzp8fQqI4XmIsF7ZsSiyl+6PqQK+85MC5JEJpNaJawEl50j76DXrMi/KTG3/0bUup/qlYbAOm1wO6zoAsi4kgxQGMqOx0f2k8hyl9So8yhaXofzuvRllbzu9fzTvjqBjxEmRHfjupZFKcpszo2dmofCQoTSmkYta57lOPgGyP1sUp8x2l9lMm0YItS04P/vyFyWKIw0XAZLmWFpZp5TRPfcI4T+1E9h9R6iA29+LbD13iO+N5mP5JhSyacqUizm4HDOX7Pv2qAeg8d/Nz+qyxVOT1VKgm9mK4IeTGrZYsMIptx/Nrc/f1xW7x426fHwJl3BBfeFiKqiV4K3KW2Uj8INh5WItwK4JhYOKi92nciAN/WO2Z4ztNppivMDbhjRVyzaIZx8zMi9b4iBEVEWwcnH7+4+BSsdrB3iuigmkArRL3OJJp834hSZYhg3JY6jfiiZLZ7oOLILaZaOeOaApv4kAGrwI12W/yP/4WS8uHp7XKDVC35lKnCAgvDE0RQ1grJ5QGWuCK+vcDHlj9Fgevl9P7Vmp1rYDcM3FndAEU+Ci3jJ8ajK8wu+oh8as5JDka2lExwLBazjRge9HSxcZkVjZ+p2jBAJKIpCkSvJKwG10cE6pEpn17O0wmN5tylSqgu8piJ1CKc= 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)(376002)(396003)(136003)(39860400002)(346002)(366004)(451199015)(31686004)(2906002)(83380400001)(6486002)(6512007)(6506007)(6666004)(478600001)(38100700002)(26005)(41300700001)(66556008)(66946007)(66476007)(8676002)(36756003)(82960400001)(53546011)(8936002)(5660300002)(186003)(31696002)(86362001)(2616005)(44832011)(30864003)(316002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VnJFVGlnNUFQYWY3S2JhbkRKWk9RSjlvdGNVakdlY0NlcmhmMEI1a044Rm5z?= =?utf-8?B?YlFvZ2hNc0QxUUl2MWp5Qyt2WkVXWWZoS2JUWDdpTmpRdTE3MUJvZXZrWWcy?= =?utf-8?B?UFNGTGVXTzYwNFhWWEpqRXpZdnZYS01tQUNlQmhmWFFPVlFyRCtsNTcyRXdu?= =?utf-8?B?dXRUSTZtYnlDUW4rQVcxN1JTMmg1S01yREdKSVJadzdFVGZqQzl3eXB3T1J4?= =?utf-8?B?U3hqbGU0MGl4VnJqMUpYdXl3ZEI3NlBjTWNTZktGTEhuaHpNcHlCbTQyUVBX?= =?utf-8?B?ekNjZCs4cEFNT3d1ZzQ5dFY1eG1YaVE0ZmVOd1NGS0VqMkNraU9SaHpGZElw?= =?utf-8?B?VEJJVHQ1Ky9ldHJtVkZyenpiNjJEZk1nTWZCZ0pITld1ZlJqNDRtcXJzNHBh?= =?utf-8?B?Q3NyWERMNWVtSG10UXcxMC9IaUhRdUFlcmpLTmdQek1ZMGNxRm5PbjZpNjFR?= =?utf-8?B?V2p5VjRyVHZtQkE3a0J5encxZkRzcXNZV2hVNkozYkxiM1UvMDhNQWU4b1RK?= =?utf-8?B?dkhobDFaZ3EzWWdVajhXYVdmTjQ5OXBtZUxlRWM5b0NGQ3hnUSt1dkIzRlh6?= =?utf-8?B?WkRQQzYrVWc2VVphS2lHVWo2RVM3UmJVa2VWcmErL0JqTWcyempMK3ltcVVO?= =?utf-8?B?ODJES3MzTTJsR2d2VjJjR2FLV0Q3NWxFNGtlSWliL2djcU9Hdng1UDhPOHRO?= =?utf-8?B?UDhnWVY0VnpTcG04QUJCVDRPNmFyZDlvMlRWa2tNL21GWlNlWi9qSUVVVXZB?= =?utf-8?B?S1BPRjYyTkdNMEN5STFHS1R1NzBYNVBCbjZ2Ym1EMmdDK0dOM2ZpcEVLRUQy?= =?utf-8?B?eGNBYVB6UDZLMkEwRVE4aXlZU0M2aEVPWStVcU1HQ0pEN0kzU21SbEtXWUNU?= =?utf-8?B?SVRQZzlkMkh5WGNYNUd2YmVnczJNSUwvNndseFpBTDJrUG9LMXExdUlzRTJm?= =?utf-8?B?S2lvbWZ0Y0psOFl5Q0ZXVmY1UnppdG1CblJQMVJXVGZOQ3hsWFRLMU1yTGU3?= =?utf-8?B?ZFdhRi9KZ1JPNnpEMTl1M0E5YTk4QjJMQlVtcGk5OTNyaUdOdVdOK0hPRUNr?= =?utf-8?B?NWRXVTJnUmJRYXpydWU2TDcwcTcwLzdlcXk5UlZ3MVgwVVJkd1BGUE9oaWJI?= =?utf-8?B?b0dWcDVBY1BkSUR4WlB1SURBbFRlMHVlK0Y0N1AxN2VEWXV4WksyUkdpaTlM?= =?utf-8?B?dEpxUXQxdGdsT2MzSEx0eTZ3eWlOMzR1VDJDS2NmOEhMZ0ZrZHFGUVlUbVhC?= =?utf-8?B?dHRvMm96NU9yUXprNWpwaTdnTFBkR2NXVzM3RStzWkxtQUYrQzJGRzJ3SVQ1?= =?utf-8?B?Zy9TRUMrNkovV09ycEdHQlhSZlM1enVtZ0VHS0l1MnRUb1pTYjA0N0pXVUJl?= =?utf-8?B?cG1LSFR6NDZnRjloek9lZlE0V0FtWm02cTQxYkNsc0x6VisrQkxuS3lUQVhz?= =?utf-8?B?N3lMSktRckhEamFHR0pMSTg4bzQvRkljQm9sZC9Ka0NSVjltSnYyait1K1BP?= =?utf-8?B?OG1ZQjBNak1mOGw0citZMStSM2t4ZVo4Vlp1aVRZZFUweWxoZDlrck92VDhw?= =?utf-8?B?ZUFXMjJFdmM0V0wyd1FYa1ltZjc5YW1MUmFSR0F0YVFRUnJZMTNNenRJWkps?= =?utf-8?B?anNxcHdMMk5iRko3cUhpMEdUaVFZekVSbExIaDlGbnMybnVvUWRBcWRDZFNn?= =?utf-8?B?UGFXdlFxY3pXQVhnL3V1V2MxdXoxTHR1azFpcEw1Zzl5bDA2SHRqUXN6eHYx?= =?utf-8?B?S1BnanFRaFMybVNqNTBSVGRNYXVKRTZULzdITDlzL3Z3UWE1ekhjaXlkWmdK?= =?utf-8?B?Zmg0N2svd0thVi9oSVdtQi90cnpFWE1ydXhKZkNDQmtQWjFNY2hMSVluL3VE?= =?utf-8?B?MVl4MFNtbnJBSVM1ek5VSXZneklNdWNiMm1SMVkzT2xmd3RVWEZSMVJCeCtO?= =?utf-8?B?R0hNVE1UZDM5YjEzQlY5T3BpbDZiRVovcXdGTkRMMnI4dk9qbFptajU5NG1X?= =?utf-8?B?RE1SMURXYkVCeGxXZ1psbTVUV1pSelA3OHBHU0VuOGFlR21VMU9VNkdYY1h3?= =?utf-8?B?UXdyYng0WUhCVllBVlovc1lHY2syTHJxTDJJdnVwQlRqVDZNTFdsYTNZRVJz?= =?utf-8?B?NzJ3bHhpVTIzRTJWR0lpaUpaUndDWkRaQTJOUm84L3BYR3loZEIwRm1GekI3?= =?utf-8?B?WHc9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: b8fe0034-607b-4e38-bd0f-08dad10a5289 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2022 06:32:29.2244 (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: YrrTMVbWzbFiekQTckzE2gJwEQxJbCPwRy+vGrRezu1QBV3Ry8jrAEBeevRVR5aIVKAR2UQbe3XZ//UmXaMFLw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB6361 X-TUID: gjIZscrtVTVI 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/bootst >>>>>>>>> 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-apt.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: # tree -d build/downloads/deb* build/downloads/deb └── debian-bullseye build/downloads/deb-src └── iot2050-debian ├── openssl └── swig (your deb folder was likely outdated) Jan -- Siemens AG, Technology Competence Center Embedded Linux