From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7169469243442855936 X-Received: by 2002:a5d:680c:0:b0:242:a38:d0c6 with SMTP id w12-20020a5d680c000000b002420a38d0c6mr11063301wru.375.1669723659222; Tue, 29 Nov 2022 04:07:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:ac7:b0:3cd:d7d0:14b6 with SMTP id c7-20020a05600c0ac700b003cdd7d014b6ls7894729wmr.1.-pod-control-gmail; Tue, 29 Nov 2022 04:07:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf4XMo60h3xDTtw7JgRMSV0TldaU0QV51GBytix5qYCpIuBOn6wCnePLrBU8LPExwOXKrcZg X-Received: by 2002:a7b:c5c9:0:b0:3cf:cfea:904c with SMTP id n9-20020a7bc5c9000000b003cfcfea904cmr30549983wmk.33.1669723657888; Tue, 29 Nov 2022 04:07:37 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669723657; cv=pass; d=google.com; s=arc-20160816; b=xSB6YbkKO8cMbtESH5otdCS3OwKV65rhfEnqBfXRvrVDHLvNg+vwQQkRpc9pebfJ6T oFujEIJDWe1p/y5c1eFE9V2c0nQxjZSf0PP+W+v+KlePo55OFnKX2ue5esk/Rill7yUn jzBUtO7Wcl2oTPOamm8J8S4h+gkGgFmKl/wGQsjZp5vY4mEhbPktfr9WAvFBPvqbePIO 7asysJIokIP0MvikWIFKvMZyoarfxYk31fV5Ky6s84KvPlOOaQGxFXl3pUzlNUHiOQi9 euivY6iOdJVfaYucI/9b8jz8BiusWfDNDRX6E6LMx5spPdkK/7tVTeK1lvpsvjRqEH6I 4GNA== 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=faya1tCHecKtB3GVuwVTELHI8Q4qIBwmTE+t90xgmmE=; b=NMpSVDUReZwyPIRFhcyn/WLhqaZ2AEYN13Sb5Z6578G2PuKeEPHS/B+5v/qhVcCw5H g853gRZA0jgKqf0wx3YXmLvqd/M5Zehx6ot2ZEfClimujsv4leyGAoB+jf86BriWQjjm Nz8VinLrM2YHIjgfP/34s3cDCXXmk7pQ8zJTWNDmpO8QhfGz4VcXIHiI8foT0VCyygpZ Ckbye9bSsQ6EhA6XFJ3grEZkeIqGh3iR+VDK/Pc8oCv4/58MNhJq0xyJXnspzBdVURM7 TCxyzzitffxOJj3rGNeiNW6qmtQSV0cIail2vQoaHhHrDmE0NCN1kF8G05zjO5Rge9vH 4GPA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dUPfqXyR; 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::60d 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-he1eur04on060d.outbound.protection.outlook.com. [2a01:111:f400:fe0d::60d]) by gmr-mx.google.com with ESMTPS id ay20-20020a05600c1e1400b003c6c0197f3dsi84578wmb.2.2022.11.29.04.07.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Nov 2022 04:07:37 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0d::60d as permitted sender) client-ip=2a01:111:f400:fe0d::60d; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=dUPfqXyR; 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::60d 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=HXT3vjId4o8YgHe+CMz2AFafBqB0YKHQPcWuDK2ujxVKvk2x4zrvv52Wf9436Hb2aSBspGCad5Vfw5Bj9IQ3aWHg8GoGjpfRksvYDtPqn238uJNw9PgUglguqh9BsZXPg+fcIyPolEWTlBab+wi+svlpa/1r/TgClHYLZ12lvyVmTKOxc5CmsN3SdD8G/GmiVso8KgU3EHHtkSRORHkIv6MQHd+YRxvB/uoHgMjVSqrZJNOy84Wb9k1uX3/GJWCn6aE1ssGlATTxaofBi18YHKDLkxokGVi6GDCjhDXF+kVxQMlKbyQW0vxns9vWLs8b5owad4zJYzFM+MCxQlAhdQ== 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=faya1tCHecKtB3GVuwVTELHI8Q4qIBwmTE+t90xgmmE=; b=jcsRMeIKT0SGwtVwwn6NA+exqRineKUBqI2cmFt9Lcuo1oBliWWYM1utbVEtQyiIfjawEZenHMCJ8G8/vhJL5PLGb7FRUdVWZkiQpDZeLvjskRiHzh/80zJzC7NEv31Tj8iIrGer846XKnQyyt2dC1AFUCiHNoO9RIMyn00lTaocpbJO6myVpk1GEAL6pIpxb35fRH9eeVM4NbF6iyybB+7D3xLquTi3Z1TWblN2YOWlybDaIqDBc/C5PBNOjyvmF1r2a9EUH10sxOAiNOtm8IGuvNmOqYU4PnUOusnPkkDazunUTE3UOL5+/a3xXnzGk0PnbmyXJcdL8OE+g3seaQ== 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=faya1tCHecKtB3GVuwVTELHI8Q4qIBwmTE+t90xgmmE=; b=dUPfqXyRIQufAT11QzhsLRCbN3Op69useoupkm1IXZx/sG7q5Z4TGSfJ4GbAlNl+aM0Jh27ryyOYCJMBc5Roi0L4UwUqYVx1F0k7r6b8mkwIleUGQI8XKPQ9ncq6wfqSBY7w66z0e63tHIi+25/6gkCvGGwZdE0qAeA/60NVepB4lRg2BYrBcsloMmCV7in4SUfpde8UPOca+hJJS1WQH3nI61G+CdyYVyOatkz2EVxenueM//qSh8KFbjKYllzGrl+10uIN8rfgymAoa3lVZD50o5woP3VkhD/vP3K49Taz3f8Ri/9+L0wDeDScEVz6t5XlzDtziCuhuAN5TvpArw== 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 PA4PR10MB5683.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:265::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.23; Tue, 29 Nov 2022 12:07:36 +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; Tue, 29 Nov 2022 12:07:36 +0000 Message-ID: <2d4b87f4-3cbb-66f9-1e76-026e77b85505@siemens.com> Date: Tue, 29 Nov 2022 13:07:34 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH v4 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: <20221128110534.31450-1-ubely@ilbers.de> <20221128110534.31450-2-ubely@ilbers.de> <3638eaa3-18b8-f2f4-ac81-0dd90f930cb1@siemens.com> <4962749.Qq0lBPeGtt@home> From: Jan Kiszka In-Reply-To: <4962749.Qq0lBPeGtt@home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: AS9PR06CA0591.eurprd06.prod.outlook.com (2603:10a6:20b:486::23) 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_|PA4PR10MB5683:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ad8cfae-43b7-4e71-e8d2-08dad2024dcc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qcXH7rLpZ9UmXB+YWhPA1a2nwC1QHZ1et8TCeHJ0JWWiEF9E78etQxOlbJHYPaGi+deHLJ6YKVZr7aCDklK5opbcZsL0UMBJEn/w0/XHTedvfooyAYHqUNVfifoYPohYbAVpqM+9l1V32olQ7mXnkkeuYlMpGg6VDedS3GpItb8ANJNEhiIqBLAtcePI5cX9cx+z4SMLclzQGBRDnZhwmKFMzA1UPDW9+uPdxaMRh1uX/7kl6KGrI4riDnDEhEDhe5c04EckyCy4+Jad72NEHPWG9Ers5FA5rw3fnwG8hAS/JajZOAicqjWg9GDVYD1funssCEvXtqP4eoPBkgstsCx3AL2UlMa1r3GuDRIt8bXZD9+3ulDw3DpFFEy0HrTnNj2BMnHd5rQEiVZn44mkm1GOrTQyHiukL7U0aG97s6TzqYW/zwGe0x8Ja3vfsR/gwm0E3l1smkZzPxmuFeei7Y9HdJmd0uWQwPn1JPyb75CFd9EL0I4Kde9WitOsAgfjM89rCiZgRcQ78zW9rGFaKUreTMbVxNZFBe2SxNp1U5V/u+Yfn/lVwTm995mYKiZG2Olph+Dt2NeGq1pOsf4kLj8/FIbPCAMisuvHEqiXvmBxNj/zdr35JDfGKXLlmWQA3L7U9H7fC9F04/WdigA0sA9gl3MsSKYxz9Pqdg815cuevBj1GFN/6BRgktYrp8arpOqGR/GARVYCRAK5NVUB+Uf9bPPPxmZWFbTh4P7HwJo= 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)(39860400002)(346002)(396003)(366004)(136003)(451199015)(82960400001)(6486002)(36756003)(53546011)(26005)(6506007)(38100700002)(6512007)(66946007)(8676002)(41300700001)(478600001)(66476007)(66556008)(86362001)(31696002)(316002)(44832011)(8936002)(5660300002)(186003)(2616005)(31686004)(83380400001)(2906002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WDNZRFBOZUlKMnhmNCtrN3VCOUlmbi9aK3RtNmp3dXcvQnRqMHdLeVBqYUo1?= =?utf-8?B?bkhkUmdZNVprU2pkRmJReU9HcEgyZ1pTYzBLSG1XMHd3SCtRR282eGVzMWNH?= =?utf-8?B?b1Z4RVloOUp1amE0eHI5c3JpWkhOZ0U3ZHhmaWF0NmZrSytXVXhrRW85L2Yx?= =?utf-8?B?b2xMWEs4RlhUWXBwWUR0dzZKUmh3MXNMTHRObmpodFl4YkE0eEMzUXNPR29a?= =?utf-8?B?OFVjZnh5aCtLR0lId0QyRDZ2ZWplbkxYelRkaXBrMjdXZ2FDcGZWTkxGSFZx?= =?utf-8?B?NWw2ZmVCY0lBdkdDakkxRXhBckdsWE5oMFBJdURXWG5FTThPQmpJYUJtZFR0?= =?utf-8?B?czFjaHdwaHMza2lqTlJDLzFDbFl3YytEQW9JVy9lVm9lbkVMK1FPWXNsYTdP?= =?utf-8?B?SENVakhmemIxNHVLNXBQRmF3MU9RL3VWMUoyc25ualdJck1WbVp1UHkwNVQ2?= =?utf-8?B?bU9Yc0JuNzJtM3kwUzl1R1V0UmRBb3RTWFZJbVk1Sld1OElCelh1cVNlMkd3?= =?utf-8?B?N0tTUmNDSmlvUGlmOWlGYWNvM0hldGQ3a2lkNjY5a2l5bU5lajhkKzc0Vkcv?= =?utf-8?B?RkZ4azBMMllVYnRoekgvd2hUa08yVTRTZE5KQWxwSnV6L1UwSjAzTUdBRW1Z?= =?utf-8?B?VmVCbVJWWXUrUXVuQm00U2dJSFF1U290SkRSTXEvWVNxY2xTY1NpODYxb2I5?= =?utf-8?B?cUg4QzNvV1g5aUlLVlNxRGd2WUZ4M0liZzVvL3FTMmxTTzB4ZnBOOGptTVhw?= =?utf-8?B?RGhnRlAyUEpJM3k4dC9PN1Y4enNRaHhnNEpyOEZZcWtwek4wV1hUbFVtTzJX?= =?utf-8?B?N25xejI4Ky9mdTJGVklsVzk1NVNSNmhETWdhR2RIaERIZFdzVDZwd3BFdjRl?= =?utf-8?B?ZVc1b1VDa2Y4YUQwUlBLYng1VnUrQW9iY1JzVnBRNUoyN3BzYmU3YVdZVkti?= =?utf-8?B?ZkVkNmJWanlFb2UyR2tZZGE4eFliU1FiNDhEazhSWDBDRWh4YkVSaWlEQXRR?= =?utf-8?B?eVJpQWxqMXhtVnFDTHZvbHBWSldOQkdjRW5aV2tLbTlzaVMwcDhkU01CNDlW?= =?utf-8?B?MWRlUDNGL05XUGd2M2lHNE1MbWpKdzVWSnZJaWNhTXdSUllUbmRzQnI4Nmgr?= =?utf-8?B?UEQvLy9OMVlEVVRVdlVOajNxNEwrZU83N0NCcmo1WFhCcmJjcDc1cUZsQUNK?= =?utf-8?B?cHFhOU4xQkE4Nmx3L2hKQ09PaGhuK2FQRE5QOHhQQXJsVFQwb1U4YjQ2QjFO?= =?utf-8?B?SVhwOVloZHpTblZBdFZaRUpQbnhUTFd3cm5GS2FUcUtQRCtUaFozUHJNK25k?= =?utf-8?B?a1JJeVp6YU9MZzljYmVmMmg5RUc0ZFVBY2NtZmlQZEluYktpRTViaUVyUFp4?= =?utf-8?B?MlBDSXdDQTZ4QzZORmwrWWJsMHlqWkpxZEF1MlRpK2kzSVZ2WUV0d1RZbmwr?= =?utf-8?B?bkdnaFA4QVlhM3JpWlErdUxJUU9sTldGVjlyVlZmbUQ0M0owUmkraGJvL05D?= =?utf-8?B?aWJYUk55QWt0ZTFvU0xzNW9BNGk1Nlg3NmZha2prZEZVMnZxdXhMUmFFZ2w1?= =?utf-8?B?MFZ5b3dNeDgwNm5WQXkrQ0owV21tUUJxbW5tbitzTDZLcFI3NTAvcFFabzFL?= =?utf-8?B?MGh1Qk5GdFFETWt0V3lVTERWWnpwUjVaeW9Ba3ZRRGIwNHpNK1JrVWdiZVFU?= =?utf-8?B?Mlh6VUcyTWtQM2ROSTIwTFpqUXkxZnYvR1NIbThnOWNtM21MbFBDS0p0Ujdy?= =?utf-8?B?NHBIRDQwekJGU0tUZ3RaUE9wRUZJck9hN3dJNFIwaTdhVWZjWUlYdnRCZSts?= =?utf-8?B?L280VCs4enNFU0NHREI5R0JEWldqVXIwakNxZGRtTCt6ME00Zkd5S3M4aUxx?= =?utf-8?B?KzVHRG1Wc2Jpb0tmRkwrQkp6VStBWjk1T0hYdE5HSm4xTmI4N2VMUTNZeko4?= =?utf-8?B?bitnRml1Z0NwdmhFdndOSVNhMzUxNGZQV0RtaGtocHdxTDhFSEtLYUl1OUE2?= =?utf-8?B?SmpWR3NlMEttTUdiZ1doZm1uOXZhVGM5QXp3QlpOUUxJWFNwVjkyTUUzaVNp?= =?utf-8?B?QVZvQmdld1V1bXdVdjIzanBSNHJqUDdBN21ObkNWNlNocVlSa3dGeDBseC84?= =?utf-8?B?RmY4aEFheGNWemMvbkhPVEF5OVMyMEZPMUJZNVI0azZneVJXYjMvSnFta2Qv?= =?utf-8?B?Z2c9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ad8cfae-43b7-4e71-e8d2-08dad2024dcc X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2022 12:07:36.4325 (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: 2YOUsgFN60E3HNWoe1wIq4g0cwC7Sf+6O8r2pZfNZ8uc5Vx23ow3XqrRlbvUiYDln10VcYQZ3iRkDbaYGwxFiA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR10MB5683 X-TUID: zecCpCvwvVW+ On 29.11.22 12:29, Uladzimir Bely wrote: > In the email from Tuesday, 29 November 2022 13:49:11 +03 user Jan Kiszka > wrote: >> On 28.11.22 12:05, 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 HOST_BASE_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..1ad0152f >>> 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" >>> >>> +HOST_BASE_DISTRO = "debian" >>> + >>> >>> 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..1f65c3cd >>> 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" >>> >>> +HOST_BASE_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..084f8e3d 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" >>> >>> +HOST_BASE_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..ada7dc6e 100644 >>> --- a/meta/conf/distro/debian-common.conf >>> +++ b/meta/conf/distro/debian-common.conf >>> @@ -5,6 +5,8 @@ >>> >>> BASE_DISTRO = "debian" >>> >>> +HOST_BASE_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..14d876aa 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('HOST_BASE_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" >> There is still a conceptual glitch here: BASE_DISTRO_CODENAME may not be >> the same as "HOST_BASE_DISTRO_CODENAME" - which does not exist. >> >> Jan >> > > Currently there are no such cases (at least, I don't know any). Even if host/ > target distros differ ("debian" and "raspbian"), they both use the same > codename. > > Yes, technically we could add this variable "HOST_BASE_DISTRO_CODENAME" - > only if we want, for instance, cross-build debian-based distros using ubuntu- > based host or vice versa. But I'm not sure we really need it. Maybe worth documenting this assumption somewhere. > > By the way, I'm close to come with v5 of patchset that normalizes download > directories. E.g., everything (both host and target packages) is in "download/ > deb/debian-bullseye" even if DISTRO was changed. The only case when different > directories are used if their BASE distros are different (raspberry case). Looking forward. > > Actually, there is still an issue with meta-iot2050 project. Deb files are > duplicated (and, I guess, downloaded twice) in "downloads/deb", without > "debian-bullseye". I didn't look at it deeply, but most probably it's related > with incorrect usage of "deb_dl_dir_*" functions in "npm.bbclass". Since Isar > commit "3afafbc" from Nov 26 2020 commit they should take 2 arguments, while > in "meta-iot2050" layer they are called with only one (commit 69cef06a from > Nov 23 2020). Yes, was locally fixed already. Will be rolled out when the dependency are stable. Jan -- Siemens AG, Technology Competence Center Embedded Linux