From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7169469243442855936 X-Received: by 2002:a05:6512:3d0a:b0:4af:b981:35c6 with SMTP id d10-20020a0565123d0a00b004afb98135c6mr8269625lfv.232.1669385494733; Fri, 25 Nov 2022 06:11:34 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5e38:0:b0:494:6c7d:cf65 with SMTP id o24-20020ac25e38000000b004946c7dcf65ls3320394lfg.2.-pod-prod-gmail; Fri, 25 Nov 2022 06:11:31 -0800 (PST) X-Google-Smtp-Source: AA0mqf6nwNg+mHP1RNOnhtbtJwDQTj12o1ATaa/2pFXkQUUi85H84aN16P/92yj6T9zlA5ijU46b X-Received: by 2002:ac2:4bd2:0:b0:4a2:61b0:8d28 with SMTP id o18-20020ac24bd2000000b004a261b08d28mr6403472lfq.600.1669385491653; Fri, 25 Nov 2022 06:11:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669385491; cv=pass; d=google.com; s=arc-20160816; b=VCeRDaZDsekd7YBjbNTIcGO7Nev8jxQZNuTIM4wqvR1UjG28Lk1CVWS+tOERvtbGaa pPqmNAbOhzZquFcRcmnTOes5Tf9flP/5qbXIWTqlFhUh+RhA7byQmu09ymqugfKQPO3M EVcp0j9J2JA+Bd881G0hhW4wAzFAeYGM0uanFr2z4rO3GfLtIve/3AoQF5uXyegSVSoA aL/4zFuX/2CC9wEwt7Hcd68WiVYe2h4QthhojpkdrzoNv8fxlHfDwJbBRKCdVhuQFg7n 8SwFcVZ3jqJzUeLZKrvJzzGOuVnE88joN6UtyBsN44RL5Ed551S4VqjuVe4oohtBWU9V ellg== 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=6HJ+3bgC++NHzlz1Vw19YKDkacT1fYA3skSv9xweq8c=; b=havuZeSZcImDxDwpa+JQRDigfU9whMYiGOefsLFzr/KL4/svGyYe+XO+Yns0RSsJ0L KdnBD8ri2DEUuNApJoqLfHW8r1L1i73gGU3vZ3rdmSna5A3+kb78yV6qKfjBV01un8PT 4xbPqItbIfJ9036apETtGD9emOomhEAhQt9Ws4wBwKT6gmv81IFHbdQlAfTLAvpJg5EN 2lvSrGX/M8razzCWoQaCTUuPd0PRvDtNJtpkkd2TX1QpWiJe6snrTLGcY7Sm3ogeJfyk kojnx2I43BD6eieuGzzw1UYHvJY8PoWKmDapnqLLonSdKpSEHdgsbzJWiHfhtT5aLUWu E+VA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=tsJE66MF; 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 40.107.104.76 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 EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2076.outbound.protection.outlook.com. [40.107.104.76]) by gmr-mx.google.com with ESMTPS id u15-20020a05651c130f00b0027976ad74c9si203786lja.5.2022.11.25.06.11.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Nov 2022 06:11:30 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 40.107.104.76 as permitted sender) client-ip=40.107.104.76; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=tsJE66MF; 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 40.107.104.76 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=IQTyjCSD0FbQLU8B4Nar1iYhfj2OVNJZroa0cgfRsQm5pn+qylfxIGRwBPZKMV1wQ1BiHd9Yoy2uqOGq1+yB1DuyvKimPucvQ9pp6vdstpC9a4LmqIJh85n9Xql4sr4XYRmkffm0aEAY65RMk1BGrvXKK6kV2fnBLaPlsIlEthjeUB2LSMXUkvaVa8fLKqvYZ4PSEiKhWDvgc7FlC2NlMaU8gXl7dsYzaQ1KyrTpTy7S6JJaR5a8zvOSGUvaHCEjUgRaJ26u9bu6zGewAzAO0xaxw8+0BKCtOdHd68mzcBU2rQNVZj1Q8zkesjbK++acVEW9QUAnO/aARw/LaOdSGg== 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=6HJ+3bgC++NHzlz1Vw19YKDkacT1fYA3skSv9xweq8c=; b=T3FwKzYMXwj5mfYayRpxuSKJwVK14841X/qU7CprkewCd/qHKssbIleEJpcflok3TSVgKpDob0lTc0AYTT5vAdCCJyVakpHjeaaa46K2BdElDgasvWyMYAPGch7HVaz4Xbdt0ieijsxt1T6ITQUZ4TxgrNGnWxdR8OPnWEQTWrWtsaUyAs/yzG6BbDEOsgmqf4jx2Em1wUBPd74R/MKMVCZNIZ7Jst9e3U9DXJHat4+F2EKqDiL/aClJILA84aR3XHM5VGa98krJdXykJqnmGQtxG3VHhv1m0uWvh2qL4rhLT008lGbZurtg+X7Qw13MD8TWDZqFIWEWCmVAKiocQw== 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=6HJ+3bgC++NHzlz1Vw19YKDkacT1fYA3skSv9xweq8c=; b=tsJE66MF/fQvvguelPUkIy4Gq+/ogCsEqcGouZaPKt/8abykm+twpRKJnE+rWNvzGGraSUJo9krxB1Vi9dz8O58R0Ygd0dqaaNTPtn6EtLk+4Vbl65mtknFqclvyIFenf1D5tfiY8Kb4QSLjOqMEsGooXGc45mVwRyLp6XwZ14xDgyENiquKKXuP4nQ8aYbuWG4dWHp21xuIzexRSXwNa8771jXI/I5apDv39Jljo9Q9FNzh39E1QKvAXeO6dHx5Ifru0toV+uUUnI9/cikGSkH75j3oNluBbSSVXaAoYEeTPxCE5OMdEb3ECDNJxzz6dEYgRtltZvRb9uEqpK3CZg== 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 GV1PR10MB6394.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:150:86::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.17; Fri, 25 Nov 2022 14:11:28 +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 14:11:28 +0000 Message-ID: <1ac6d801-703a-8a1d-9905-2e55e4ea608d@siemens.com> Date: Fri, 25 Nov 2022 15:11:26 +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> <20221125064253.21907-2-ubely@ilbers.de> <2134415.yiUUSuA9gR@home> From: Jan Kiszka In-Reply-To: <2134415.yiUUSuA9gR@home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0065.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:49::18) 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_|GV1PR10MB6394:EE_ X-MS-Office365-Filtering-Correlation-Id: 88d0c727-6786-4dbd-cdef-08daceeef22e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9YbTtmpP8kIxK5um+CbeTX0AKfbWrWQ0KObsE2L0zKAuHCoEyItpW4LSdHxMDG9IUe+piqN60TA9tbAdQcChg6VdbxT3tuwWju1LV9seodHBcMxH6V/yjUbuP52RPK25C+7u8hwToQBJM9cqy9YncT/WSD7QP9EudIu34mIPnRS3vALa7GCATW+qyl8jl0KiE9PmhU6KITYfCXnSJdV131Y3AR0mMuvKR9+Affkwm8eq48w4EbhCRqKrrvfcvqhPWeBCwa5uvc5X8khiizqg9j7m/dSnY+nvDQWALdutGlOQMECR46xx2uZn9BCgquzoc5mZM8uyBhwfZMNtHOdS4ZyDXM1aXDF/pj/Tz1tQnAWUBkarzzEXi3DLXN3Ai1xjPSjVjOOfoiRp4eAx1D+fRBZi9jicyT4yQAkIhfbJkxdtzAYi8WzJ27rqpbFee2e9UsTv4ZbJGLfnOGWKin9/f4suewwkSYExQau4IJTpTPydLUo0lZVxKIs/NuEHxFkUSaUFPqYVJVCUW8iccr8jngrJPKXmpcEd+HSPb+pHNU0baQK/Jgs+fxjX5Yd7XIoQATbbPLwrJPa7WKVJgOO5m/ZnA0bbMVjicQL7+MUl9hVZ+H9nfIv/QkATNYaOByNQoITNz99A3bRhhz6BvwCFKtQkSsmUl0dkLi9DeAoiny4FWE2p9ri22RKGZu1nat9LZFK0yKXsWvJ+a+KcRgPEYhgSjKTQ1caaknRG+sTb8eg= 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)(396003)(346002)(136003)(376002)(366004)(451199015)(83380400001)(31696002)(86362001)(5660300002)(2906002)(44832011)(8676002)(8936002)(66556008)(66476007)(6512007)(66946007)(26005)(53546011)(6506007)(2616005)(41300700001)(186003)(478600001)(316002)(38100700002)(6486002)(36756003)(82960400001)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aUxQMjdTMlBnSUR1c1IvWTcxQllva1ZyOW1OYVUxdnJrWVQ2UGppRk1NWXN4?= =?utf-8?B?WkNSemIwQnBnZTUzb0xyS21BV2hVQUd5MG8rbXRGS3lRUkpxcmxmOGJYMjJn?= =?utf-8?B?RlpoeW9mUUlTcks1dnNmbUFIWnJUUUtpTDFzTXlEaC9ROFZtbDhueDNqMVc0?= =?utf-8?B?YWMxNXMyWmpxanROaElvY2ZrZkZWTXV6WlZZREljL0YvRW1UNDhVVlZyZUJa?= =?utf-8?B?WlFHcFQ1ZG1ZU0VmbTFLZTRtWEpSdVlRWjRtT2FnbDcxVm85QkcwNHZRZEp6?= =?utf-8?B?NTRYR3FDODFPYXdFZFZXYmN4USt1NkM4MDNJdFVMOE1QRDNNQkVaNEtRLzVQ?= =?utf-8?B?ZTJhZGFoQ3dacXg0QnJ4YktnZzVjWEFWUE1vTHRJUHRTdEE0d25NSzJNREcw?= =?utf-8?B?VEw0a2o1akhDNzlwU1hweFM5UFVHWUROYnluZFIyNjVuY2VTSzZ0ZzVVYXVz?= =?utf-8?B?RWxmRmJMczJ2cmZtK2VhTks1MVlUTjcrTDhkZTl3aGFwQnVhWFFVY1QwMFlh?= =?utf-8?B?dU9JODhKTHBNUjdHNmZNZHM0ZlA3bWVTM0R6bnRKZGpLSGJibm0zMHV3UUlm?= =?utf-8?B?NFdFZmhKWFVRbFo0TDRjdkJPZi8vcE9vdHNaRWdPeEF0V2MwQUZFVS9Zd2VO?= =?utf-8?B?MzRFRW9qc0JBY0tQUEsrY2g1ZjVqTC9Xam9KMTJ5S3ozcExMbkw3U3F4VTI1?= =?utf-8?B?ZjNsQlhrRWorOGhkSjk1aGZlaTJXV3NvLy9KMkI2K0xpZFh5MEZpTnAwRitm?= =?utf-8?B?WmpkZkRjNUswTm9LZWNiTUdUQjc3YStNTXl3RDVWS2k3OS85VVh4V0FCQUdU?= =?utf-8?B?b2F6MWxyWFhoeStoVnJZKzQzY09xcFVjeEtOZDJHU3h5ZE5XZlBjWllDM01a?= =?utf-8?B?Q1FCYzU1eS9VOUhXcE1jWVJRSENuQUNmZkRTQWMwUmNCemNrM1o0VVk5NGsx?= =?utf-8?B?V1k1V21SUzJNN0pDRFM0VUdMdTlpMjFzS3ZKdHBjREliaVQzMTBIZHpZVEo0?= =?utf-8?B?RklBNmJZbDFMU2lhR0Nvakx3NnorYUMrTndyWDZMZ01CMzVQT3NjZ1Z4ZHJt?= =?utf-8?B?VnN4Yjk0ak5HREJZeHVNblFOUXF6NEtKanlhWXVlTlZRWUxMVUdMb3ppMXhP?= =?utf-8?B?Mms3WWRtdHZ6WDNQQXFlRloxdjQyTnZid0JLUDh0K2RDS3BXWVNHWVNKNEhZ?= =?utf-8?B?bThlMXR4bVpHZkh3WFllK205QU9pbWw5MFJTZTF5emFBSUZMbTN6dWk5d21v?= =?utf-8?B?UStvUkdYWlJBejhuenFOdWU3cFB2UTgxWU5GdWRTd3BFd2dVZG16eW41STc2?= =?utf-8?B?bnA3dWFnTW9jSk9jZTFnNjlEVzZDZ2Z0RGo2c3U4QTYrdVA1S2RKankvalIr?= =?utf-8?B?REJsRmN0dDkxTzBpSHlFbjhzOVl4TnFkWUllQjB2WWlObFBYZ0U0UitGUlFP?= =?utf-8?B?b3U0RmJxaitxTEZqa3VPSDlLNlhFYnYwOGxkYXNhakxkM2F0STFOSlgvZ0ta?= =?utf-8?B?SWpRZkt3RjdST3d6OTZvZjE5dmoxSjU0VVNqZEM5Nm82b05uVUtOSXJKdVV4?= =?utf-8?B?bUV2a1NHcGR4MGNhWHBkaHhHaWpJdEQ4cWtFQklYUzZOUTBFa3MzYzg5ZTll?= =?utf-8?B?RXZuWm1LQjhiQS8xekE4WnJMQnhIZGtvRVFDZTUyQlpxaFJQdVBJanJtNUF2?= =?utf-8?B?WEFDdWlSMS9COU5FSnpEdzBFbVFLTzdaRmZrTjhGdFFseERJTlUvY3NSTjQv?= =?utf-8?B?YmNxSWVqaHpUcjdDR3lqUFdqUE9UMGtxNVd5V3hoWk4reDg0cXl4NG8rbWcw?= =?utf-8?B?eE8xUjFGKy9uU1A5OS9tSEdGdUlYR0NreWdMeGUvUVZkUHFibWxoRE9EUjNz?= =?utf-8?B?Q1RIc2t5OUIzSjZXbG5nL2tlV1MrcWl4ZUlRbEYzYnVhcURYTWpsdCtQWDdV?= =?utf-8?B?L2JGMW10dXlJYmJNMG9KS1hsTEZGYzlJQXRXZG9Wd0ZjNFJZRlZEU2N0K3F6?= =?utf-8?B?YlJtQ3NYWUprckhlcjc1Y0thcGg4UzNJZzNlRC9aWFVCZUNtRk9vN3FTRk91?= =?utf-8?B?b01qbnFELzFPbE5EQThhNERVZU5zQS9uUnY3V1hoeWZSY2JJc3NIVTJMOGdz?= =?utf-8?B?d1JFRXdvZFNZTjVscDJiSHNOMWRVbmFIUG9rS3RpbGwyMDVkaEJpWXd5aWkw?= =?utf-8?B?cEE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88d0c727-6786-4dbd-cdef-08daceeef22e X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Nov 2022 14:11:28.8288 (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: HTVgFz86o8rsj0Hi/B3AunSzIvl/2LeO+D+xmRYbNZ81atNG73V1ODH2VDBz+tRPzE0HLRPkR2JsCCKcrTN2wQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR10MB6394 X-TUID: NIv+YIA4a7EE 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 -- Siemens AG, Technology Competence Center Embedded Linux