From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7169469243442855936 X-Received: by 2002:a5d:4f0d:0:b0:242:65d:b750 with SMTP id c13-20020a5d4f0d000000b00242065db750mr8766276wru.367.1669618277451; Sun, 27 Nov 2022 22:51:17 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:d20b:0:b0:228:ddd7:f40e with SMTP id j11-20020adfd20b000000b00228ddd7f40els9648443wrh.3.-pod-prod-gmail; Sun, 27 Nov 2022 22:51:16 -0800 (PST) X-Google-Smtp-Source: AA0mqf6fAgEW/hHtqplJp2Qpuj7lY79VmobOctkE6weYjUpBtBaE7BtnMGnl8RpXvyO808jpyi9W X-Received: by 2002:adf:eb8a:0:b0:22e:31b2:ecb9 with SMTP id t10-20020adfeb8a000000b0022e31b2ecb9mr30685030wrn.693.1669618276217; Sun, 27 Nov 2022 22:51:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669618276; cv=pass; d=google.com; s=arc-20160816; b=lIc5EkV1/fMJTmpSqHiRC6Jrj8uO8kI8TLbSmJj9gulhEp8PYDyRioBxZO9LxqyOSs Iq8KEEiGP8nRAgcdqOUN6MIuzmhE6lesSxAxdEzgOlMloqLD3A40wZk+CaLLdEvwjuV1 aFcwKMTvXFpA1wjXBmYhWdTJJs9IZlLaG2ssqDt0+XuoihOBwfECU8lK1u7dXimnVW52 YKDEhl4T0HeizFj/l7sN8CcSF3rZM0WJ19sLLHr8mF3d2SjpLcW4lnbE6v6krUGqr/DH 0qBugp4KhntuDKdmYwcvJJy4gO7qAHCXlZs/QcULZX6exLLT6ffSwE88ADjyT4UAkRC7 kzOg== 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=al83jTZZP31lIvCSojEdvNWa8ss+NxyL5TQiaPp5dAM=; b=kc9eSrjJZl9evETiUYdP+zq3A/HFEKZT9pnuNmz8pLB04UYkV1gDi/ClZM/99j2fE0 uYoudwkJEswoifIR56Pk+uxrwcKc7lLj21YrztmMBtVAjs1Hk6Qk49YalS94ocJMUAXi /oWXWUYM6pZ8IyhVnzLlFAjS3/88VLol8IT4WuXH9abmncUM6pcfbDWulgtuyAOH/uko /2YKG85bbxIyspjrmclA7FcrCwgorK+aJ59EpCgfgoNJUlZQBs3S+NuhYPH7Ur0VP4jf gG3VpRiFTbCZAF7oKgGN6gZJVtDZWeJ/13Xx5m/jypbis+yv7Jas+2kTbo7juYtr6sNJ tqGQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=S48ZfwcN; 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::604 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-vi1eur04on0604.outbound.protection.outlook.com. [2a01:111:f400:fe0e::604]) by gmr-mx.google.com with ESMTPS id z1-20020a7bc7c1000000b003cf1536d24dsi582612wmk.0.2022.11.27.22.51.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Nov 2022 22:51:16 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:fe0e::604 as permitted sender) client-ip=2a01:111:f400:fe0e::604; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=S48ZfwcN; 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::604 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=J9AJBy23gpmPFSYJlSBOzVYnEhkYxzQsNOTki2twig5zUJ+ZOWIBkpIhIRpZ75R8VRpjHH8cMS+G42Q6oQtmPkT9S0tnUOgwn6gsq1Yfq9qneXDTH5Gr1eYNGTL60DDJyDVzZn66x5tBaGkzcGFQRUewIoEgDoWmsWIJZoN4U6fe2vz0Ed61yNXFitiMlMWu03UcLeZ1I2/Xp4CXww8ztHaJVM+OLMEc6AI/geYoFK8VL84YGTXseKTWh/wk9/lme54vPoCBU8Gjh1gnDjdkHubfyqjeB0Td6YpzQAyKD7QHDjAazC9m3vVuyEwGf1yNrBqtG5pUM8+y7vS1G5l8rA== 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=al83jTZZP31lIvCSojEdvNWa8ss+NxyL5TQiaPp5dAM=; b=RGPz/mXKHM0I6hhJtCmStSsmEkFI3BLoP6jQT1ImsfEoXY3fiym04ABkC6CJHJNq4C5vokf0lh+nKmahZFaYya7rOCykXuNjJTEUm+n7jyeJiXWY9dN07WYRNvfKCcUg0n5TrrNlyCVrMUuxlMAGsxhQ6X5C6zC7IVWoM9XTrXW68Mu61z54cq5EIS5Er/GCJmLQOOSO5+13eTl+vzhZnUj3jw+MW2QkuG5NBR7bM4s87P5TxfAP/my8l0/P1f3xm+9q4XSKRpfDUut7UydjKzFYCPQgX7CoOnOood25wmCR/udfgrOGg4N3sQgrQmj5q3Xhf8cWhlOfZEyIirjDwA== 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=al83jTZZP31lIvCSojEdvNWa8ss+NxyL5TQiaPp5dAM=; b=S48ZfwcN2IPx7pkI3MJz8bwRJii1sk5FgmEWOfCVPjeZWtjWfxatfkaPn187IXSsQ9qwIiulA1ZMjEK2leAIs51gPBJMLLoAfcenzsS9538pnfUYzIN8xDJa7GPdbW1bI+29epDshEzxjlIH33eyNG8TDVw8Qrb54bq75JIYrllw6EijVrzHfObvlhhMffVhCjy6ghay5/reQkfiyOX2iBCp/YPQ9ibGUGGNAuriBD+6rm3Pw5/Q0sTpNFo/W8WX53S2RprnTLHPQsNl+Wckbilp+p2W96l5wkfZ8DdqelB2F9VN5IoZYQqaqCogpxp3b4SPQB8LGJGkecTRMJ4I4w== 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 VI1PR10MB3486.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:800:137::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.21; Mon, 28 Nov 2022 06:51:14 +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:51:14 +0000 Message-ID: Date: Mon, 28 Nov 2022 07:51:12 +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> <2082143.9o76ZdvQCi@home> <3464852.dWV9SEqChM@home> From: Jan Kiszka In-Reply-To: <3464852.dWV9SEqChM@home> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-ClientProxiedBy: FR2P281CA0178.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9f::7) 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_|VI1PR10MB3486:EE_ X-MS-Office365-Filtering-Correlation-Id: d3b0e231-b31d-4318-968f-08dad10cf165 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c0U9hZWBiNXYetdOYiMwdTp/eE/jRPc5ZY+btOaGKNrTNyJDOwK5/czMVFpkkfbWoDukjRex5aeC7BuixEeb4VNqDVg06ubV1cWc8LwNScMWrz3qBzYOWV9j2ALpDYRvnz8Cggx6EQOWgeQJU5K+xY8btcVrsu2J2bb3GdQY65KUuEvGNel7+v/6Vvn65Q/TC/eWq3YxVlGLuj8ACqHi2gFWPNFVuMA79bUL+QsgDEo4p3Vc1tv1TovMpOSgDM2sf7U8oPITRlEcC4ML4IXa9Z36kT2M8kaBgRdVlpG5oTYZeIgIqii1HmKhwEoSgAonDxbj2k1hmhrdN7RZ4jxs4/MMC900rPIkpIXLePcu5R8UY0abenxTIZpWFiSajjphYpPU8K0ufeHtqse5A39Iip6ACJy9tkJUu+Vzy4fKxYYmL0z7tXof0NDV/LcssbweoNBMd059R1m3kKyOqNFZoq76orVixLoIC5mNGUcK8CmSuTzInmVBANA3agUZ9/PTzY3fbkgeolAaE62JNfN+N6T5cVjqZpQmnzPGSEEyHc1W0PCfvbwwW/EpMf0DUrHKcRK2NSjb8OUzf/HWXEyFrYdXuDBXTfqnsNWXpTUcikYDsymTWRb/A+0F/6TLW2ZA93xSw5MJ6Zp8/lZJz25M2QNcn7JBfjbk1xJBruOXnnZ4rD0P55HX1kWIZ1ey0x7kliv88FnA22dZDGCh4e0V1nGm+tUyeoQlPtVPemgkgT8= 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)(346002)(396003)(366004)(136003)(39860400002)(376002)(451199015)(2906002)(44832011)(30864003)(31686004)(41300700001)(5660300002)(36756003)(316002)(66556008)(66946007)(66476007)(8936002)(8676002)(86362001)(6512007)(478600001)(6486002)(6506007)(31696002)(2616005)(26005)(186003)(53546011)(38100700002)(83380400001)(82960400001)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cDM3ZmNENVkzWTFTSnZRUWtucEFsWmFOMm14VDI1V1JOMHFqbi9YNjIybTNj?= =?utf-8?B?TXVjY29haEx0QVZmeFJ6bEFmb3lpZ2cycjBUaE13am5VLzh4aHdKUWh4NjJC?= =?utf-8?B?MkdMOWRKNnh3SHJPV0hiMW9nSTk1ZkJjWDRrZDhEZkdEaGkxaEwyNWZKWW1S?= =?utf-8?B?bnVlNTMvNDR1NmFzVEN6TnN6S2YwWWd4UzRJWFdhb3hTcktEM0R3SC9CYitl?= =?utf-8?B?SzZmUGRmNHo2amFWeTMxQ0J2S29MMUlwNlJVczZKNVdIbmR4cDAvN1YwaWN4?= =?utf-8?B?b0Rmak5oRGV3QW5Vb0daUmQyYTdaNnN3SFc2VTdNeGZtWXoxVitSUXdab2pl?= =?utf-8?B?T0UzaXFaRFluZnN5emJkQjkzczdrbnBia2pJV20vMy8wSVdkOXRNNDVHU1JO?= =?utf-8?B?ZFpKTW82Z1lFTFRnemtYWDM3bm9YbUZEVkY5NGdPeThPS3pjN2dUUXNvYXpt?= =?utf-8?B?cUhDcFY3WWpuVk1MdXhRTmhtd3JWODRtS1p3T0Jvbmk4VG1jMUxnakZVNTlF?= =?utf-8?B?RWZJdkZDMzl3ei9nWDgySmhxV2tkVnQyd0lWNGFmeHlLbk1zZWRJeTFxemZ3?= =?utf-8?B?Y1VNVHBxZnNmdVZKcEhkUnlMVUhTNUtMSmVWSWd1dHZjYVpLSlVZSWJ4MlhT?= =?utf-8?B?MmJRSzd0QnhkaFd4Nm5FbGJ3cGZSWTN5QnpBZVV4WUk4clBHYUVvNTdYdWJv?= =?utf-8?B?SklFYm52c1hOMmNtWXk5N0VicWY2TEpybGt1RFVtOEVNbUNyZStLdXhabVFZ?= =?utf-8?B?UjJKYmdIZmRiMmJscEE1TGs0TTlId0t6VmVtUG9ic2FaaVNha01ITWt5ODNw?= =?utf-8?B?YmIyT2ZwWHVtYlNpT1lFaC9YL0hxR3M1MWtNbWxTTzJ1UnlpOGVRTDNvMXRZ?= =?utf-8?B?bnZHelIvOHNPNEMxc052dnYwUFpHZ1h1M2I4TVl0OVRsQjg2VEhpVDVTUkI2?= =?utf-8?B?UGlISXowZDlXalNvUFhyYkxibDV2dGF5clBSNkl6bDQ4VWtnZ05RemJienZM?= =?utf-8?B?SkdEdlMxSDFFT09uRUcvTVR6cmNSN2FLM2RoSzVMRnJnQ2dNVFFhMSs0K0Ir?= =?utf-8?B?OVNEK2pkWkFsbHVPdmc5SzZlRFFNZ0REUjljWFgvc1NrdHpYUGVrNWszU24r?= =?utf-8?B?c2JkaSt2Wlp3R3JSdzdoSEpKb1JiVnF4R2h3N2cyWkpqWDhaUWFOeWF0cS9C?= =?utf-8?B?S0h3OXpUcW9oK2VSVVR5c3hodEprZTJOT09tQXFEWnkvOVMrVjU3Y1ZQYVMx?= =?utf-8?B?TUFtVjJFS1hVL3NKTy9wUEwvd293ZjVGNjFNYWE2L2oyUDcwOHM3MHlMckRu?= =?utf-8?B?ZitmaVlHT0xodk5QdE5wVlU2RkhuRDV5bFM1NDVoSWpzSmRsU3JqMVU2MndU?= =?utf-8?B?VmVYaVJaTGpOZzdzVzl6MTNHd2xycCs1UFg5YmlYdXd1SFdSdEU0NE82aUtE?= =?utf-8?B?S24xTDUxN21mNHVTU2k0bGsydHlQemp1cHNhenlQeG9nSGxhdlQ4ai9tdkpB?= =?utf-8?B?SmowYlcxLzhrZFFNK1pmUDNMRFVYZVhZNTZEUEZRNmlJMUZPL1ROSXlhaDRH?= =?utf-8?B?bGRLOFc0KzdiUklBdDFXZU9ENmdidlFISkpEZlhUZkp6bXo1bWl5eDltRHZ2?= =?utf-8?B?VHdUcHlTUEhJRWlCNldjVUZRQWtrTVF6T2VoTUFHZ2ZnaHBlVDNFTFAvVTVm?= =?utf-8?B?bTR0YUhFOEtwbFJJV1ladEVESVAxcytNZVh5Ymw3T2lwR0p0Mjh1Y2g3R1V5?= =?utf-8?B?RU8zTVN3MmRYKzllNVZ2N0hReXUxZXQ0SitUeFNGZGhIYk5lOVFnTUVrem4w?= =?utf-8?B?dW1pTlkzYjZzOGpTWkJ3TjljRjRHZEtLWnhsN3RZVC9IQWhvZWlDdStScjFh?= =?utf-8?B?UmJVem1ZSG94dVU4eDQxVDYwUXBYaTRBQTM3enI0SHB2WnFSeGpuRFRLbjds?= =?utf-8?B?d0RPaTdYS0NsU1FHYXJKMExKclYreXZSMVd5WVJjMW4zOHR2UzluNHZOVUJp?= =?utf-8?B?U0hVU2JIdnhVc1QzVlplTThFR2wvMGpEcklkTjF5a1JPYkxnSCtyZUdJVzlH?= =?utf-8?B?ZEpNcFBJNlRnOVFXaFRkdWdVMXJjVzIzMVdVYThhOTZibHE0Ry9jZGdhakhs?= =?utf-8?B?L3Zab1RNSzFkQ3hLK29DWHpPRk9NdkJoM2MwOGlpc21yTFhIcUlRalJ4NzRU?= =?utf-8?B?MkE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3b0e231-b31d-4318-968f-08dad10cf165 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:51:14.7063 (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: g0VBQKXWkunbE6cDhIVgMcpPXFFA6pQI75PlhVL6cIFZA2Z86oGYieuc9Xdqp6/57urQ6EUNmsctu8riekPUrg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3486 X-TUID: PUi2cUOBCNNM 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/boot >>>>>>>>>>> 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-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: >> > > 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 -- Siemens AG, Technology Competence Center Embedded Linux