From nobody Fri Dec 19 22:05:11 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=1744368762; cv=none; d=zohomail.com; s=zohoarc; b=P1FqVAC4hWSiwHwoEAhei7sYjh2BsHcgxogDbNgEVW8RQ0sQT10RwIBf0XBgUKFOlTWYG3WjLPx+CE3G03vhETM6TbLqoRekskWq2sI/XA+RPWAYJ2QFUs/h+iAylcXJ0CjTf0Vnp9B95GnKZ+rUXwCT+AdLSeRxWuaVyYcF6iE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744368762; 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=eMF9e3oJkccAPgvDEUGsPmSxBbanEG/SINaFCwPFSM0=; b=PgOq+UHuiP/x4bJ4F8uj4gC0k5XrzQMMwJQSCIxkFy6tnLF+adMmTh4fS82U85lZSgD4Gn/U6+hqjA/F+Pn5tFGLMYP0YlgQiu7OaV5R4pLB4K/8A1tnSfUbNp8JdxF9EbNM3EsdFM56cftpe1k2ZugZKMuGeFP+8MaWtIwc7g8= 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 1744368762462807.4203670395576; Fri, 11 Apr 2025 03:52:42 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.946998.1344729 (Exim 4.92) (envelope-from ) id 1u3Bzk-0006g9-Kw; Fri, 11 Apr 2025 10:52:24 +0000 Received: by outflank-mailman (output) from mailman id 946998.1344729; Fri, 11 Apr 2025 10:52:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u3Bzk-0006g0-HT; Fri, 11 Apr 2025 10:52:24 +0000 Received: by outflank-mailman (input) for mailman id 946998; Fri, 11 Apr 2025 10:52:23 +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 1u3Bzj-0006S8-Fq for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 10:52:23 +0000 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [2a00:1450:4864:20::435]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0bd54e34-16c3-11f0-9ead-5ba50f476ded; Fri, 11 Apr 2025 12:52:22 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-39c0dfad22aso948452f8f.2 for ; Fri, 11 Apr 2025 03:52:22 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f233c81f6sm78493215e9.20.2025.04.11.03.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 03:52:20 -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: 0bd54e34-16c3-11f0-9ead-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744368741; x=1744973541; 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=eMF9e3oJkccAPgvDEUGsPmSxBbanEG/SINaFCwPFSM0=; b=vtgJBQBCCH1AKUxb7TS6Tcise1eT1gVjJMUwXQN/7sNWg/CB1U/1D8rx8qBz7D1RX2 1FeWmaah3j/XRtd/NyTRjrxAupoqEyxNJUH5HL/dFgxQa28ybrjxe4A4NuKoTExOJLky bMjCtD9/GtFpm/iq3n3lnCGB0/PInoS/kbSt4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744368741; x=1744973541; 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=eMF9e3oJkccAPgvDEUGsPmSxBbanEG/SINaFCwPFSM0=; b=mcxiN9oH3B0Z4I+WjHS87+tmj228TNvTGuZNQ038fahncz9wWbWmTntLkAn4f4LElB tn1bFSVS4FGa0V/79dN0oz3Kacq7ngAEkXiMmTlBPBT/Pv85WPTx500o5awCBb/ujkae Teyon3Unlp52rf1AI3I2mP0n4eRUbimBJ4i/fE0JhdJ4VlJEFzWv9Sk/zk6Rzutnr21h VWO81JzBmGzyxSNzXCaSOCR7i7zMtErljsZIUkTmLmEnurzATJRhTwkKNHXt0yzg3M0A R5OCQxgm9krCm+tafssh6Es0IxSBZaI7uSGaoqqD7rUMm9g4RahU3xVVwsKWiVe5vo7J yGSw== X-Gm-Message-State: AOJu0Yylr73Z6D9tzzJRtm/zebPRWw2icfCXmoKOTmBgso/PB0vRn1yf RXLUjTfersu8yRbalbP29SRBbDi38w0Dp/6vkLw8OVBMap82yKr+VBHRbteWjD6rNPN05osFPLR fYbI= X-Gm-Gg: ASbGncsrZD8g6vRRqZiVEKfQGV7lg3Rbz/ZS3sSuxwQ05mbVPlCfvYTE8TMC/kjHzq9 TBnBD/zSXiFOlECAhaZUKyhWZ5CoIBZN63wbixbPtxx7iTNrR7TDxXPEWBQmZQwu4BtGMv0PX+S ZUkXogL2bXTyRzssDwpts92KRAedlSbDA4UiOnZiH9TX25kTz4Ub6upvzNpYVTKCxS6nduO5ChC 932XLZPj/muDyHUt3Z6UytvVj6speKXpa7VPGsBPWkjZkYE6XzsRV7r1wmicOwI7KiamZC66pFW xmdoX72KTNKZUNZgEB9mrwZLysxxlGJ5ghcpgaTgi5yi3ipk5qPHeVUJwEVPbhmPKmI2YlOEbSs fvTCIOI3AF/VXlpeVh2pYzJn7 X-Google-Smtp-Source: AGHT+IF/GXqtxQeTKbNkj/0FtvWWntKG1rB1kAsgxo5ygd409/KHLm+X2aCrn0x8/6kbcgWZFkgAcA== X-Received: by 2002:a05:6000:144d:b0:391:4999:776c with SMTP id ffacd0b85a97d-39eaaecdb44mr1931563f8f.40.1744368741248; Fri, 11 Apr 2025 03:52:21 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 1/3] Rework rootfs generation to make a cpio archive Date: Fri, 11 Apr 2025 11:52:15 +0100 Message-Id: <20250411105217.2141356-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250411105217.2141356-1-andrew.cooper3@citrix.com> References: <20250411105217.2141356-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: 1744368764870019100 Rename the script as we're going to use it for ARM64 shortly, and have it t= ake a tar or cpio parameter to determine the output format. Turn it into a proper bash script, and provide the cpio form under the new artefact naming scheme. No functional change. Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki --- .gitlab-ci.yml | 9 +++++++- ...6_64-rootfs-alpine.sh =3D> alpine-rootfs.sh} | 21 +++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) rename scripts/{x86_64-rootfs-alpine.sh =3D> alpine-rootfs.sh} (75%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d2c72b268a3..916c5ae9d508 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,6 +42,13 @@ linux-6.6.86-arm64: # # x86_64 artifacts # +alpine-3.18-x86_64-rootfs: + extends: .x86_64-artifacts + script: + - ./scripts/alpine-rootfs.sh cpio + variables: + CONTAINER: alpine:3.18-x86_64-base + linux-6.6.56-x86_64: extends: .x86_64-artifacts script: ./scripts/build-linux.sh @@ -62,7 +69,7 @@ x86_64-kernel-linux-6.6.56: x86_64-rootfs-alpine-3.18: extends: .x86_64-artifacts script: - - . scripts/x86_64-rootfs-alpine.sh + - ./scripts/alpine-rootfs.sh tar variables: CONTAINER: alpine:3.18-x86_64-base =20 diff --git a/scripts/x86_64-rootfs-alpine.sh b/scripts/alpine-rootfs.sh similarity index 75% rename from scripts/x86_64-rootfs-alpine.sh rename to scripts/alpine-rootfs.sh index b70b3a54ede5..c29c92d1c682 100755 --- a/scripts/x86_64-rootfs-alpine.sh +++ b/scripts/alpine-rootfs.sh @@ -1,4 +1,9 @@ +#!/bin/bash + +set -eu + WORKDIR=3D"${PWD}" +COPYDIR=3D"${WORKDIR}/binaries" =20 apk update =20 @@ -56,5 +61,17 @@ passwd -d "root" root =20 # Create rootfs cd / -tar cvzf "${WORKDIR}/binaries/initrd.tar.gz" \ - bin dev etc home init lib mnt opt root sbin usr var +PATHS=3D"bin dev etc home init lib mnt opt root sbin usr var" + +case $1 in + cpio) + find $PATHS | cpio -o -H newc | gzip > "${COPYDIR}/rootfs.cpio.gz" + + # Print the contents for the build log + zcat "${COPYDIR}/rootfs.cpio.gz" | cpio -tv + ;; + + tar) + tar cvzf "${COPYDIR}/initrd.tar.gz" $PATHS + ;; +esac --=20 2.39.5 From nobody Fri Dec 19 22:05:11 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=1744368758; cv=none; d=zohomail.com; s=zohoarc; b=nj4ZvaZXUTMnCln4n/2vFTqlnYJDxjg7FLugB3YK0dOcNLSaA5xEqXCvzb7ff7TIic/0SqLOCKDI1aROL+vSHFHghH/LYk+Qf1Pl9ZUKUZirTxe12j0SU4s0Set4m9t3PZo0sBqWbq6iFlXsB6KO8yDVDH2SHQ/Gg0WOT8b918c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744368758; 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=kIPah+Nx1tiLQuGiODCJoASZliWThOAtOi1NpKaYDJ4=; b=BnM+wpQ80nxzV+rhedqCq/d3gweY/khTIqNKNgh2EodjiUZgxsovJ4CBH8ubkh9uFro7uuxmhapoPk914teQg+FcUK+IYucc6sLcl0ZnAy5hpOmSyuvqAth/qTbGrYzRdgnDq3JsEVXMVLCa6Gr+Ch9xyK/h7a+SngiYkh6ZtBw= 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 1744368758536298.2120532844783; Fri, 11 Apr 2025 03:52:38 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.947000.1344744 (Exim 4.92) (envelope-from ) id 1u3Bzn-0006xf-8J; Fri, 11 Apr 2025 10:52:27 +0000 Received: by outflank-mailman (output) from mailman id 947000.1344744; Fri, 11 Apr 2025 10:52:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u3Bzn-0006wX-2g; Fri, 11 Apr 2025 10:52:27 +0000 Received: by outflank-mailman (input) for mailman id 947000; Fri, 11 Apr 2025 10:52:24 +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 1u3Bzk-0006S2-HX for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 10:52:24 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0c27b090-16c3-11f0-9ffb-bf95429c2676; Fri, 11 Apr 2025 12:52:22 +0200 (CEST) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43cfe574976so13396505e9.1 for ; Fri, 11 Apr 2025 03:52:22 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43f233c81f6sm78493215e9.20.2025.04.11.03.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 03:52:21 -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: 0c27b090-16c3-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744368742; x=1744973542; 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=kIPah+Nx1tiLQuGiODCJoASZliWThOAtOi1NpKaYDJ4=; b=eCIHm3Zb07Cne8mjxEAH8IYLceUlHP8bQtjTL2fA9XwUS8ba8ofOuH9UoHR3h/dc2F 9yKLhIEUqn9N4GWhX+qGWTGD+w+H3LOn5XZmsjk7GPWV6VD8n7gm7pqEJhc7cQ0iHBu6 tvcij3oLA6ZOvostpijPNy9QNVAhWXeUMWI/I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744368742; x=1744973542; 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=kIPah+Nx1tiLQuGiODCJoASZliWThOAtOi1NpKaYDJ4=; b=sBLkg5RcOCwgW/6GoYzR2xouMCEtUKe1NikuaXzPbWDGmKxqOveW2K0JwSOJ14Xfxx Os2nySYU8/jJ1qzNWJstDs7N8H33BeK1u3Dc/i/zYNtCqwObEyNcbvZu/BvFDeM7YKrl di7ZDhM/xbmQiZx1lDhZRb5V0G4/FDChtMfXylvdfqvjsbyuTBfcAKWZfvmhb19WSs0g 8mKoAqG8HALVpLsOouq/GB3GYn8TbtpGBB+nM1YSoOsPmZ85/0YkttAk04+PGH6sHGi2 JP2MS+oQy+YbQO7qy5V5GwRYVWpd7tYfMIvWnkdW9gFEwlF5gZaD0JOB5N5YvrTRm2AW axDw== X-Gm-Message-State: AOJu0YwnIEqh4eQtE2hO76wtHCh9du9L39hjQ0TqPP0iyNnbvN7qujDD u0C+YVVQ2uU2BZUzQ0AV5wW91VPlw7Q0TLS0/PHw95k4CSqcSQb9pBPKPZCe5EhotzBIWbhV+gZ evkA= X-Gm-Gg: ASbGnctVC8cv49Qw/4cB7g1qoJL4rNtAOh9G9n7hwoqPSNiJIwk7IWAtYJnLuxZMgj0 pDbAa5KRjiWKaiaWtjlGsfralbVcny0BEVx3C8eqvXoJ5fTHmNXc/nY51fya4aFy97Xgp4+yOQp WVsxgjPIMs/mvKYnF41j0IaVgFs4Lgg3f7Sq8TA3gsnVqasQtgDI68WUAOoU2jUqF4GvTorNVwE QukvyV8eTB3h35dHObTW5EezkKTXH+pLQ+09qgWYfcIGSMomDi4fxqPG7uUootCeuveO3ss0faW bhwPsdLC9lmeAAFcgj5EIp/Vw7/zYCV8GLxaTsatpIAYc4UQXD4AGxqFMxw/i1HEhTXe1aDZM1f 6SPWqZNXeWjIWKieX72+84Ryl X-Google-Smtp-Source: AGHT+IHxNnyGxSy+jEWj44G/v+alf89pz1jubUkwU8Hk71aX6eIU0Xs2G157ky69QIENoNftEyM7cA== X-Received: by 2002:a05:600c:83c6:b0:43c:e478:889 with SMTP id 5b1f17b1804b1-43f3a7d872dmr21597355e9.0.1744368742037; Fri, 11 Apr 2025 03:52:22 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 2/3] Shrink the rootfs substantially Date: Fri, 11 Apr 2025 11:52:16 +0100 Message-Id: <20250411105217.2141356-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250411105217.2141356-1-andrew.cooper3@citrix.com> References: <20250411105217.2141356-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: 1744368760849019100 bash, busybox, musl and zlib are all in the base container. python3 and ncurses are in principle used by bits of Xen, but not in anythi= ng we test in CI. argp-standlone, curl, dbus, libfdt, libgcc and sudo aren't used at all (for x86 at least). libbz2 and libuuid were pulled in transitively before, and need to be inclu= ded explicitly now. Use apk --no-cache to avoid keeping a ~2M package index on disk. Remove the modules scan on boot. We don't have or build any. This removes= a chunk of warnings on boot. This shrinks the rootfs from ~30M down to ~8M. No practical change. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki I'm still working on the integration of the new rootfs's int Xen, and will hold off until committing that's ready but https://gitlab.com/xen-project/hardware/xen-staging/-/pipelines/1763510164 shows good early progress. --- scripts/alpine-rootfs.sh | 60 +++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 26 deletions(-) diff --git a/scripts/alpine-rootfs.sh b/scripts/alpine-rootfs.sh index c29c92d1c682..30d426d6e88f 100755 --- a/scripts/alpine-rootfs.sh +++ b/scripts/alpine-rootfs.sh @@ -4,33 +4,42 @@ set -eu =20 WORKDIR=3D"${PWD}" COPYDIR=3D"${WORKDIR}/binaries" +UNAME=3D$(uname -m) =20 -apk update +apk --no-cache update =20 -# xen runtime deps -apk add musl -apk add libgcc -apk add openrc -apk add busybox -apk add sudo -apk add dbus -apk add bash -apk add python3 -apk add zlib -apk add lzo -apk add ncurses -apk add yajl -apk add libaio -apk add xz -apk add util-linux -apk add argp-standalone -apk add libfdt -apk add glib -apk add pixman -apk add curl -apk add udev -apk add pciutils -apk add libelf +PKGS=3D( + # System + openrc + udev + util-linux + + # Xen toolstack runtime deps + libbz2 + libuuid + lzo + xz + yajl + + # QEMU + glib + libaio + pixman + ) + +case $UNAME in + x86_64) + PKGS+=3D( + # System + pciutils + + # QEMU + libelf + ) + ;; +esac + +apk add --no-cache "${PKGS[@]}" =20 # Xen cd / @@ -45,7 +54,6 @@ rc-update add dmesg sysinit rc-update add hostname boot rc-update add hwclock boot rc-update add hwdrivers sysinit -rc-update add modules boot rc-update add killprocs shutdown rc-update add mount-ro shutdown rc-update add savecache shutdown --=20 2.39.5 From nobody Fri Dec 19 22:05:11 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=1744368764; cv=none; d=zohomail.com; s=zohoarc; b=QjU5Qw0h5Z3gZuInh4mM2hQekJT6SvraUZLeWFYdG+up4HHQ4j1biyuLVhe7I92BRUWLLXd5Jgy6JfvE6vryzQvIwL5RJfAMkPYW/Da6NvliKmkIJ3Rtp06ClvTxPDcxqbjFOcRbMw3bIofgYBzdb5rXKmmAOHzgu4XAX0pxbW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744368764; 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=Qvic3eUPy20STA5MQiJH4xRVltasBwTAFm2fFFSPQT4=; b=naNJtxtg3TPLaDiiErrAvgUzcO21pdV/v5kX9QUiGfB+xGUJ29sMyQ829n70JWH1t1hqJUJwqlcqtO0sIyHtr1BWIgkENiGezwmv7cmqoOp2ZwejlwErU46pltt9X9t18n+6CLWQOvZh6dBmwgG0xdLn2k3Tx/dwrL1sfArflKo= 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 1744368764964539.9224299289966; Fri, 11 Apr 2025 03:52:44 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.946999.1344739 (Exim 4.92) (envelope-from ) id 1u3Bzm-0006vB-Vs; Fri, 11 Apr 2025 10:52:26 +0000 Received: by outflank-mailman (output) from mailman id 946999.1344739; Fri, 11 Apr 2025 10:52:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u3Bzm-0006v2-S4; Fri, 11 Apr 2025 10:52:26 +0000 Received: by outflank-mailman (input) for mailman id 946999; Fri, 11 Apr 2025 10:52:24 +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 1u3Bzk-0006S8-EF for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 10:52:24 +0000 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [2a00:1450:4864:20::42d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0cb4603b-16c3-11f0-9ead-5ba50f476ded; Fri, 11 Apr 2025 12:52:24 +0200 (CEST) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-39141ffa9fcso2164593f8f.0 for ; Fri, 11 Apr 2025 03:52: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 5b1f17b1804b1-43f233c81f6sm78493215e9.20.2025.04.11.03.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Apr 2025 03:52:22 -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: 0cb4603b-16c3-11f0-9ead-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744368743; x=1744973543; 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=Qvic3eUPy20STA5MQiJH4xRVltasBwTAFm2fFFSPQT4=; b=SFUR96CLWNCllkL+p++kNCifey/R9yyIcrMKz8XHg44kdoYLVA5caS9Rp66Vvpxskr 91YqX1tjlVfPut4b7RzdeDJBRrD1tydPiveY3RtSqCMyowtdbg3wHw3sW61PmzXIZKsV GKOEjSko/68qeRwoSpPZWW+dPYnxc1TnGWYTY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744368743; x=1744973543; 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=Qvic3eUPy20STA5MQiJH4xRVltasBwTAFm2fFFSPQT4=; b=fEU7TI7aSBaVpYF+/2uFEuz9dp0wLCm1CVMHUr3OTAGliEG8j7+ClHGg9kPoya1vcP cofLVdeH7K/Zy8x/UUMCUJV8eYuvdCzjNrvVPwcUJ2L32r0MrI/I1BjBQYfBOqTz+gr6 RunEUAtsJzD6DcRjTq/pT4UCECzKTATosUZEQSM7F5JkGXvfp80oJK/WcXXSLglUcLXD xbCKlEl3WTWdrXbrGTj/rSlpxLigJGH0fIQJ0V4/WIPB02nLvXwvv7gS8ZotSX+4wF2R lbHSdSUvmQMQ0XnD8FDAz7rgkREHxewcbRuKIsCna7tz4GfA0kZifTiD2eCHRNTP5k0U yclw== X-Gm-Message-State: AOJu0YwxQkj9Z0aoUJVHV9BOSi7ckyQPwOMmwQIbXU1QvWlCDizh+qhf OV3+WpP8C+oUplIv/YF4WYFbBO8U7w0yuixhvB+CdDuqaae65xUIoHW8FEtHemp/euc5on3h3JY W0ak= X-Gm-Gg: ASbGncsbvvxx1YEVnJwMp6y3PP/kyBCaALmH/HXIsBGFPl/9yCkCw0iav+Ckc1o3VSN F++JzHu3RDSznsaPCO0key0TWeUTFoUjskL7+2ZgDuGdjHbfbNNjpC+mwcxxPlrxXx9xUfQk9kx 4k4o5g+LV9xWqWTg/GaDwzL9HKQyUKE8iPdYvQg6pJNuR48DBtwG3Y79+f23qEphFUqTvhXezgq AFaWzKCtFwzp+EiXUbdwrb7IGo2vz4hzhR6SWuB+ZF/5NnLQM88IbNu8tgBb+0qbWlarIoWAO9+ UkGjv1xlVBPH83fxFNNAlLcXnRaned2ZpVK7OPb51BtaV8fiFx6854Q1WecCYOoD3K58Kidw7eo JnepaoCgNQNZy3A== X-Google-Smtp-Source: AGHT+IHC/IoBpEen7blw8f+Nwf7qaOd4zRPDAm1sg1XHDwUmVsypkS0tFBpL4lqLOL1zNk2eTp/jUg== X-Received: by 2002:a05:6000:1787:b0:39c:2c38:4599 with SMTP id ffacd0b85a97d-39eaaec7559mr1517072f8f.48.1744368742858; Fri, 11 Apr 2025 03:52:22 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH 3/3] Provide an ARM64 rootfs too Date: Fri, 11 Apr 2025 11:52:17 +0100 Message-Id: <20250411105217.2141356-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250411105217.2141356-1-andrew.cooper3@citrix.com> References: <20250411105217.2141356-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: 1744368766311019000 The only extra package needed is libfdt. The older ARM64 rootfs configured modloop, networking and sysctl, but none = of this is used in any of the testing, so is omitted here for now. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki --- .gitlab-ci.yml | 7 +++++++ containerize | 1 + images/alpine/3.18-arm64-base.dockerfile | 6 ++++++ scripts/alpine-rootfs.sh | 7 +++++++ 4 files changed, 21 insertions(+) create mode 100644 images/alpine/3.18-arm64-base.dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 916c5ae9d508..3587d660aa62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,13 @@ stages: # # ARM64 artifacts # +alpine-3.18-arm64-rootfs: + extends: .arm64-artifacts + script: + - ./scripts/alpine-rootfs.sh cpio + variables: + CONTAINER: alpine:3.18-arm64-base + linux-6.6.86-arm64: extends: .arm64-artifacts script: ./scripts/build-linux.sh diff --git a/containerize b/containerize index c23f55ead737..38a434ab7075 100755 --- a/containerize +++ b/containerize @@ -24,6 +24,7 @@ die() { # BASE=3D"registry.gitlab.com/xen-project/hardware/test-artifacts" case "_${CONTAINER}" in + _alpine-3.18-arm64-base) CONTAINER=3D"${BASE}/alpine:3.18-arm64-base" = ;; _alpine-3.18-arm64-build) CONTAINER=3D"${BASE}/alpine:3.18-arm64-build= " ;; _alpine-3.18-x86_64-base) CONTAINER=3D"${BASE}/alpine:3.18-x86_64-base= " ;; _alpine-3.18-x86_64-build|_) CONTAINER=3D"${BASE}/alpine:3.18-x86_64-b= uild" ;; diff --git a/images/alpine/3.18-arm64-base.dockerfile b/images/alpine/3.18-= arm64-base.dockerfile new file mode 100644 index 000000000000..ab597c75b80e --- /dev/null +++ b/images/alpine/3.18-arm64-base.dockerfile @@ -0,0 +1,6 @@ +# syntax=3Ddocker/dockerfile:1 +FROM --platform=3Dlinux/arm64/v8 alpine:3.18 +LABEL maintainer.name=3D"The Xen Project" +LABEL maintainer.email=3D"xen-devel@lists.xenproject.org" + +RUN apk --no-cache add bash diff --git a/scripts/alpine-rootfs.sh b/scripts/alpine-rootfs.sh index 30d426d6e88f..220a8aedf4a1 100755 --- a/scripts/alpine-rootfs.sh +++ b/scripts/alpine-rootfs.sh @@ -37,6 +37,13 @@ case $UNAME in libelf ) ;; + + aarch64) + PKGS+=3D( + # Xen + libfdt + ) + ;; esac =20 apk add --no-cache "${PKGS[@]}" --=20 2.39.5