From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7231094895937585152 X-Received: by 2002:a7b:cb86:0:b0:401:519:d2 with SMTP id m6-20020a7bcb86000000b00401051900d2mr1356471wmi.23.1695809285707; Wed, 27 Sep 2023 03:08:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:22c9:b0:405:34af:8896 with SMTP id 9-20020a05600c22c900b0040534af8896ls1465433wmg.0.-pod-prod-06-eu; Wed, 27 Sep 2023 03:08:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE8bDdbAqaiukq30W9x9pJqei2Yopmndz+u7B2i577nhb0PezoPbP9uGf7WqbPIHBApVzvO X-Received: by 2002:a05:600c:b5a:b0:3fe:ba7:f200 with SMTP id k26-20020a05600c0b5a00b003fe0ba7f200mr1473749wmr.20.1695809283600; Wed, 27 Sep 2023 03:08:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1695809283; cv=pass; d=google.com; s=arc-20160816; b=g8uYZUDXx60MOyoxPeZi+OZt4QMhyT52TGSD11SnfUS5ps3FopihWkS+toOgG0PeRY CfhzUWYTD2qYK/xvOcYiPjQxBiWp8wuSFy0av4QajE8fy1OKQNSBLC8AFGKXqBUDYwng FBKMBY4s2ffrlSY2VlzLkk0QY9ewy1xiI+jm60aI/zAoz0cJByTnpdc0b6QjJWOpKkHv VLrbBqzf7K+iZrcyEmK76OenzECs8m9SWwt9+AdGFPLVEHQantg4CLeS5yLujUZxRbJE AwFcSdCKPb4SdUZI9XwXpX9ZoHvpsKC32rZ7N9LjjuRpaWlg876PIjBNtG8RalcYhjca wyUQ== 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=G45ofjwk20Nx9lqaJgz0DexSsS1qC/0ShkNBCoH7yAg=; fh=Ya44QEZijmGwi3iM06vY2ri2uPgFJ4O2CEdNzu8WM0o=; b=OvVa1nsNCmr7HjaxC7OC+EfVDiQzA0VRZzqeTufmXm3FgLARe3zyJjzs8oPcc46Va5 Xw1xbZgZMYsN9+1KtjFb+sZQYs4jdNqLaK90bn8bgWHjZWm994/JvcMHwTi2sc2qVy65 AnuyWoxiRPiY9L/VR2TzYJnCdCl/jLSjxv4q8d+fZBDUcMHv0O5rjY7Snr9TBwJdW07l dfmGVmwkyD2vwTJthGuGjRr1/mrhR2cDPhyYyC62GP1S2J+EzXH8tp7my74NJBgd2a2L 7q8FmssEyEevEAmsRRupUYKl03EbId4V5RFeyArwaCThbckjrtZxgfZ6ZRodpKtncG5O 8KRA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=s2tN286T; 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::623 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-am7eur03on20623.outbound.protection.outlook.com. [2a01:111:f400:7eaf::623]) by gmr-mx.google.com with ESMTPS id j13-20020a05600c1c0d00b003fef434e6a5si84437wms.0.2023.09.27.03.08.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Sep 2023 03:08:03 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7eaf::623 as permitted sender) client-ip=2a01:111:f400:7eaf::623; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=s2tN286T; 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::623 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=ONS7YpdLRdYWi2Un17T2pg3EIZRUXG53asRaXhjSAZ6ef/li+OKkAwNKAkWF7xkYCdiu5y7FQMYx5qfVjG26kAza/WgnhzyCsaFGWvJCtcIFjWgouT9ddmLwUhiri2bAW6pbwn3HButHLrKBg9Yc6kJ+Lpi5Ia6A/x9nfLXuwjdVZ+eTGs7iuq5PWLLuANYFoSJbFobKFdBV4+U4ybU32yl4y2ZSN6sFTXWmtbVL2wX1r9vduggV6Ib5HSHfbcQDxpGDadufOvftrcDaiPnmTwu7wxTp4N5UYZJUDgqVhznNC8Ye+Bi5lywG11armQJWalFPgBWIbYLPXEXSA0Lgdw== 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=G45ofjwk20Nx9lqaJgz0DexSsS1qC/0ShkNBCoH7yAg=; b=dRdoQYX2TRNFD5mcaCyIRvB4JzUOTYbqXR9zU66N9duLQ1QrT0fJbT33/HBtpXtpwKFKzjprlpZOLJNxgoCYnq51McNgjMDXWZoGnRJEBQlXZ3TT4VN4safw1owi+2Diji8V24i2PEWtystFzsgcIWWIYs+erAkT9f/WL1X7QXDm2wkArfZbkJyX0JbrvzzC0tCIsjzcDa3D7Xl4jH8gfjGioGbbswe7j8uz1UDPToGCCLIn6nXrkmZFwtKqGcmtzU815f9WEZUOr7FDCgQs8gZ4idpXVAU9EctiIUjMjNAO2paUdnCMLdH+eXuYUgHK25CNO1RjwJFave9jVw8RBQ== 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=G45ofjwk20Nx9lqaJgz0DexSsS1qC/0ShkNBCoH7yAg=; b=s2tN286Ta2q3kHN0RzW49TXwSapsHgK6mUlMcTM2CTw/dxX4nNxA7uM/aVQp1PjFX9262aTxyywyP6HGqZQP4rImPYxhG+3CK2tD8jRDX69iQME9FW4T2F+mXVf22O0XsU6WbitEGRQWc1vo495HCXKbpMz/1m0NPsMJHVYpSB8e8Qwn71H1OKf25Kr26kzTyQp+iQ0JkoycB7Dpi9ypKk/m8o82yXUCsv9mVZ9gFh4zJH5OsGp8VD4264dL06SP4k9EeZVSr5e5HWCGFYWuTkW1b8GiSQACXQTGlPDC0K7LVFleT9kdSFksimXt20WthSn0zUQoKrEFqC4K3HOy2g== 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 PAVPR10MB7516.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:2f7::9) 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:08:02 +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:08:02 +0000 Message-ID: <82855302-bd5a-46b8-94ef-77ffbf6b8438@siemens.com> Date: Wed, 27 Sep 2023 12:07:53 +0200 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 3/6] isar-bootstrap: Use tar output instead of directory Content-Language: en-US To: Uladzimir Bely , isar-users@googlegroups.com References: <20230927043320.6264-1-ubely@ilbers.de> <20230927043320.6264-4-ubely@ilbers.de> From: Jan Kiszka In-Reply-To: <20230927043320.6264-4-ubely@ilbers.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH0PR03CA0077.namprd03.prod.outlook.com (2603:10b6:610:cc::22) 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_|PAVPR10MB7516:EE_ X-MS-Office365-Filtering-Correlation-Id: 855984a1-1d1c-4ab1-b236-08dbbf41a232 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7E8u4/5dEd61uAyyIrLeeTQZ++PQzJY2H9rrtelBW954ej0ei6E9G1FDWbeKQIJ43J4JfvbvRiGc61MjpgVAiyo30KwhEqX3b1wCPplRqh7bPinlkb9FXj3geK4gKyXshFXoY4vRb+aGfLC4+42lOAqHn6t/o0tAnHWQ5GG2T8akLcjE/jmUOqKQLRzT2SxiWvGpdqpRtiGHtqIKPCa1hV69gKpx/1WNNdqyjWIItCx9/XUP7QgNIKSHnqOZQxlZH82LsH18ETOhBOiMGN6XPfbkkQg/V4GxeVUJZKBhRPHiffKmS+L3GvKBr/GV+NwbII0US/n1Ch8j9EKjGKRksILa2nx99Dv9dsmvVjB3n6gBeOARdXbk9FzyyMdwFuA8ehii/HDx9/YCZD7mVE7KoioazFzW+L2eolEFEZj7eQsr0GZaeL6PChf84ujoUvnQgLFI6eVNv7XJJgAvpfle+htF0zfG5p3NeMddgRcYSu0KuG6e2dJY2G4Jw+x1nwcHfrLaYmBsJMERcFUoboww2HDwH4yYnbdhPyKT4WK+5oE8VJel9hqrl6i9+rzrCp6qiDpCU0mJHsqufSIGmr/jBJVgvNvPOrfsQwaBIx8DFpExX5NGEE08XWh6spO3Scmq/qMrfgQB6cZnps8CuRV2Xg== 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)(39860400002)(136003)(366004)(346002)(376002)(396003)(230922051799003)(186009)(451199024)(1800799009)(31686004)(2906002)(44832011)(66556008)(66946007)(66476007)(316002)(5660300002)(478600001)(6666004)(8936002)(6486002)(6512007)(53546011)(2616005)(26005)(6506007)(41300700001)(83380400001)(82960400001)(86362001)(38100700002)(36756003)(31696002)(8676002)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?L052dngxdGhjTHZrT081WDFZNjgvN3ZncnlKSW5KSmN6UjZuWUZKUUlDeHJM?= =?utf-8?B?Y0tmemhieElKeXduVk5ickp2YklXbW9QbjBheklnR05KcjBVSmFXYjFabkRW?= =?utf-8?B?VTBxTnI2dXhLZkFFTHRMcGNwWkx6WUgxRE9TVjA2S3FxQk56a1NFU1ltT0ph?= =?utf-8?B?SnJBQXRvcVBNdmsrQWRmZCtUTStUcEFGZC8vYk5rdS9mL3lMa1kvc0xDMXdC?= =?utf-8?B?NkkwZHBRL2RJb3pWNGczM3h2SS9RTGk1eXk1enVTVzd1a28yT0F4c3FmRWJX?= =?utf-8?B?SDZURjNDT2NxUUp0MWdKY0NqQVJobzhyaFhRSHhwQTIxQlQxZFNaai9UR1VC?= =?utf-8?B?WHpJeGJiRzEvTW52WkhJdGs1Y1JBSUlRdkNNd2doR1VZbk9PdmczemhNNk14?= =?utf-8?B?T3p1UGdzRWNQK2YxZGsxRWtPbDNSUWZ2N1UyZWhOL3REQXpKUGhLSEpDZ3ls?= =?utf-8?B?VU5xbGtocUxjZlN0YmRYOGkvZjdJUlhtNCtic2o5RU1JblhpUUZDSnQxRVow?= =?utf-8?B?SU0zanhxMlAxNGRjaUQvby91NnA2YVlJWVJ2SzFnUWc1RXdUd29FSXpKT3lR?= =?utf-8?B?WGRSYnZrakFpYXBQVytNS21aNzF5Q0xXVnFkb1V0Wk5nbE4vNUlaTnQ3d1pQ?= =?utf-8?B?aTlsRmVFNWM1WVFCeGlVZithWHU0dGtKUkpFUFVIZ3ZkY0R0ZDBNc1VEVDBH?= =?utf-8?B?R3czdTNNek1UUTZ4ZWpVMFNldlhMWVBPVTNYZWtmQkU1N2VrUzR5ZmFkTDJx?= =?utf-8?B?UzF0T2VmK2p0RnBoQ0xraFVCdm5UT3QwZ05pZEp6Zm5Ld0ttcjZld3ZOTXdB?= =?utf-8?B?YVFRU3lacGR4cDkzUldsb0xwQ2t0VFdTOEg5MExjQ1hGWFdMdmRkNjBGdjhG?= =?utf-8?B?a24xQjExVlA4M3ZScW9wQXRsWEhQbENSNml0Rmp4M0lkTlM2aXVzbkpHZzZR?= =?utf-8?B?ZXJDY0w4UEk3ZnVNTmJhcVJ3Z3RseWNBNjhLc3FxOWxiYW5GTDluQTFMRHB3?= =?utf-8?B?akNmeGpKdXlqYjBON0hWSHlqZkJZQjZLUGlhbFp6S0xOZzIrNmJybmlFSG1S?= =?utf-8?B?NG9ibXI2MWljWlpaY2N6dXMwVE5WRzkvVEFjQUZRRnc5TlF6RHFBYkcrZkxE?= =?utf-8?B?em12V3hFaWJEUXhDOWVJb3pwQ2lFNEFacEdFbWpIUUY1T2d4aFpRZmJkTXJH?= =?utf-8?B?dy8wRFhXWEhsQVZOcUtGdkxNdE0zRHB1L2VTdTB0L1VqMGlBMURHb05OZEhO?= =?utf-8?B?V0JDQkNRNlZidS9zYXNRWWRRVU9taW5Za2JhYktaRW5hV1l1dklJQ0Z1U0VQ?= =?utf-8?B?emVDSEdraUdVdTBwOWRMUG1LTVpmU21UTExkcnJONi9jUW1YT3Y2K0doeVZr?= =?utf-8?B?ejd0QldTamE4VmgyQkZLSTJKb2hPNTVSTTBmT1pKT2hsWjZNT0RGZHFmUkZG?= =?utf-8?B?aWtxL2EybjBSV0VDY1ZGWUFvVVhLMUg2VmdITjZyMURSRmVTSXJDWHhvV2ZE?= =?utf-8?B?SWNzMzRibTcxYk5TQmhWbllFVk4xV051ZnM3c1FFY0FHVVZ0Y2VkYUxvZ3l3?= =?utf-8?B?NmtwQWFpUzRoZFFMZitzOElnTE5tL1UvS2EwRXpzbzNjRkRiK0JLN053dlhF?= =?utf-8?B?TmVHYW9wNm1LMzRqOVdpb3loV1VvWFRlTTRQa2pnU2pVNHpmRC81dEpoWCsx?= =?utf-8?B?UmkzeGtzaVBtOURQanZHNGZGekFWTE04SlIrQlRkTnF5eW1jZlkvREQxWVRN?= =?utf-8?B?K016VTMySUpjOWFLUXZRSXhQSlNXUEJDWk0zckpIbVFXTjA1c2l2VUFjOW5X?= =?utf-8?B?eE96aTFxV29iZmxaMjFJb1Q4QzIxMkd4Z2x1dm5MTDUyNGJoQVQyUzVJYktk?= =?utf-8?B?WnBqakIybmRDbCtYeHA1ellBMGJ0UGttSVhFaTM3NTB3Ky9CdTVWc2VPYjJG?= =?utf-8?B?S3NwNXA3ZmJoT2JHSlB2TnBDbDgrNWtTaWN4SXppdVg1STNOS2ZaeXQ0aHdQ?= =?utf-8?B?THNKOVpHLzdvV3RUZzhkRjdKc0xmdFhpd1hiazRCbFo1dTh4NDF5ZHNrNkJV?= =?utf-8?B?VHJsWk5ocDlMdjV4K2M5K0Q4aFR6UlJxS1NiRk9lUDM5SUI3Y0FPQnBQSEhJ?= =?utf-8?B?aytEMWFuUkdzTC9NYmJzWjVGN3M5QVNKL21EbC94OS9JS3d3K1BiM20wcUpW?= =?utf-8?B?b3c9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 855984a1-1d1c-4ab1-b236-08dbbf41a232 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:08:02.0054 (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: j/XjZkUTRF+MNIaJV1Ox9FyNXrMID4bpzAbU5rpkNlnftusWIgxIAY3zi+Djaia4da9oqOObgVtv23Zyz27E2Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR10MB7516 X-TUID: IW0iCKqFxq+5 On 27.09.23 06:33, Uladzimir Bely wrote: > From: Anton Mikanovich > > Do not unpack tar with rootfs content inside bootstrap recipe. Motivating this change here would be nice. > This also requires moving chroot prepare step to the later unpack step. > > Signed-off-by: Anton Mikanovich > --- > meta/classes/rootfs.bbclass | 11 +++++---- > .../isar-bootstrap/isar-bootstrap.inc | 23 ++++--------------- > 2 files changed, 12 insertions(+), 22 deletions(-) > > diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass > index 7dec7b36..09d40563 100644 > --- a/meta/classes/rootfs.bbclass > +++ b/meta/classes/rootfs.bbclass > @@ -73,12 +73,15 @@ rootfs_do_qemu() { > fi > } > > -BOOTSTRAP_SRC = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-host_${DISTRO}-${DISTRO_ARCH}" > -BOOTSTRAP_SRC:${ROOTFS_ARCH} = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-${ROOTFS_ARCH}" > +BOOTSTRAP_SRC = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-host_${DISTRO}-${DISTRO_ARCH}.tar.zst" > +BOOTSTRAP_SRC:${ROOTFS_ARCH} = "${DEPLOY_DIR_BOOTSTRAP}/${ROOTFS_DISTRO}-${ROOTFS_ARCH}.tar.zst" zst is really slow on packing but fast on unpacking IIRC. Do we actually benefit from that (significantly more unpack than pack)? Or was it like that before already? > > rootfs_prepare[weight] = "25" > rootfs_prepare(){ > - sudo cp -Trpfx --reflink=auto '${BOOTSTRAP_SRC}/' '${ROOTFSDIR}' > + sudo tar -xf "${BOOTSTRAP_SRC}" -C "${ROOTFSDIR}" --exclude="./dev/console" > + > + # setup chroot > + sudo "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" > } > > ROOTFS_CONFIGURE_COMMAND += "rootfs_configure_isar_apt" > @@ -222,7 +225,7 @@ cache_deb_src() { > # Note: ISAR updates the apt state information(apt-get update) only once during bootstrap and > # relies on that through out the build. Copy that state information instead of apt-get update > # which generates a new state from upstream. > - sudo cp -Trpn --reflink=auto "${BOOTSTRAP_SRC}/var/lib/apt/lists/" "${ROOTFSDIR}/var/lib/apt/lists/" > + sudo tar -xf "${BOOTSTRAP_SRC}" ./var/lib/apt/lists --one-top-level="${ROOTFSDIR}" > > deb_dl_dir_import ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} > debsrc_download ${ROOTFSDIR} ${ROOTFS_BASE_DISTRO}-${BASE_DISTRO_CODENAME} > diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > index d8ac9d00..cb1fc91a 100644 > --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc > @@ -16,7 +16,6 @@ PV = "1.0" > BOOTSTRAP_FOR_HOST ?= "0" > > DEBOOTSTRAP = "mmdebstrap" > -ROOTFSDIR = "${WORKDIR}/rootfs" > APTPREFS = "${WORKDIR}/apt-preferences" > APTSRCS = "${WORKDIR}/apt-sources" > APTSRCS_INIT = "${WORKDIR}/apt-sources-init" > @@ -287,9 +286,6 @@ do_bootstrap() { > fi > E="${@ isar_export_proxies(d)}" > > - sudo rm -rf --one-file-system "${ROOTFSDIR}" > - mkdir -p "${ROOTFSDIR}" > - > if [ "${ISAR_USE_CACHED_BASE_REPO}" = "1" ]; then > base_apt_tmp="$(mktemp -d /tmp/isar-base-aptXXXXXXXXXX)" > bootstrap_list="${WORKDIR}/sources.list.d/base-apt.list" > @@ -394,18 +390,9 @@ do_bootstrap() { > "${WORKDIR}/rootfs.tar.zst" \ > "$bootstrap_list" > > - sudo -E -s <<'EOSUDO' > - set -e > - > - tar -xf "${WORKDIR}/rootfs.tar.zst" -C "${ROOTFSDIR}" --exclude="./dev/console" > - > - # setup chroot > - install -v -m755 "${WORKDIR}/chroot-setup.sh" "${ROOTFSDIR}/chroot-setup.sh" > - "${ROOTFSDIR}/chroot-setup.sh" "setup" "${ROOTFSDIR}" > + # Finalize debootstrap by setting the link in deploy > + sudo ln -Tfsr "${WORKDIR}/rootfs.tar.zst" "${DEPLOY_ISAR_BOOTSTRAP}.tar.zst" > > - # Finalize debootstrap by setting the link in deploy > - ln -Tfsr "${ROOTFSDIR}" "${DEPLOY_ISAR_BOOTSTRAP}" > -EOSUDO > if [ "${ISAR_USE_CACHED_BASE_REPO}" != "1" ]; then > deb_dl_dir_export "${WORKDIR}/dl_dir" "${BOOTSTRAP_BASE_DISTRO}-${BASE_DISTRO_CODENAME}" > sudo rm -rf --one-file-system "${WORKDIR}/dl_dir" > @@ -420,15 +407,15 @@ SSTATEPOSTINSTFUNCS += "bootstrap_sstate_finalize" > > bootstrap_sstate_prepare() { > # this runs in SSTATE_BUILDDIR, which will be deleted automatically > - sudo cp -a "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" ./bootstrap.tar.zst > + sudo cp -a "${WORKDIR}/rootfs.tar.zst" ./bootstrap.tar.zst > sudo chown $(id -u):$(id -g) bootstrap.tar.zst > } > > bootstrap_sstate_finalize() { > # this runs in SSTATE_INSTDIR > if [ -f bootstrap.tar.zst ]; then > - mv bootstrap.tar.zst "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" > - sudo ln -Tfsr "$(dirname "${ROOTFSDIR}")/rootfs.tar.zst" \ > + mv bootstrap.tar.zst "${WORKDIR}/rootfs.tar.zst" > + sudo ln -Tfsr "${WORKDIR}/rootfs.tar.zst" \ > "${DEPLOY_ISAR_BOOTSTRAP}.tar.zst" > fi > } Jan -- Siemens AG, Technology Linux Expert Center