From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7231094895937585152 X-Received: by 2002:aa7:dcd2:0:b0:531:1241:3e98 with SMTP id w18-20020aa7dcd2000000b0053112413e98mr1565127edu.9.1695808974044; Wed, 27 Sep 2023 03:02:54 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:c502:0:b0:525:7601:f44e with SMTP id o2-20020aa7c502000000b005257601f44els129844edq.0.-pod-prod-09-eu; Wed, 27 Sep 2023 03:02:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE3Na+UAgpx1L0BmIJRv5b4qrm6gE8KOUd8QUhwEw1hC1wrSwNBXeYAvyS46+UXpESF+9e2 X-Received: by 2002:a17:906:32c8:b0:9ae:711d:7e03 with SMTP id k8-20020a17090632c800b009ae711d7e03mr1141903ejk.15.1695808971767; Wed, 27 Sep 2023 03:02:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695808971; cv=pass; d=google.com; s=arc-20160816; b=tDK19Te871OnVVJkXwcKk5dHT0j+ai4sDmUBpTG7s9YDsTJJSKsZjDpX1y1n7qQsJi /GAuGo25kkDdFIE4wJPXJjJbfc28HZTs9A2nsZorROnbAmB9XlJtQIKstN85nAHHuPWO 1atTXgRvZat1WlyaQ0gBXHeYwo+jGntP5UV3s5+iGCtNltA9eEjWPvUvTx/NqDrVsfx7 YkTAsdY4KsA6PJwHfmKtHHMUoxAKF4zPLw42/W7y7doIYJKdGF1H7ntW8ockThb8oPyj nH9YqbC/OrEra0ZtSumHM9RtbMAClOLdhbESmxeATbKXf0/eNpIOGxsSB8Li5eTGBsZe aFCQ== 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=VPDL+FEFdNS33HqXqdkMI1P/qDYwTrB+btH/C+zRX2M=; fh=Ya44QEZijmGwi3iM06vY2ri2uPgFJ4O2CEdNzu8WM0o=; b=mn3RJyQkJB99lsejVUx/xgdT6HeHXzTF8AoNMG1WnNiDmn/SLIF+Tk/jnnalmXqTLU yFw81YtSXVuWL0mkq8EJr4aC+XkzgMKKjRDUvM6auD5Wm7vXxX11rqJ+OwohRBSESdKr 7AQIThJLEOVitxnaF0RUBdGwQilXudxkvwGQ/+F2811Pd7A5W+XpQaXIL66JLPPJXsGm FzqBo9i0Pw6neDPpFcZQCZ3tfvnUgLXgudeTq+mKkK+ZdeQqk2tydDMa68HtCIjtRvI9 er3a43oykaNzwFk3pRWrkdSpr+sJczI4UaGJx3G2hIfzi05RepTrLXVla0Gg8xZ6xWkP xOxg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=B+GZaNDs; 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:7eaf::604 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on20604.outbound.protection.outlook.com. [2a01:111:f400:7eaf::604]) by gmr-mx.google.com with ESMTPS id he43-20020a1709073dab00b009a1ed579113si914502ejc.1.2023.09.27.03.02.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Sep 2023 03:02:51 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7eaf::604 as permitted sender) client-ip=2a01:111:f400:7eaf::604; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=B+GZaNDs; 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:7eaf::604 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nc5J0Nbqf+huZ1qs8s7DuK8FnilD1xRYsq0Ng+pVfRypEyAYAv+fA7VpIVM8Kr50pJ3+53oX4Rq2X0yCLmMGYylvK1Es2XYEbQoE22iRKziLp3cLkqtd7Dnt9cCBommgCTqkzlMoyAsuUXIN5DnM8E0AobeuNZ71/3Fd/fzoRt0w+7AtUrmL4TjHaul709VFm1nQNVhRV4qe3/KTDrK0+3oMBxRfWarKTrg2lhmyQcrgFo+tWmvUmkvu8u7hbqMFt9sD9j0NPIVp6JZi+9+E7PETvpt62mI+vtLfwuIHA2gGBnVEjh01km+GeqIjl9zYbspO6XiOpoLB4CPpCEB1LA== 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=VPDL+FEFdNS33HqXqdkMI1P/qDYwTrB+btH/C+zRX2M=; b=Samy4vrt6a12a7JAHvmxZeJOpGyd+X78s1yZ7JTL/yWU5t+h59NONiCM+ysuHAAnHoJTcDvYEJWNSB62u4h+NdOXCPG+/6ayWShvfNj2Z+Qa0c+PuU2xAJX04s+a97pOKZKsVn2jjHXLbekCyJcb7y1IxhsX7AD9dtChELVvH/4bITiTusPayBj2SzdazYfHeVN4+H7RBdLln5bpJjM5U7LRFByDwoydeHSf8OiNUXewu9YWFMu5knx65SlKlkLWcHlx6oFUEWRzvkHZ5/yu6/f2WvIjYiajhrUP4GXwVuSBJfnurm0KRwhyQO9hhOZ0iwvVGaoqdavrSZOmLUF6xA== 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=VPDL+FEFdNS33HqXqdkMI1P/qDYwTrB+btH/C+zRX2M=; b=B+GZaNDsKqx5yW82nl4rBgcYjDVQRkNEwKWVgiR34Nu8gq2n5a1ounYGOvM19xxxSGqXfA8vxR8ijUT7HE9/amfZ6/QWLAvIpXtLd54o5+pjc4FYnKCQIVVb49xsWacqzVmp/qtPuFnbyDW6TxV/Rdf/0Mx5gLWnv1n8bZCLAHPoNAwhotcdK3heQ2ZJKpcVm+sxtWXIA8NWOWMDAo32ZemRJBG3AdvtQoMhjBno3KXtQXcybdWOTNM9QSkfiCZOET/oy2LkRctYbm8B+cQSM5z3RXAVbReVIHoD4xQaRlekn3IEW2RHm2e7yRmtSiTNhhZyhGoFLellhBYWCTkCsw== 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 AS8PR10MB8016.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:52b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6813.28; Wed, 27 Sep 2023 10:02:50 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::7f20:d403:b43d:12e2]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::7f20:d403:b43d:12e2%3]) with mapi id 15.20.6838.016; Wed, 27 Sep 2023 10:02:50 +0000 Message-ID: <09f6e98e-a386-4d9e-bac5-821d4ade2489@siemens.com> Date: Wed, 27 Sep 2023 12:02:43 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 1/6] meta: Switch to mmdebstrap Content-Language: en-US To: Uladzimir Bely , isar-users@googlegroups.com References: <20230927043320.6264-1-ubely@ilbers.de> <20230927043320.6264-2-ubely@ilbers.de> From: Jan Kiszka In-Reply-To: <20230927043320.6264-2-ubely@ilbers.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH2PR18CA0007.namprd18.prod.outlook.com (2603:10b6:610:4f::17) 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_|AS8PR10MB8016:EE_ X-MS-Office365-Filtering-Correlation-Id: 916d8437-e142-474e-0231-08dbbf40e873 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: E7f/c7i4ATsqJYnzv83Y3elWZPba3JeebEUR90axbfablDUeoUZlDL6a5ZCDL5xeFUkUYnVcbRZL44v5MhabPBYQdOH9WqZE0oF3U3olVqqU4DRe3BZ9TEo7zfC2tUbe5VqSwtvnmif4SBS+K4bE8UYdPCpM0TLuePUOIU76Tuxfqxy2j7K8Nf8se3XOXk9bxzYfGhBTDqqz5qV6ys8rE9lH5eT5VfIPITAeM2o2tljHH8gt7lcZ4LIt2dyg5i1q0iUTBsButJRQ6fsrYAhtxSSYOvMjHgH3NPzwWBZTy5JIbsInCYBI79EWQgaEw97BZ/VNhV8AsaNNTqqa7PuPFTsV4pKFqa+OGgL44x3l3wYL1RcCl3dLFiXVs8EumpClwCxviL7ClOoe/wtSeClsibEuOYbbUx7CKn/zjnmEEYOxnpzxslRejhrHh3L8YAas2pFZy3+L9hUI3UfPSN7xLUuS54Z7ecsvNvCjlkxV/DNnoGLlRQlGa0K3fAJgCbNfA7fU9Hmnxv79wazGmMeQaghCl2weR3Rmk8i9VXhLNj/FX8LJUJ1LB17T/6wokBLE0CcN9mD7MOOISsyrZErNX3ARKsoc1A/sLwC5DCjh3LNGEukVWDLTX9lgfM4YMN6AWlllLWV/1e6yrm8q8Ji0bA== 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:(13230031)(376002)(39860400002)(366004)(396003)(346002)(136003)(230922051799003)(186009)(1800799009)(451199024)(82960400001)(2906002)(83380400001)(6486002)(38100700002)(66476007)(478600001)(6512007)(66946007)(53546011)(6666004)(6506007)(5660300002)(26005)(41300700001)(66556008)(8676002)(8936002)(316002)(44832011)(2616005)(31696002)(36756003)(86362001)(31686004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?azZLY1BrNm1iMkdUclFNZ1lyQXJyT1cvTjgrcVY2eW1rSThrOW5xSi9TVW1B?= =?utf-8?B?S1pyUjVDV1Q0TXZsQmdQRUZYbW96QWVSY0FySWRiNzk0ZVFXUFdGN2I4RU1q?= =?utf-8?B?b2RXVVBYU0IyUlhGbUZCVmJscitYZWZLRWZIQUZJbGI5TFR6UEFZUFVodHJF?= =?utf-8?B?dUNpdzdIOVpzRU9HMkRuWVBFRG9YWnJzSDdQa2p0ZnQ5N1M4SnRseTJWSDZI?= =?utf-8?B?OVhjNEdCT3dZNmY3NjF2VE0wZHpFZzNaNU8xbXl2TWQxRjFIRGlZSlU1a2dG?= =?utf-8?B?QlY5QlI3YUtDSmlBRkZwNFdRLzZzeCtOWThSTllVanhjUTNMMkFmcTZrbVZo?= =?utf-8?B?V1A5TWcvUWpBWmZXQ2w3bzh6b1RIV3VxK05leXZkTlFHV3EwU1NFV2doRW1k?= =?utf-8?B?ZFNHWEpHYXU2MUFFOWRGWjg0eTVmQWJHNVRqeHh3Wjl3OWRaTGU3dmtJRkdx?= =?utf-8?B?QjQ5alRJWUM3cWJwZHRha1Z1TW5zUDVXUlZrRUZEbkN5NmtFNnkxSTBVSm5h?= =?utf-8?B?MWxOckdzckRXS3NHbVBXcnZ0M29qMXo2U1JEanZ3aXFCOXdFY0EvL1pYbGQy?= =?utf-8?B?K1dYUTBXb3gvQ2g5bmo2SzY2VnkrUzA5Ujh4eTltaysvRVF1Z2svL2VJUm0x?= =?utf-8?B?ZXYvYUV1dE82SXM1RmF2bTc4eE9Fby84U3NuZmRMcFJsY2tVZWtCbEw3M3Bt?= =?utf-8?B?SkVhL1BUTHV1K2tXQUhDYlF0ZEFWRUcwT0tZTkMwZ3BXSHNpQjBiV0JlcmU5?= =?utf-8?B?M21aQ3dtbENQZCtiNlkwUDZqTURRaG83d3AxaUFsUHJacUFQT1dqNXhic3dN?= =?utf-8?B?Y3VwRlh1TkhSanQvWjJFYWZocHNmU0tjRlVJSW9JV2p1Q3F0Z1hmdVphSHQ3?= =?utf-8?B?bU1ISytXUEI3ck9BL1Q5YmxhMys3QlVZZVBQZ01Lb1cxQ2FibnUyVGt2VWgx?= =?utf-8?B?cHhDUnFpaGg2NHl0WktSRkwyWVVpdVpIcHhkQVFMY1lTYzh2ckJtSjQ1OGRJ?= =?utf-8?B?VDBEMWhsdURGNHdWSVpBcG1KNmZFODZjZCtrSko5ZUNPWUM4U1lva2NDMlMx?= =?utf-8?B?dFJtZWxjYnNQdWlsZnNXVEpnSjcwd1g0cWFHVDVXbVdTKytoWEoxazJhSTI5?= =?utf-8?B?UCtaRldSc255TDBWUDIzVGM2UHRhVjBCZVUwbEJESUJZOVdkeHNydHdjN1c1?= =?utf-8?B?NVNBYW4zNThRaHBtbFgxMkN2d205VHlNNWNsZHBLa1VaSnkwV09sR3lhajZ5?= =?utf-8?B?NG9IOUttV1dJMTZQMTV1Z2hpUm9sTWFDYS9KenNrY1VTbEtmVnNQaFZXMEVn?= =?utf-8?B?TkNEaVZ6NHhaNWVJUVZiMG4wYmFHTXFtZ012b0tUU0dhVjJadkRwbkwydTJw?= =?utf-8?B?UzdqWkVGNld4Tk9BVFR0S3FDQ0lna21ndEoyT0oxSEZ0R0dWeHZ5MGwveWxY?= =?utf-8?B?R050TVg1ZEh2OE84Yi9wQ0ZlaG4yWWpLWkRnSXIvQU1kSUJHVERQblc1Uk9Q?= =?utf-8?B?TkpRMG9VdFN3VENvSUtnTUxMU2RVbm5YL2R6NjdzVE9pUmUwOXFDT2t0OTla?= =?utf-8?B?Tk1iM2VRRnNuU0trYWNMUWp0WmhlOTdkQ1BHSHNNVG5Bdk92OHZCM2YxaUM0?= =?utf-8?B?RTVBYklmd3FrOHVlS2FJREZkNEhhbjNHNEg2MUIzZytQSzhOdmQ1Zkg0alFj?= =?utf-8?B?bFBOQ1JGOEMyV1FRVSsrYkcvdURzZEtZVjZwVC9NNUN0dnVVL2htaW1RKy8y?= =?utf-8?B?eFNnNnJQaWZLS0tnZWRYRTU4R3B2bktoU2MwM3dyM2Q4YzRHMGtyRDcveFdD?= =?utf-8?B?TUE3aDZxRG53V1R5cVAyVlJEcmZSSnNRb2RCeEVBTTZ2MW8xckt4eXZoSzlh?= =?utf-8?B?aDR3SlBlT1NyUE9MNy9XbEZ6U2tCMEhTWVdsTmNJc2lIb3pzb3ZRcEE1OEs2?= =?utf-8?B?NnZqS2xaZHBidC9lQnZzM29yNnBDWEpoa3A3Qm5HR2FWbjlGZUhXUGh6WkJo?= =?utf-8?B?OTN0dUtJZno4ZS8wREpPZTQwMitaV2paZ3RwOE9tNUdscXFnNzhOZ0d5UDA1?= =?utf-8?B?a0ovcTlHNTZuWi8wZHU2NWRhRFZ1b0Y5cjVHeXVTV0syWlg0YnJobU5seldk?= =?utf-8?B?TGNOYVVhMXBUR1hRQi9UMGpreTBjQy9DMmQwbTJhZC8zb3JHSTJJdlFzYmZk?= =?utf-8?B?SFE9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 916d8437-e142-474e-0231-08dbbf40e873 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2023 10:02:50.7137 (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: zk7CPYN+wdwEhnLFqd5Vl2YI2xenWERnSLRWZxobzZnqGFW98KmDDmhVCITegg8EWhgS/XXbIcBz5Ub7+ODAIg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB8016 X-TUID: KdtoFNhyBo8t On 27.09.23 06:33, Uladzimir Bely wrote: > Instead of debootstrap, use mmdebstrap alternative. > > Internally, it uses apt and allows to debootstrap the distro from > multiple repositories. > > Signed-off-by: Uladzimir Bely > Signed-off-by: Anton Mikanovich > --- > meta-isar/conf/distro/ubuntu-common.inc | 4 -- > .../isar-bootstrap/isar-bootstrap.inc | 57 ++++++++++--------- > 2 files changed, 30 insertions(+), 31 deletions(-) > > diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc > index 6a990a89..afe96b73 100644 > --- a/meta-isar/conf/distro/ubuntu-common.inc > +++ b/meta-isar/conf/distro/ubuntu-common.inc > @@ -18,10 +18,6 @@ HOST_DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" > > # kernel package name is linux-image-generic in Ubuntu > KERNEL_NAME = "generic" > - > -# that is what debootstrap_1.0.118ubuntu1 does anyways > -DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy" > - > DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" > > DISTRO_KERNELS ?= " \ > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > index 3477c2fb..637018c6 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > @@ -15,7 +15,7 @@ PV = "1.0" > > BOOTSTRAP_FOR_HOST ?= "0" > > -DEBOOTSTRAP ?= "qemu-debootstrap" > +DEBOOTSTRAP = "mmdebstrap" Is it still useful to have this variable, or isn't the code including mmdebstrap assumptions anyway? > ROOTFSDIR = "${WORKDIR}/rootfs" > APTPREFS = "${WORKDIR}/apt-preferences" > APTSRCS = "${WORKDIR}/apt-sources" > @@ -23,12 +23,14 @@ APTSRCS_INIT = "${WORKDIR}/apt-sources-init" > DISTRO_BOOTSTRAP_KEYFILES = "" > THIRD_PARTY_APT_KEYFILES = "" > DEPLOY_ISAR_BOOTSTRAP ?= "" > -DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales" > +DISTRO_BOOTSTRAP_BASE_PACKAGES = "locales,usrmerge" > DISTRO_BOOTSTRAP_BASE_PACKAGES:append:gnupg = ",gnupg" > DISTRO_BOOTSTRAP_BASE_PACKAGES:append:https-support = ",ca-certificates" > 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')}" > +BOOTSTRAP_DISTRO_ARCH = "${@d.getVar('HOST_ARCH' if d.getVar('BOOTSTRAP_FOR_HOST') == '1' else 'DISTRO_ARCH')}" > +BOOTSTRAP_TMPDIR = "${WORKDIR}/tempdir" > FILESEXTRAPATHS:append = ":${BBPATH}" > > inherit deb-dl-dir > @@ -267,7 +269,7 @@ do_bootstrap[vardeps] += " \ > ISAR_ENABLE_COMPAT_ARCH \ > ${DISTRO_VARS_PREFIX}DISTRO_APT_SOURCES \ > " > -do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP}" > +do_bootstrap[dirs] = "${DEPLOY_DIR_BOOTSTRAP} ${BOOTSTRAP_TMPDIR}" > do_bootstrap[depends] = "base-apt:do_cache isar-apt:do_cache_config" > do_bootstrap[network] = "${TASK_USE_NETWORK_AND_SUDO}" > > @@ -283,27 +285,31 @@ do_bootstrap() { > if [ -f "${DISTRO_BOOTSTRAP_KEYRING}" ]; then > debootstrap_args="$debootstrap_args --keyring=${DISTRO_BOOTSTRAP_KEYRING}" > fi > - if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" -a -z "${BASE_REPO_KEY}" ]; then > - debootstrap_args="$debootstrap_args --no-check-gpg" > - fi > E="${@ isar_export_proxies(d)}" > - export BOOTSTRAP_FOR_HOST debootstrap_args E > + export BOOTSTRAP_FOR_HOST > > - sudo rm -rf --one-file-system "${ROOTFSDIR}" > deb_dl_dir_import "${ROOTFSDIR}" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" > + sudo rm -rf --one-file-system "${ROOTFSDIR}" > + mkdir -p "${ROOTFSDIR}" > + > + if [ ! -z "${SOURCE_DATE_EPOCH}" ]; then > + export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH}" > + fi > + > + arch_param="--arch=${BOOTSTRAP_DISTRO_ARCH},${DISTRO_ARCH}" > + > + sudo TMPDIR="${BOOTSTRAP_TMPDIR}" ${DEBOOTSTRAP} $debootstrap_args \ "debootstrap_args"? Should probably be renamed. > + $arch_param \ > + --mode=unshare \ > + ${@get_distro_components_argument(d)} \ > + "${@get_distro_suite(d)}" \ > + "${WORKDIR}/rootfs.tar.zst" \ > + "${@get_distro_source(d)}" > > sudo -E -s <<'EOSUDO' > set -e > - if [ "${BOOTSTRAP_FOR_HOST}" = "0" ]; then > - arch_param="--arch=${DISTRO_ARCH}" > - fi > - ${DEBOOTSTRAP} $debootstrap_args \ > - $arch_param \ > - ${@get_distro_components_argument(d)} \ > - "${@get_distro_suite(d)}" \ > - "${ROOTFSDIR}" \ > - "${@get_distro_source(d)}" \ > - ${DISTRO_DEBOOTSTRAP_SCRIPT} > + > + tar -xf "${WORKDIR}/rootfs.tar.zst" -C "${ROOTFSDIR}" --exclude="./dev/console" > > # Install apt config > mkdir -p "${ROOTFSDIR}/etc/apt/preferences.d" > @@ -406,19 +412,16 @@ SSTATEPOSTINSTFUNCS += "bootstrap_sstate_finalize" > > bootstrap_sstate_prepare() { > # this runs in SSTATE_BUILDDIR, which will be deleted automatically > - lopts="--one-file-system --exclude=var/cache/apt/archives" > - sudo tar -C $(dirname "${ROOTFSDIR}") -cpSf bootstrap.tar $lopts $(basename "${ROOTFSDIR}") > - sudo chown $(id -u):$(id -g) bootstrap.tar > + sudo cp -a "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" ./bootstrap.tar.zst > + sudo chown $(id -u):$(id -g) bootstrap.tar.zst > } > > bootstrap_sstate_finalize() { > # this runs in SSTATE_INSTDIR > - # - after building the bootstrap, the tar won't be there, but we also don't need to unpack > - # - after restoring from cache, there will be a tar which we unpack and then delete > - if [ -f bootstrap.tar ]; then > - sudo tar -C $(dirname "${ROOTFSDIR}") -xpf bootstrap.tar > - sudo ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" > - rm bootstrap.tar > + if [ -f bootstrap.tar.zst ]; then > + mv bootstrap.tar.zst "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" > + sudo ln -Tfsr "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" \ > + "${DEPLOY_ISAR_BOOTSTRAP}.tar.zst" > fi > } > Jan -- Siemens AG, Technology Linux Expert Center