From nobody Tue Dec 16 08:51:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1747935423; cv=none; d=zohomail.com; s=zohoarc; b=cPEavEGefKWBFZqN/z/EqNVeDjXUIzFSeRlF3Un3TmsciCIHl2/Z47X5VaW3dWFVR7sxr+TKqUantgdRJn0Ftj8TKBhnZxqkihRAGPH+MVlFMp+1s6Yt9tB09PFrtgY6kqTHKdTL9TZeB2o4vCr86w+2bJvGeiVH4RcTey790CY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747935423; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZadyQ1dGPInWsa7+i4u+dOHgUQQBDu0QP3e67vZGDBU=; b=Mt67j31lSHgj7bN2FN2EvjO6B7J0gWZDLhui1dMKQYCpW1y6BNDCUELle+LfURTLLyP9DZmru9GGgwb+jSPMGwtRukQd2QXv6sSPc6WKYO0QH+pDFgYJ02UajIhrIZzCf6L8z6eFycFrXOlFdIXnMCVrrgPJK/Pp+/pCJK0FCLE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 17479354236191002.190499690902; Thu, 22 May 2025 10:37:03 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.994482.1377478 (Exim 4.92) (envelope-from ) id 1uI9qb-00043S-EE; Thu, 22 May 2025 17:36:49 +0000 Received: by outflank-mailman (output) from mailman id 994482.1377478; Thu, 22 May 2025 17:36:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI9qb-000432-9f; Thu, 22 May 2025 17:36:49 +0000 Received: by outflank-mailman (input) for mailman id 994482; Thu, 22 May 2025 17:36:47 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uI9qZ-0003ZZ-Ll for xen-devel@lists.xenproject.org; Thu, 22 May 2025 17:36:47 +0000 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [2a00:1450:4864:20::52e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 553117a6-3733-11f0-b892-0df219b8e170; Thu, 22 May 2025 19:36:46 +0200 (CEST) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-601c5cd15ecso7805412a12.2 for ; Thu, 22 May 2025 10:36:46 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ad52d442069sm1116063366b.103.2025.05.22.10.36.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 10:36:44 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 553117a6-3733-11f0-b892-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1747935405; x=1748540205; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZadyQ1dGPInWsa7+i4u+dOHgUQQBDu0QP3e67vZGDBU=; b=c++HdavcNLa4vAnsAAM3dvr6ZZhMV1YwVBErgoWrRvNvYpDwfjYAQjmGI6RXPOf6ct K4aQm8DROpMIW0aZybfusnKDrWTOrxUd/3eNOV3gvK2AFZCrGFfpicViUyZ50BC0oLnx qoQPHzcOQr2O/yeFWAEQlCrUQLgo9ks5P5Tiw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747935405; x=1748540205; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZadyQ1dGPInWsa7+i4u+dOHgUQQBDu0QP3e67vZGDBU=; b=tyRsjiovXxbodeqq2EUfDQQTuEBH6T00/D1Gf0Jzn5T5kBc7sFaVw6cxD/fqS5YnhO j9Ef3WfI4DA9vnF0CizEi74+J1sGKfIcJdw1O7wdx/LZkn1JhN29oojfQNbQ0lXnFZIs VzS91rXulXfTWPgnFoYKm7wdoD5I05m5YV9Bi6Sv0UyJCMSnVilM8kx1l2QKWBkR+UdT 9x4Oicll4CpDPeCHySdVb5kw1wHDcTEVCp9Wh+spPk32PWzH2v51QpSihJG+8tDUNSF+ 6wkNexzHlOhe8VnjFFmEcDD0dK1gkGIjcu1GvL876+AkZFe8tPckExTdQ2F6tLBg1wEe nl+A== X-Gm-Message-State: AOJu0YwhXRauIP8om0yV7ddPzEQLWxmvA9mDVEz8wk1NMYXVxLYR7x/j ufIdqZxvgQx/5CcdE76j1SyLpATmyWVTzl5/UbSNBuHgkogV20Q92h0VgTRq1pEuUI8FeP4bQ7j TQ3Em X-Gm-Gg: ASbGncvKZUnRGLu3+LymNOQyp0eugyEpKQW6dL5QxnzBdxIP8HRDx/X9OWoZoxW15hm B2nWUt+BYoKMsXAv7GDgqBxpDc7kvG7JCd9T7YnjoXGmwbhLB8mbmN5zGhQYy1DFJIyiwGshKO2 AEzHqFQ8+p3+INAH2O47NeQXJMR7hO7f9s6l3HnuXfnUjrgU/ZH2G/415ZsnoqhWR/rHbTIehx9 RJ2SM54TUFTIvnoQpMMadocOpNRndqcVwQZjoC7oFSj+ARR161u1pHyiEwz/mgnY/YfIeuYxMRl GvJAZMZb2KPYbzhAVQgsfNyZ817XZyA1fZwqQ2KtuE3t6DOVTa6cQx9P6SfWyRoHrrQJClz2hjD 9P/dLJWXtTPzir+3D9Eweh9w/bD0L2jIEN5Q= X-Google-Smtp-Source: AGHT+IGpajxmUsPPYguIJRowQVROWmkBbc6c75BLnT1q+SBw/DEbc5kCmLDo8Qb2Z9sBZzuuh/yIBw== X-Received: by 2002:a17:907:96a1:b0:ad2:3f54:1834 with SMTP id a640c23a62f3a-ad536dce664mr2444664566b.40.1747935405312; Thu, 22 May 2025 10:36:45 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 2/3] CI: Use bash arrays to simplfy dom0 rootfs construction Date: Thu, 22 May 2025 18:36:39 +0100 Message-Id: <20250522173640.575452-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250522173640.575452-1-andrew.cooper3@citrix.com> References: <20250522173640.575452-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1747935424426116600 For Qubes, this requires switching from sh to bash. This reduces the number of times the target filename needs to be written to= 1. Expand the comment to explain the concatination constraints. No functional change. Signed-off-by: Andrew Cooper Acked-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki I would like to find a slightly nicer way of conditional parts, but nothing comes to mind. --- automation/scripts/qubes-x86-64.sh | 14 +++++++++----- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 16 +++++++++------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index 10af274a0ba7..1dd3f48b3d29 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash =20 set -ex -o pipefail =20 @@ -187,10 +187,14 @@ Kernel \r on an \m (\l) rm -rf rootfs fi =20 -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz +# Dom0 rootfs. The order or concatination is important; ucode wants to co= me +# first, and all uncompressed must be ahead of compressed. +parts=3D( + binaries/ucode.cpio + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz +) +cat "${parts[@]}" > binaries/dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/sc= ripts/xilinx-smoke-dom0-x86_64.sh index 8f02fa73bd06..0fbabb41054a 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -103,13 +103,15 @@ find . | cpio -H newc -o | gzip >> ../binaries/domU-r= ootfs.cpio.gz cd .. rm -rf rootfs =20 -# Dom0 rootfs -cp binaries/ucode.cpio binaries/dom0-rootfs.cpio.gz -cat binaries/rootfs.cpio.gz >> binaries/dom0-rootfs.cpio.gz -cat binaries/xen-tools.cpio.gz >> binaries/dom0-rootfs.cpio.gz -if [[ "${TEST}" =3D=3D argo ]]; then - cat binaries/argo.cpio.gz >> binaries/dom0-rootfs.cpio.gz -fi +# Dom0 rootfs. The order or concatination is important; ucode wants to co= me +# first, and all uncompressed must be ahead of compressed. +parts=3D( + binaries/ucode.cpio + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz +) +[[ "${TEST}" =3D=3D argo ]] && parts+=3D(binaries/argo.cpio.gz) +cat "${parts[@]}" > binaries/dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs --=20 2.39.5