From nobody Fri Oct 31 11:09:42 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=1748886419; cv=none; d=zohomail.com; s=zohoarc; b=nXz0dDMvIQ3tw4wYINJqcJxfSDmip09EpBrIYfdK339uQTdF4p0mVJNxSOklrBDttFfd2IzmTARrx3LOebqMw7mPx5oOMu/MWzjcPJAEYy80hlSdXL7dWu8F790UZnu4kRQhrYh4LvoXm6K0ly7sYMT73ydRqTihWZjS/4V5jqU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748886419; 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=B9VfFp7KStC3qDdOP/ZlcW7W//yetvsaldEN92b/Svg=; b=S+hoBJtO6aIHfWozS6N6OR7gggNS86MMrbClUkGgwSSYWhq0akNqtcDmxMJqwUYThNiRJTuu32Uw4D8/dQnp+7TDLImwRlHVohlIFoeNEbr2xb3Cz/nV9ua8yqoJMA+LQdxgy7qd0FEAgedpoMjfy6Uew/2FmSfBOPGUhzgXNRk= 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 1748886418916703.9561583673858; Mon, 2 Jun 2025 10:46:58 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1003739.1383340 (Exim 4.92) (envelope-from ) id 1uM9Ey-00048P-9w; Mon, 02 Jun 2025 17:46:28 +0000 Received: by outflank-mailman (output) from mailman id 1003739.1383340; Mon, 02 Jun 2025 17:46:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM9Ey-00047w-38; Mon, 02 Jun 2025 17:46:28 +0000 Received: by outflank-mailman (input) for mailman id 1003739; Mon, 02 Jun 2025 17:46:26 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM9Ew-00044r-IV for xen-devel@lists.xenproject.org; Mon, 02 Jun 2025 17:46:26 +0000 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [2a00:1450:4864:20::332]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 80b13329-3fd9-11f0-a300-13f23c93f187; Mon, 02 Jun 2025 19:46:24 +0200 (CEST) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-442fda876a6so41370835e9.0 for ; Mon, 02 Jun 2025 10:46:24 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4f0097539sm15997416f8f.63.2025.06.02.10.46.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jun 2025 10:46:23 -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: 80b13329-3fd9-11f0-a300-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1748886384; x=1749491184; 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=B9VfFp7KStC3qDdOP/ZlcW7W//yetvsaldEN92b/Svg=; b=WFfNUm9BqVzzA/JjaLHRqcpOQp5St6dgqk4+o5s+325i6jkUJZEWhN4c8ZUv5fd/9b Cn7dWDjDakR05yh5KpajzYnLlP/co9FO1/2cScLGzQz4fVoUQb8bicYZFUCjAYCHvLPg dQJ3HdAr6ZJwn9OiqIjDlfgFhkVmUkCJ20p4A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748886384; x=1749491184; 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=B9VfFp7KStC3qDdOP/ZlcW7W//yetvsaldEN92b/Svg=; b=HcAcsMXly4AaquLIzBuuAu9dvDOUPOp3Sdl8mU5a9Ftga3KIHEQerG9wZog3QCHtjv zmzzvQVhMEXrycE6r8sFtQuGXfhGzl9YZHk+SyyPxIVQrELi/lf3j4UsDRqi1ablyRYW jkN7L1MWEnp+W8ceLbeSQbPxp5cdje/bs0WAmOhRqm3AY3VDkFcZrhJqtnoE49S83ZwQ 0l8tOnHj5jQk1PaDcex+bHtnb+/9LtR+U5HGF/dY3AASN4OOkqiHDq6Z01nsyvPFU9Yg YeeNsxBtxQi4MD9k9Z6W4uWu0rAIrVln2gCSal3T6SMJ46wZmHyQGTOHc92Pv1FxgvDW FRZw== X-Gm-Message-State: AOJu0YxFl96xY+J8oPlDcBAMgT6hjAztoxopHSGOWa680hlFTRPe+XR5 xTY7Dcb9bGFLCtth9Srlxl+jpgswDfWX+YCWWay6x/w+KmwCT5iHGRLtMwMq7pLiN76qkhsyBYN vb/gg X-Gm-Gg: ASbGncsmhx2OTdV1YcHjUomFN4uPEIGt9J2BrFP1ovFoLKK18jMWRf79s82yXWHApxT p0zDgZXjcihE3kcgkosf9pod8JqpAJdQblQdldmoWjHHdX3LF0cOXQyBF+aRAJuCHg8JTFyXTuI qno36zErUHyJJ9sAJ0zA4dUYIF6Pnr5SUhBJ0ZFoUd9oKCzawp32xtN2w4TpjxzdKY8OVw0q/Je r9C/zwWf70P4Ba08GOWBMzsNoY7HGjKT/ZsJyvgbiFyht/zw6o7nqwmrwgSDywH6eWYiANO09qe JMh+rLNTeMyO6tsfDsTmn6b2B74wTItTZ7uNGtLCp+/A8LsTznsWN2e+RHjnrQWamE7AcS14I4y 292iMBUKElhoAizFMXzr5FFubl7sRYeKV9CY= X-Google-Smtp-Source: AGHT+IGuQ0VThV/yJUVdC3GCVEM3YobvqBbPkEGiEo1ShTS8wNLmy+vLpB1N2s8mmpGR6FXcpOJg8w== X-Received: by 2002:a05:600c:5494:b0:442:cab1:e092 with SMTP id 5b1f17b1804b1-4511ecc2522mr71040995e9.11.1748886384117; Mon, 02 Jun 2025 10:46:24 -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 1/2] CI: Use bash arrays to simplfy dom0 rootfs construction Date: Mon, 2 Jun 2025 18:46:17 +0100 Message-Id: <20250602174618.2641439-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250602174618.2641439-1-andrew.cooper3@citrix.com> References: <20250602174618.2641439-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: 1748886420649116600 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 Reviewed-by: Marek Marczykowski-G=C3=B3recki Reviewed-by: Stefano Stabellini --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki v2: * Use dom0_rootfs_extra_{un,}comp arrays --- automation/scripts/qubes-x86-64.sh | 18 ++++++++++++----- .../scripts/xilinx-smoke-dom0-x86_64.sh | 20 ++++++++++++------- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index 8e86940c6eff..5ec6eff6c469 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 @@ -22,6 +22,8 @@ domU_type=3D"pvh" domU_vif=3D"'bridge=3Dxenbr0'," domU_extra_config=3D retrieve_xml=3D +dom0_rootfs_extra_comp=3D() +dom0_rootfs_extra_uncomp=3D() =20 case "${test_variant}" in ### test: smoke test & smoke test PVH & smoke test HVM & smoke test PV= SHIM @@ -187,10 +189,16 @@ 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. +dom0_rootfs_parts=3D( + binaries/ucode.cpio + "${dom0_rootfs_extra_uncomp[@]}" + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz + "${dom0_rootfs_extra_comp[@]}" +) +cat "${dom0_rootfs_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..45121f39400a 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -28,6 +28,8 @@ extra =3D "root=3D/dev/ram0 console=3Dhvc0" memory =3D 512 ' DOMU_CFG_EXTRA=3D"" +dom0_rootfs_extra_comp=3D() +dom0_rootfs_extra_uncomp=3D() =20 # Select test variant. if [ "${TEST}" =3D "ping" ]; then @@ -71,6 +73,7 @@ do sleep 1 done | argo-exec -p 28333 -d 0 -- /bin/echo " + dom0_rootfs_extra_comp+=3D(binaries/argo.cpio.gz) DOM0_CMD=3D" insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko xl -vvv create /etc/xen/domU.cfg @@ -103,13 +106,16 @@ 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. +dom0_rootfs_parts=3D( + binaries/ucode.cpio + "${dom0_rootfs_extra_uncomp[@]}" + binaries/rootfs.cpio.gz + binaries/xen-tools.cpio.gz + "${dom0_rootfs_extra_comp[@]}" +) +cat "${dom0_rootfs_parts[@]}" > binaries/dom0-rootfs.cpio.gz =20 # test-local configuration mkdir -p rootfs --=20 2.39.5 From nobody Fri Oct 31 11:09:42 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=1748886419; cv=none; d=zohomail.com; s=zohoarc; b=E56fwLN1sQKogp+VoHUtNMKNUwbZEyVU2FU25WK1GkJDJuNuZz2I7xr0Zrn/0k1/ACTX5cgcNNVfIgaV75Icm9hAM9fbqPE1heYQ6EgbmGeeYdzl6hIU6pqdg9hOErzo/mjMC3JkRoVJuB00SCsPjrFVlmJ+h8IDLHVHOFDJkJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748886419; 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=VMfDv5scN89KVrBk/1eG8UFcMNbpeEOdoqqQG+/hRZc=; b=UswondtWXOQ0p9lND+GEY6HRZbzxOg6lEfjF1jgPL8RNyga15FZrmL+CKYUFcktK3KIGeA1ZxvLi+Vt+8+BKkGdh5T81dFy2vl0P8Vi+t92j7er7zSsQ86ciFoe7HirWms7e84FcFz0C+9/oYA8bf6gLxhfjgzp22bRGEdwceiI= 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 1748886419517407.5881736920435; Mon, 2 Jun 2025 10:46:59 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1003740.1383344 (Exim 4.92) (envelope-from ) id 1uM9Ey-0004Am-Fk; Mon, 02 Jun 2025 17:46:28 +0000 Received: by outflank-mailman (output) from mailman id 1003740.1383344; Mon, 02 Jun 2025 17:46:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM9Ey-00048k-9o; Mon, 02 Jun 2025 17:46:28 +0000 Received: by outflank-mailman (input) for mailman id 1003740; Mon, 02 Jun 2025 17:46:27 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uM9Ex-00044r-BD for xen-devel@lists.xenproject.org; Mon, 02 Jun 2025 17:46:27 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8146c814-3fd9-11f0-a300-13f23c93f187; Mon, 02 Jun 2025 19:46:26 +0200 (CEST) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-450cfb790f7so34929005e9.0 for ; Mon, 02 Jun 2025 10:46:26 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a4f0097539sm15997416f8f.63.2025.06.02.10.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Jun 2025 10:46:24 -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: 8146c814-3fd9-11f0-a300-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1748886385; x=1749491185; 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=VMfDv5scN89KVrBk/1eG8UFcMNbpeEOdoqqQG+/hRZc=; b=ZDeVrbiK7eIH0qjbHwl64nDpHSB3BuS/2lt7hGrk+kQbnkK/xqW1gSmlSNesJozxjW fIQx52b9ox1jx6HuHTUdI96fWGk7dhBzhs7keBFjJH5d4v0z8XxBPcdN5IbAM/j966cH FMRZUPlodjkqN7rp6r/75epngWnuxhiaIowBQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748886385; x=1749491185; 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=VMfDv5scN89KVrBk/1eG8UFcMNbpeEOdoqqQG+/hRZc=; b=qQcKvgVz3766vovEuNzGWzPhFlg3yPRknZgpRCD550ABdAIlLDUcq3BVrKmcYomUuS bzsvGRA4GgCKaR9O1WZbHCOkuV06/r5zeJHEUtfVs//YmsYq5P/xYNsWSf6/Pid0ERe9 fAbRKfeETOa4Wf3p3K6KtPEqDh5Vj9vLv2PQzOUNppQaLLwsZ6TlZkPAgWg/VVUCE30r BUL2FWCs4bpwM6MFkO5v27EyMowEDJbNuHUGQ6e8SQBYc3WT4NJLgzMfENg0RFEBZ9U/ ABhFGNvCh4WWhumN26MD5Z+bdt3GVL8JU4YfFogmTIFHJoAHWVNBIiBhxJqjfrESfWYp 55Jg== X-Gm-Message-State: AOJu0Yw1OJqB7JOKmZ8h/3gQWOXtTTVlRQ/BbJ+zBnoHMTO7VzhSkbhb VD6Xbn62wj12GMLEKekXshwI4mQ/6AATaEuLQllNBv2DOEt0vUBkee7bdUq+VTQZqXx2Z+MKYX3 8G5M8 X-Gm-Gg: ASbGncuEQYCG79ZlLKoogfM8rMzY7L854tdLThM+wPDsxKw4qI+kD85UBB0GIycDWyp pXxARmw/NvnZUXDEd9ZzXPSstRfsP3BB/c1Aeu1jan/ClOO4BhogbKRlmjnh8dXrm4zIw8CUO7K mB2nGjd33p3HjGsSDv89jLJo7/AP7FdqgdRv7X5Uho8VN9I2hZnI+1KSXQPw8xmsM3ejMbdUXQ7 D7BRKcYwGETwbdqH6qHmEJRko6b01PMHHmYd7wADSBjeRju3ms5lO8/fcz62n8QOIWcgtjxvuvK 9MHBQCvsiiRHzI489KjNTMgeH77EGwodyQeQe/+O8w/MZnzyXFwfla63Rt4/wOC3LiuOxllGQ3F 4M6bgdZRu26VZUEO8LBLuyTKi X-Google-Smtp-Source: AGHT+IE/EagnuGrr5IlNIkzGdMRgLDqUa6swkTOIix8pZfplcFgLE6SCE79B+HL3TiQXEkWFCYfrxg== X-Received: by 2002:a05:600c:6a93:b0:451:df07:f437 with SMTP id 5b1f17b1804b1-451df07f5e4mr24603605e9.30.1748886385116; Mon, 02 Jun 2025 10:46:25 -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/2] CI: Adjust how domU is packaged in dom0 Date: Mon, 2 Jun 2025 18:46:18 +0100 Message-Id: <20250602174618.2641439-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250602174618.2641439-1-andrew.cooper3@citrix.com> References: <20250602174618.2641439-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: 1748886420679116600 Package domU for dom0 and insert into the uncompressed part of dom0's rootf= s, rather than recompressing it as part of the overlay. For Qubes, this avoids putting the domU kernel in dom0's rootfs for tests which aren't going to boot a guest. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-G=C3=B3recki Reviewed-by: Stefano Stabellini --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki v2: * Rebase over dom0_rootfs_extra_{un,}comp changes * Move back into boot. There seem to be objections to having it in root. --- automation/scripts/qubes-x86-64.sh | 17 ++++++++++++----- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 14 +++++++++++--- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-= x86-64.sh index 5ec6eff6c469..d9ecc569c956 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -156,7 +156,7 @@ esac domU_config=3D" type =3D '${domU_type}' name =3D 'domU' -kernel =3D '/boot/vmlinuz' +kernel =3D '/boot/vmlinuz-domU' ramdisk =3D '/boot/initrd-domU' cmdline =3D 'root=3D/dev/ram0 console=3Dhvc0' memory =3D 512 @@ -187,6 +187,17 @@ Kernel \r on an \m (\l) find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs + + # Package domU kernel+rootfs in /boot for dom0 (uncompressed) + mkdir -p rootfs/boot + cd rootfs + cp ../binaries/bzImage boot/vmlinuz-domU + cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU + find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio + cd .. + rm -rf rootfs + + dom0_rootfs_extra_uncomp+=3D(binaries/domU-in-dom0.cpio) fi =20 # Dom0 rootfs. The order or concatination is important; ucode wants to co= me @@ -241,10 +252,6 @@ mkdir -p etc/default echo "XENCONSOLED_TRACE=3Dall" >> etc/default/xencommons echo "QEMU_XEN=3D/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -if [ -n "$domU_check" ]; then - cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU -fi find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/sc= ripts/xilinx-smoke-dom0-x86_64.sh index 45121f39400a..8981aee5d4f2 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -22,7 +22,7 @@ DOMU_CMD=3D"" DOMU_CFG=3D' type =3D "pvh" name =3D "domU" -kernel =3D "/boot/vmlinuz" +kernel =3D "/boot/vmlinuz-domU" ramdisk =3D "/boot/initrd-domU" extra =3D "root=3D/dev/ram0 console=3Dhvc0" memory =3D 512 @@ -106,10 +106,20 @@ find . | cpio -H newc -o | gzip >> ../binaries/domU-r= ootfs.cpio.gz cd .. rm -rf rootfs =20 +# Package domU kernel+rootfs in /boot for dom0 (uncompressed) +mkdir -p rootfs/boot +cd rootfs +cp ../binaries/bzImage boot/vmlinuz-domU +cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU +find . | cpio -H newc -o > ../binaries/domU-in-dom0.cpio +cd .. +rm -rf rootfs + # Dom0 rootfs. The order or concatination is important; ucode wants to co= me # first, and all uncompressed must be ahead of compressed. dom0_rootfs_parts=3D( binaries/ucode.cpio + binaries/domU-in-dom0.cpio "${dom0_rootfs_extra_uncomp[@]}" binaries/rootfs.cpio.gz binaries/xen-tools.cpio.gz @@ -131,8 +141,6 @@ echo "${DOMU_CFG}${DOMU_CFG_EXTRA}" > etc/xen/domU.cfg echo "XENCONSOLED_TRACE=3Dall" >> etc/default/xencommons echo "QEMU_XEN=3D/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console -cp ../binaries/bzImage boot/vmlinuz -cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. =20 --=20 2.39.5