From nobody Fri Dec 19 04:18:36 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=1744216665; cv=none; d=zohomail.com; s=zohoarc; b=k39rEPUshtcgHFyy5X1suQ9h7KI7u1QOxsVBRC9ZUVfLbc7nWjjzylyFdnGQj85b5oIVLRnffeAFE2zXob7rVbJpfr4oSDGYz63nhjmKJCA/Of+VU42j3ydEc5puCEq/9TvSEbvxSkJxO/9wKSV8lAd7effE/me2wnMNzcy1cYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744216665; 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=xfWc4BVsk5hctD8Vm1IPFHGhadHzyMzEKKc9SX/jk48=; b=aY3c7zVIFjQSmHdGoAMjDlD0/BTtoCbQJnztSZ7WHDw7wby6gJtQ+5NsAEWjuhAr43VRfZSuQwQa8+VZN95mhjkallQ670l3Z0FLrUotbT8GDydz2vyANVDWKTkwRZzgFWjXUSG95lCUEX/3brnSd/+xR+aGhkUSgl3W5DVfPlQ= 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 1744216665726164.59852681410518; Wed, 9 Apr 2025 09:37:45 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944341.1342833 (Exim 4.92) (envelope-from ) id 1u2YQK-00056U-Al; Wed, 09 Apr 2025 16:37:12 +0000 Received: by outflank-mailman (output) from mailman id 944341.1342833; Wed, 09 Apr 2025 16:37:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQK-00056N-7g; Wed, 09 Apr 2025 16:37:12 +0000 Received: by outflank-mailman (input) for mailman id 944341; Wed, 09 Apr 2025 16:37:10 +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 1u2YQI-0004rn-KM for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:10 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e0eb4836-1560-11f0-9ffb-bf95429c2676; Wed, 09 Apr 2025 18:37:08 +0200 (CEST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cf06eabdaso63577885e9.2 for ; Wed, 09 Apr 2025 09:37:08 -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-43f233c817dsm20947455e9.23.2025.04.09.09.37.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 09:37:06 -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: e0eb4836-1560-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216628; x=1744821428; 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=xfWc4BVsk5hctD8Vm1IPFHGhadHzyMzEKKc9SX/jk48=; b=pUssh0lGtamQ51pJO4fz7opEajLTJ59wsrZVI4C3yiS3Bz0K3ZPkojLyUROg0dgepU gdjDJZh9TnfTnGMfTEppimKS+8QDp9WxJjOdr0+rAN7DH+6/NWzPwrA4mjKapTnyF02d gxVKhUSXjbkIL+i6XXJS8uJ/Cxm0qOQ+zGfX4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216628; x=1744821428; 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=xfWc4BVsk5hctD8Vm1IPFHGhadHzyMzEKKc9SX/jk48=; b=S/pHQm8Eowamw4j2ILi/2RdUPhuygOBMsmzMmYIOZ841ipfZLz/OkqaGz0CxWODYZm zPjvd5LEdaGmTijgGmGtH83xrBBwT5fTCbe8LqShlcGv270jLN8sB1keEGtp/YwSENaI aI1rQ4O1f7U0n4/Z4ZGazYGcXpSTY+yEn0PK4DyscPgKCL4t5rJ8ptctUBd2DjoWOH/H lxDJht/3S0u8QTbEXTUvkAGl0v9gUBxBeU0cdhOvoD3UnLcPVZROqDJWkumgoSCfqxS2 qZ5tf25y2ZYuETCGJv35MJPUBtRKJ6/m7phKAkv0KaAiFOgF2obx2abDiOlQlYJXKDKa gpGg== X-Gm-Message-State: AOJu0Yz39IR9G9ZfUR6dfWQwM+OJsskGK3hGBrATpun7m14gKJDy3whf yjYgfxla9uDJkS9Ju6/CoytMibMYQp+Ldf9ezvhk1qTRMauaAaJEgkzSY9Lc7FKGQxPzmHFGXrM 3Euw= X-Gm-Gg: ASbGnctFNp/Zu2yBkJ+I+OuZWuTCC5cNC54nYAgASYf4fQMKa/lVYZiQUeyHEXWgndC RCTZGs1/Cx5PgMmn7luvjLLhsfSR7gBALQGqD6RlkC4CJ2ApBnmgQu4Lf/TC3IIraJ0DRPOgzQm gAIQGgdFsnPSofWr4YzydiG4L+nzNIKAoZW7OBevEOMAPOPLuDRZbRzMlSSqnQBXhiqoemieMjn uKCw4DKEafX0iXb0GZhg7EL3st3nmEZEgVOtN/rjVSwfeb01lOdsIkV9iok0ruwh6Bfgz9r1IjK 2eHEQfBIh6tEGefxs3QkGMCiyCTwRtyjRQkbBpj8FjtyxXZs2lEaKl5baPYkxVpTvFaHNx/F0vE nsv7eDZvnUu7sgg== X-Google-Smtp-Source: AGHT+IFD4Gqa1kh5MZVk5EZ62aaD+TlZ8XM/yP9/4iuicCVy1v48xNnEl7AIY0JH16+pFVM2/TaA/w== X-Received: by 2002:a05:600c:4f53:b0:43d:b85:1831 with SMTP id 5b1f17b1804b1-43f29d90286mr15315275e9.0.1744216627656; Wed, 09 Apr 2025 09:37:07 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Andrew Cooper Subject: [PATCH 1/8] Consistently use DOCKER_CMD in makefiles Date: Wed, 9 Apr 2025 17:36:55 +0100 Message-Id: <20250409163702.2037301-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250409163702.2037301-1-andrew.cooper3@citrix.com> References: <20250409163702.2037301-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: 1744216666469019000 From: Marek Marczykowski-G=C3=B3recki This allows rebuilding containers using podman too. Signed-off-by: Marek Marczykowski-G=C3=B3recki Reviewed-by: Stefano Stabellini [Ported from Xen] Signed-off-by: Andrew Cooper --- images/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/images/Makefile b/images/Makefile index 42f231bcce27..b0b7a7cf63ee 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,3 +1,4 @@ +DOCKER_CMD ?=3D docker =20 # The base of where these containers will appear REGISTRY :=3D registry.gitlab.com/xen-project/hardware/test-artifacts @@ -11,9 +12,9 @@ help: @echo "To push container builds, set the environment variable PUSH" =20 %: %.dockerfile ## Builds containers - docker build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $( (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 1744216663161408.47269577824727; Wed, 9 Apr 2025 09:37:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944342.1342841 (Exim 4.92) (envelope-from ) id 1u2YQK-00059n-MA; Wed, 09 Apr 2025 16:37:12 +0000 Received: by outflank-mailman (output) from mailman id 944342.1342841; Wed, 09 Apr 2025 16:37:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQK-00058u-FK; Wed, 09 Apr 2025 16:37:12 +0000 Received: by outflank-mailman (input) for mailman id 944342; Wed, 09 Apr 2025 16:37:11 +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 1u2YQJ-0004rn-AF for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:11 +0000 Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [2a00:1450:4864:20::32a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e1603400-1560-11f0-9ffb-bf95429c2676; Wed, 09 Apr 2025 18:37:09 +0200 (CEST) Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-43cf3192f3bso67469545e9.1 for ; Wed, 09 Apr 2025 09:37:09 -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-43f233c817dsm20947455e9.23.2025.04.09.09.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 09:37:08 -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: e1603400-1560-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216628; x=1744821428; 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=WikkQXD4kZveDb/959Oc1/hEF4sz0oUbKzkkNBhCfIM=; b=WDeKvUD/gRn3S2eHJP3inoGO+JI82WAIo7qrDmG5+mIn9xPAN6XLKoX9ysh9K+uw9+ 765b0j4ynVwI9msk/yx5i5seM9YBKtlxGIa2Foad5uoD+yDacP6tY1ZDZ+a+2u+vJR4s zmvWicNTsjTpNL7c/Ba4Y9A6usnS4yOih60TE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216628; x=1744821428; 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=WikkQXD4kZveDb/959Oc1/hEF4sz0oUbKzkkNBhCfIM=; b=a6u36UwCLS++tEXi5goC31wJZE6I9WxZs6/a9hV785H9SWYYZ4r+yeDpWzwlC+JkNE G0yu2ffgWzsGkGDTKKvEG18nYfd9L08aHGQcpvQ/wsHJs7QHEEUEaBwfeMmBC0dmWAbw cHT8V2GGxDUVPkupXYqdghp5FB1NeJi1X6JXNV9zMpqw1hxoZgQx5eHyfMjFIlwA5Gll XTBGeT2tacfVXB77YOWX1oQ2Aqj96D1Xv0tnjRkOnFroH9oh3sGOigAg6fGm89LKbB25 RhI3x+RmJNjiMrtDUZdKz4ue1O8lU3lWdpIUZdSS65LwQ0D/jgyS+jzf+uMTSmH69VTP wfpw== X-Gm-Message-State: AOJu0Yxj7qTn+lww3YIIzfc2h7Q0LtI53Pk/4VPrysEzvwNAuXRMjS0z +RVDW+P4uLdw9QzLlv4RDZ65QTXBQFY8FSbCmHuEzcppmjKFUfXdodISqFRJXRcnV+VkbAjci6V zuwU= X-Gm-Gg: ASbGncsjlpvnhHJZxIZSh07yk/pNd4B6smdz/X46ke9UthEhSRbzASS4Cv1mZUZu4IH 1R7MFbwDjddjARS+/DY/SbMMMhW26lWSDYZFOq1jGXpZePCrsmsxSgkVyNLyOCzHL3wmziK9S0m A7CcMXQB/YnVwnveWNaqMFn/ot4cN03O1yozJ7sVGf89SdVq6PXJhK0p8W+Ni2kqQln/skkzOsf 7tlWjEXmte+3tYSLozT88bKx5hCdoOWMvQPobh40kz0MNAsxCUBzUrvTVIgAzngc68DTGydQTvz y1yVlWtWAXueWgzjYpJVvAzqXzLSN6OAGpKwEN+ioDEMBlGEI2oKeAZZT1+3DtJKiDa+UcO3BKB tWuBQ/P3lWqMmCQ== X-Google-Smtp-Source: AGHT+IHtUt26LX66Z0WBU4goSEbOVUNSP/4DzsgdbS77DKLY2GKN4mLBaOOitfkuKxGmYoyvBI2YiQ== X-Received: by 2002:a05:600c:1909:b0:43d:b32:40aa with SMTP id 5b1f17b1804b1-43f1ec0d15dmr36404445e9.3.1744216628397; Wed, 09 Apr 2025 09:37:08 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Anthony PERARD Subject: [PATCH 2/8] Port containerise Date: Wed, 9 Apr 2025 17:36:56 +0100 Message-Id: <20250409163702.2037301-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250409163702.2037301-1-andrew.cooper3@citrix.com> References: <20250409163702.2037301-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: 1744216664445019000 While it pains me to keep the wrong spelling, do so for consistency. Signed-off-by: Andrew Cooper --- CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki CC: Anthony PERARD --- containerize | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100755 containerize diff --git a/containerize b/containerize new file mode 100755 index 000000000000..c32e40f5a6d9 --- /dev/null +++ b/containerize @@ -0,0 +1,94 @@ +#!/bin/bash + +# +# DOCKER_CMD should be either `docker` or `podman`. +# +# if using (rootless) podman, remember to set /etc/subuid +# and /etc/subgid. +# +docker_cmd=3D${DOCKER_CMD:-"docker"} +[ "$DOCKER_CMD" =3D "podman" ] && userns_podman=3D"--userns=3Dkeep-id" sel= inux=3D",z" + +einfo() { + echo "$*" >&2 +} + +die() { + echo "$*" >&2 + exit 1 +} + +# +# The caller is expected to override the CONTAINER environment +# variable with the container they wish to launch. +# +BASE=3D"registry.gitlab.com/xen-project/hardware/test-artifacts" +case "_${CONTAINER}" in + _alpine-x86_64-base) CONTAINER=3D"${BASE}/alpine:x86_64-base" ;; + _alpine-x86_64-build|_) CONTAINER=3D"${BASE}/alpine:x86_64-build" ;; +esac + +# Use this variable to control whether root should be used +case "_${CONTAINER_UID0}" in + _1) userarg=3D"-u 0" ;; + _0|_) userarg=3D"-u $(id -u) $userns_podman" ;; +esac + +# Save the commands for future use +cmd=3D("$@") + +# If no command was specified, just drop us into a shell if we're interact= ive +[ $# -eq 0 ] && tty -s && cmd=3D("/bin/bash") + +# Are we in an interactive terminal? +tty -s && termint=3Dt + +# +# Fetch the latest version of the container in hub.docker.com, +# unless it's a newly created local copy. +# +if [[ "_${CONTAINER_NO_PULL}" !=3D "_1" ]]; then + einfo "*** Ensuring ${CONTAINER} is up to date" + ${docker_cmd} pull ${CONTAINER} > /dev/null || \ + die "Failed to update container" +fi + +if hash greadlink > /dev/null 2>&1; then + READLINK=3Dgreadlink +elif [[ $(uname -s) =3D=3D "Darwin" ]]; then + echo "Unable to forward SSH agent without coreutils installed" + unset SSH_AUTH_SOCK +else + READLINK=3Dreadlink +fi + +# Ensure we've got what we need for SSH_AUTH_SOCK +if [[ -n ${SSH_AUTH_SOCK} ]]; then + fullpath_sock=3D$(${READLINK} -f ${SSH_AUTH_SOCK} 2> /dev/null) + if [ $? -ne 0 ]; then + echo "Invalid SSH_AUTH_SOCK: ${SSH_AUTH_SOCK}" + unset SSH_AUTH_SOCK + else + SSH_AUTH_DIR=3D$(dirname ${fullpath_sock}) + SSH_AUTH_NAME=3D$(basename ${fullpath_sock}) + fi +fi + +# Figure out the base of what we want as our sources +# by using the top of the git repo +if [[ -z ${CONTAINER_PATH} ]]; then + CONTAINER_PATH=3D$(git rev-parse --show-toplevel) +fi + +# Kick off Docker +einfo "*** Launching container ..." +exec ${docker_cmd} run \ + ${userarg} \ + ${SSH_AUTH_SOCK:+-e SSH_AUTH_SOCK=3D"/tmp/ssh-agent/${SSH_AUTH_NAME}"}= \ + -v "${CONTAINER_PATH}":/build:rw${selinux} \ + -v "${HOME}/.ssh":/root/.ssh:ro \ + ${SSH_AUTH_DIR:+-v "${SSH_AUTH_DIR}":/tmp/ssh-agent${selinux}} \ + ${CONTAINER_ARGS} \ + -${termint}i --rm -- \ + ${CONTAINER} \ + "${cmd[@]}" --=20 2.39.5 From nobody Fri Dec 19 04:18:36 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=1744216649; cv=none; d=zohomail.com; s=zohoarc; b=F7sb6NKl31xOkFkkB0Mi2z9VvzGHG/COVIP0J8IhXtzgla9IGdF9/jIv7Vv8/Nx8H9aP3CqaS2jcN89Z+/NAfJ+e9ckUQzMQRbHFHf2VopoEoy/4Rhb50ODVq1S+3tSJgj6fBQ/LzHws9vQeV/mNnPl5lm4RnZfGPaY5Ww9NKMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744216649; 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=HPj2BkEUlG19zfMbN8eKndFls2Zns5SZnbPzD3KxiXw=; b=IAb/O7H7GNvtrcdwTp5neUFLNjqnO2iicqF7Ho1DiNvFTdDovVcQy2iui6WkKd273tS2aQwLECHOZTDqxxWYgjT5gR3P+YfnW2ENqee3P0RHz3ftOgMmlgRilJy1klXIxlEE/UzXZBm3ng8YBcpkusOxStKX0QNii5X/msnGf6Q= 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 1744216649779908.8115165200339; Wed, 9 Apr 2025 09:37:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944340.1342824 (Exim 4.92) (envelope-from ) id 1u2YQJ-0004s9-4m; Wed, 09 Apr 2025 16:37:11 +0000 Received: by outflank-mailman (output) from mailman id 944340.1342824; Wed, 09 Apr 2025 16:37:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQJ-0004s2-23; Wed, 09 Apr 2025 16:37:11 +0000 Received: by outflank-mailman (input) for mailman id 944340; Wed, 09 Apr 2025 16:37:10 +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 1u2YQI-0004du-Fz for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:10 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e1d912c0-1560-11f0-9eab-5ba50f476ded; Wed, 09 Apr 2025 18:37:10 +0200 (CEST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cfdc2c8c9so41017625e9.2 for ; Wed, 09 Apr 2025 09:37:10 -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-43f233c817dsm20947455e9.23.2025.04.09.09.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 09:37:08 -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: e1d912c0-1560-11f0-9eab-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216629; x=1744821429; 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=HPj2BkEUlG19zfMbN8eKndFls2Zns5SZnbPzD3KxiXw=; b=GwDU6u2JfWP9nKc/jsTflcNXZc/ldRL2c9KHd8eMtnuy01+p9g7NPV1aQe9qTQ3/Y0 rYW5SIv+j9kbskPGEoylAz4DYAw3PcnrStceBdm5da7SbspMxfK03XdAN06FAJ1DyZm4 EErAHaTwVxXZi49BttxMPiwM6HgPaVa+RQSow= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216629; x=1744821429; 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=HPj2BkEUlG19zfMbN8eKndFls2Zns5SZnbPzD3KxiXw=; b=LjNlczB6I1leIZlO59FThG6xM6e5MPwC8G9QHN4jhbot9yAJ03PyO5ejUVVGnm1RZb MKAiiXoQPIlJkBQoUeCA7f6BnpvfV+eiP7BgVL431d9XR+INM3JP0DeLDj2hJa6x1g0B y1n6PtmxnUtAbtp2+zgF2qa4S2efJ7vIE2SUTckDd7BMdp7IUPUSuXWMRBHECPBFZKLP 5PXOFq49/kJsBoEUgpk3dM5BzoXcq0zT6GaWOHWPVhVr55NNDXkzwcWlpvSivVcvIaiO Xi9X7J98Yxdup9l4Hmn268GnIp/Az1fvwFCSEaofXTIwVi4GV7qtzRCX6h1w926kvJLO AwsQ== X-Gm-Message-State: AOJu0Yyyhy9pnvZDjwdFdh5XsRV5wnqlHM7B9YLWGF1W170vbdiUxcD2 /wgRUAb3CwMqUEcua7633mVJ08KHU42kR/gkGlKfPDZMTeU1q5lMsIf6fLuVf4CoYaDu+57StI7 G4Hc= X-Gm-Gg: ASbGncsR8xRvy1HmM7M/WcI3OCICuWHOD0+d+RMD9Y/Nh3BVbLUZ3/+UXM/mdCB3zUP sUrez0cxFdxD96Xp9D9gdAIrqpgRa5pVQSAO3izcG51Zee9aMoMxL4+EPYfuH9Dwz1TYDmLXfO8 QIQXEieVUyPw93gJ/bD95udJ1Vda27YgTk1ZnF+cdlTZEUH1FvSpHdmOo3B2gAWvn9ujaTuzQb/ OrRvpBFk35uRe+HNwscOG8y9D7Z4xqR0fsT+qNNJAcb8NcXFvKTDVE87Dcgx4UqdTHjPycrJoPd IBivQQ9V8S1RG7SS4xRdh8pT4xWUHxh+f+BVSfIik4Rp9el8TMCKZEzE2/jF5HfTTP+1V6WNr47 ddVuUXcIfmAd5wQ== X-Google-Smtp-Source: AGHT+IEhNqBFFFM0nTh5hLtgrHCJrROHI9w4zseqll/oh/0Ofo7RMHkm7cZtluTAVt65V+deuommFA== X-Received: by 2002:a05:600c:1c02:b0:43b:c5a3:2e1a with SMTP id 5b1f17b1804b1-43f1ec7cc9cmr38097685e9.2.1744216629188; Wed, 09 Apr 2025 09:37:09 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Anthony PERARD Subject: [PATCH 3/8] Fix container user setup Date: Wed, 9 Apr 2025 17:36:57 +0100 Message-Id: <20250409163702.2037301-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250409163702.2037301-1-andrew.cooper3@citrix.com> References: <20250409163702.2037301-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: 1744216650764019000 Use USER (and 'user' as normal), rather than specifying configuration from = the outside. This also fixes the fact that root-needing containers need to override the default. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki CC: Anthony PERARD --- .gitlab-ci.yml | 7 ------- images/alpine/x86_64-build.dockerfile | 7 ++++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e18a87b3a07..36ec6a7e1ee5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,10 +14,6 @@ workflow: =20 .x86_64-artifacts: extends: .artifacts - image: - docker: - platform: linux/amd64 - user: xenproject tags: - x86_64 variables: @@ -32,9 +28,6 @@ x86_64-kernel-linux-6.6.56: =20 x86_64-rootfs-alpine-3.18: extends: .x86_64-artifacts - image: - docker: - user: root script: - . scripts/x86_64-rootfs-alpine.sh variables: diff --git a/images/alpine/x86_64-build.dockerfile b/images/alpine/x86_64-b= uild.dockerfile index 3bfd17248d0a..6bfdb6ff5a0c 100644 --- a/images/alpine/x86_64-build.dockerfile +++ b/images/alpine/x86_64-build.dockerfile @@ -3,12 +3,10 @@ FROM --platform=3Dlinux/amd64 alpine:3.18 LABEL maintainer.name=3D"The Xen Project" \ maintainer.email=3D"xen-devel@lists.xenproject.org" =20 -WORKDIR /build/ - RUN apk --no-cache add bash =20 RUN bash -ex < (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 1744216655128342.17850295629444; Wed, 9 Apr 2025 09:37:35 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944343.1342852 (Exim 4.92) (envelope-from ) id 1u2YQL-0005Y8-RT; Wed, 09 Apr 2025 16:37:13 +0000 Received: by outflank-mailman (output) from mailman id 944343.1342852; Wed, 09 Apr 2025 16:37:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQL-0005Xt-Ns; Wed, 09 Apr 2025 16:37:13 +0000 Received: by outflank-mailman (input) for mailman id 944343; Wed, 09 Apr 2025 16:37:12 +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 1u2YQK-0004rn-C6 for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:12 +0000 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [2a00:1450:4864:20::42d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e251ed68-1560-11f0-9ffb-bf95429c2676; Wed, 09 Apr 2025 18:37:10 +0200 (CEST) Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-38f2f391864so3903035f8f.3 for ; Wed, 09 Apr 2025 09:37:10 -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-43f233c817dsm20947455e9.23.2025.04.09.09.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 09:37:09 -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: e251ed68-1560-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216630; x=1744821430; 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=CmOUNq4jgp3B3A9yw2zDpgYQIvmYUHtEyo79prjaP04=; b=JT1FKSmAZoo6SIGvs68oqvkFexIyYmNAKeOVkMgTKRYwIh9zcKBUuTqt/BZZ575n/h E0FdorTxWUVK2TTEmhYpjtFpvAYY6EVLeIO98OyF3oNilQ4tmMdvLlU5SK+8zdz6FDaQ WHwP6HW8F4jLwkxqnl46roLIoAfaumZpoHg7M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216630; x=1744821430; 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=CmOUNq4jgp3B3A9yw2zDpgYQIvmYUHtEyo79prjaP04=; b=LTGFvzuZdM5EgYEpZaOhLKsIu+yAAZsJtrr4+p+0RBXUiGXSjRPpNtQTzAUrbxnGOn sdf6LjRTqEqaGPc5rbHU4cuXMxI5lY0NhnzaS6Zou50Zl7LpFoGAfosmG14EgRioV9Dv ML6FtMCvH3vGqkwAZZQLRe3h5lHZNC/9gShMeWZc0LuGM8KmcIVQa+2scOFr0GOOpAiM HlosKLU0A3noLpQtiJsR7F2N/omE3T6jwmkg7bmk+aZN7dgIbcIMQAf3s+ORm+vTMFcj i+7n1TqnXj87b/HzQ9/xSu7daoHVfu8raaaMPxKHgixtxgTVxSS/e/nm4N+OdJKyvbWv bckg== X-Gm-Message-State: AOJu0YzQEzjAClcX2gFOgZeyoLX9nc687DmEI4kJI9pXAavsdlRKhQyx LpTsftqO0fhC6HqjRiTt6A8K1tVBaAC0uz8TqvmL60uD2OE4O+VctJTQhvwbLF0H6Lc4oTSRbsi wIqM= X-Gm-Gg: ASbGncvKctthRrl4IQ7nFar0bU/Fr5j384tm636VIHLL5K9gRoN0bKxmOJAdPt9D41u 43ho5mcvGKBeR+LX/rkSNXfrHZ8kiD+n1J5AU2voqsSt0FmQtdaelNsYaB+p3XX8skhLzff2r89 f6SCkPk64Y3gWR2dfzIPyA3r3zC0xpjwZpWzUOxSEdsewNFJVtYzGxtuDF75my0s00hXinXE0Yg CWFVX0WiGKtLX3uqoEhZVmk4dc1lhyn44Y6N3wMAW5ccX5ZSgB5WAjq68izyAEYffvlQfWoY5gy B1WcetihzenmlaqOsWZbHnNp2X7MjT3EWRSOga7QgJ/HjfblOYvSVgos0K+TVGoLEJdAm0wuidw VcXw+KOxjQwfJjg== X-Google-Smtp-Source: AGHT+IFZgAc4JGBWrB/+Jh+tmojjQ8rvS3vS1nP5n8O3GiLQXjS/c4qJNs2WCNnDO6ihOoxixa3kCw== X-Received: by 2002:a5d:5847:0:b0:391:4674:b136 with SMTP id ffacd0b85a97d-39d87ac2fdamr3042032f8f.29.1744216630057; Wed, 09 Apr 2025 09:37:10 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Anthony PERARD Subject: [PATCH 4/8] Clean up Gitlab yaml Date: Wed, 9 Apr 2025 17:36:58 +0100 Message-Id: <20250409163702.2037301-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250409163702.2037301-1-andrew.cooper3@citrix.com> References: <20250409163702.2037301-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: 1744216656539019000 Factor out the registry into a common location. Fix the worflow name. List all the stages. Set a default expiry of 1 month. Note all the current jobs as legacy. Their naming scheme needs changing, a= nd we'll use this opportunity to switch formats too. However, the artefacts n= eed to stay using the old name until the final staging-* branch using them is phased out. Signed-off-by: Andrew Cooper --- CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki CC: Anthony PERARD --- .gitlab-ci.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36ec6a7e1ee5..5a0a853e551d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,19 @@ +variables: + REGISTRY: registry.gitlab.com/xen-project/hardware/test-artifacts + workflow: - name: "xen test artifacts" + name: "Xen test artifacts" + +stages: + - build =20 .artifacts: stage: build image: - name: registry.gitlab.com/xen-project/hardware/test-artifacts/${CONTAI= NER} + name: ${REGISTRY}/${CONTAINER} artifacts: name: "${CI_JOB_NAME_SLUG}" + expire_in: 1 month paths: - binaries/ exclude: @@ -19,6 +26,9 @@ workflow: variables: CONTAINER: alpine:x86_64-build =20 +# +# The jobs below here are legacy and being phased out. +# x86_64-kernel-linux-6.6.56: extends: .x86_64-artifacts script: --=20 2.39.5 From nobody Fri Dec 19 04:18:36 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=1744216663; cv=none; d=zohomail.com; s=zohoarc; b=ikzXluv5MiLE63mbRYrkegyyN/Ns/QxXy0OLoIoIOwyGxkxH7Ew3hl2pRBfMRTNreowY0cI37y82x8VBM5if+ktJv+8wBE7zPAl/4eKhzfGiJoe+U/VVjDHDDLAF2VIqyrOnzcd/WYOshcG32H6/MN6kZmT7oywmLk2nF/U8TAg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744216663; 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=SyQzuwD6xN4VRWg/MDtNd3j0QqAGhL/LmpWTv3MgUQA=; b=lpeFqDTVwrTbVuYm+d2GLNuS0p6+EZlN1JzjLGfygDrXpwD04rRa7jSZB2Mc8raQgy3v1PygLCw2irlPWGnxbmjqc7F8MZSYUBQ8TyVTuNIy0JS4b6ATH5Xzv8TgybQha1Nim+f4cnZn01ECGODQGdBGqu2W6vdLUl6U2oAp+Tk= 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 1744216663188533.4433495493356; Wed, 9 Apr 2025 09:37:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944344.1342858 (Exim 4.92) (envelope-from ) id 1u2YQM-0005eN-AG; Wed, 09 Apr 2025 16:37:14 +0000 Received: by outflank-mailman (output) from mailman id 944344.1342858; Wed, 09 Apr 2025 16:37:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQM-0005cM-5p; Wed, 09 Apr 2025 16:37:14 +0000 Received: by outflank-mailman (input) for mailman id 944344; Wed, 09 Apr 2025 16:37:13 +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 1u2YQL-0004rn-AO for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:13 +0000 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [2a00:1450:4864:20::434]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e2c310c6-1560-11f0-9ffb-bf95429c2676; Wed, 09 Apr 2025 18:37:11 +0200 (CEST) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-39ac9aea656so5947342f8f.3 for ; Wed, 09 Apr 2025 09:37:11 -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-43f233c817dsm20947455e9.23.2025.04.09.09.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 09:37:10 -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: e2c310c6-1560-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216631; x=1744821431; 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=SyQzuwD6xN4VRWg/MDtNd3j0QqAGhL/LmpWTv3MgUQA=; b=T9Xk/ZMZ1wxVdl8LLhyumbiYoAHoTazBFK1QrX084FCvA5Pl/fQQ/yywru4xtbENdi UW5BxFREnnc7mf67oC88M0F/inn6yawKxRV0Rr23Yxkx5u6h72e6ezOSlOsM9mkDPujg 3thW2snNyy+YHEugnO10PXvsEGZwsqmxEmRjo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216631; x=1744821431; 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=SyQzuwD6xN4VRWg/MDtNd3j0QqAGhL/LmpWTv3MgUQA=; b=NW3V83mUkFid0FGOFqTvDIvu6J2gGk9TOQ3O1w4OJm/e8V2Toav2Umvty8bj71l7hl a2Jc2IuB3L0MQ96oslOwV2dfSYGdy5pLXTDJoSFRtb7HRKio+Ewe10O6mKBhUGDwY87C gzJOc1EMF6hAuXKbgpGaQ5hMaYSYVfneFk2n8vF+HI5dHrfv7XLknn6Z2WpVcBBtVcua Fjt2lmhW4U5wzkwm6PDZKKHZTTG74SJ808lDkbdI+8UOboGE5d9hn9rF1zZRBfk2hntD WkNyJtIwOaJJsoId5avVjZBsGRHHbZ14uyxKV3uIH49uLyZvgAJWWOkiZLzIT+6A+50J TA+g== X-Gm-Message-State: AOJu0YxV1E9rd/MA7Ri2+D7juAKrBsYfteLLKyNls/YjV/POrBiZ4ywj HRkkMTvLP9yL6RNx+lv9XiLaXEdHH1znsu39QWlMPmNvRxRiinQ5+WwXI4lHPOK5Yb2oZEsHV8S tm4Y= X-Gm-Gg: ASbGncu0bV6c6Tmf2lIegIjeymd1ZNnV47V6c9n2Ih5YzINJB5/8yO0mOEUdDvmJiXJ /p4GKm+8DNs83pKdYd/bxJh5+Q9ZgBqV0qlTAE4vLtXSmd5ooqwXGIo+jYSA18b8NA9YlQaNJk2 /yv7gjT+JNMI71L2qK68X/6tZEDpXNRsnMbeihykD5f0eUMXd+T6ReDLNFRwynY+btnDzgrhZq5 luEmZtxUz5iA7AO8E524FokSfiTgdPxF2zeWzRwyx1tP8xX7ZfkI9xk+dCi8g4hNbwjf9sR4rBA 6aixFXkTVquVwmMgmxrHTOFQJ9P1Ksnr/zM5WpsRnGtQGHUDZmHoyVgZYp4BsPj1KhD2cBYD08P X2UL362py34u0DjM3owD6Ji3b X-Google-Smtp-Source: AGHT+IGOcdGsljIjVVsdsWALFvdinkG6lUUagjLK1Jl/TKh9PJiq/vx2t1e+kFxVdlNMwFC6UbzijA== X-Received: by 2002:a5d:64aa:0:b0:39c:142a:ed6c with SMTP id ffacd0b85a97d-39d87cd0301mr3678848f8f.40.1744216630737; Wed, 09 Apr 2025 09:37:10 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Anthony PERARD Subject: [PATCH 5/8] Adjust Linux build script to work with other major versions Date: Wed, 9 Apr 2025 17:36:59 +0100 Message-Id: <20250409163702.2037301-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250409163702.2037301-1-andrew.cooper3@citrix.com> References: <20250409163702.2037301-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: 1744216664381019000 Also use 'tar o' to decompress based on file name. Signed-off-by: Andrew Cooper --- CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki CC: Anthony PERARD --- scripts/x86_64-kernel-linux.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/x86_64-kernel-linux.sh b/scripts/x86_64-kernel-linux.sh index 2a816f0b3204..5a0160655bea 100755 --- a/scripts/x86_64-kernel-linux.sh +++ b/scripts/x86_64-kernel-linux.sh @@ -11,9 +11,10 @@ WORKDIR=3D"${PWD}" COPYDIR=3D"${WORKDIR}/binaries/" =20 # Build Linux +MAJOR=3D${LINUX_VERSION%%.*} curl -fsSLO \ - https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"${LINUX_VERSION}".= tar.xz -tar xJf linux-"${LINUX_VERSION}".tar.xz + https://cdn.kernel.org/pub/linux/kernel/v"${MAJOR}".x/linux-"${LINUX_V= ERSION}".tar.xz +tar oxf linux-"${LINUX_VERSION}".tar.xz cd linux-"${LINUX_VERSION}" make ARCH=3Dx86 defconfig make ARCH=3Dx86 xen.config --=20 2.39.5 From nobody Fri Dec 19 04:18:36 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=1744216663; cv=none; d=zohomail.com; s=zohoarc; b=ZjIZxCvFnaDubOAkP6kouJZCCGPo/o5Kww6yVX+9JCNXL6i+bqHNo2tZancJqVFWV8zH61ScbS5zQ5Hr+RpOFkqLBkqQ4yDe334ogyI4kUiamlVA3jzeCjZAvTpCNfJtFeHfYc/0UuagvP24AeQhLpwKTiEX3+Crram8ETVgZEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744216663; 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=IltmhtHT5BBVSpsleYVnDmlWB3S52pBC6IXbUI4pNWI=; b=kBqXFQdQlnj/fzHacaTaHRaY/2mOL6q29OXx+tr/eFyaAvaek4QPCBHHZdEQo8tydp2hpkCIeAQwNK1fAGd+T1RX6PprH4X3fn0Q2IrUJeiKdVBE4wCZND67y8DXwnx8B6apMVKrXm+3wrlo7+Nq1hwN5ujbAKRAjf+01a5NQCA= 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 1744216663160518.7971677424455; Wed, 9 Apr 2025 09:37:43 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944345.1342865 (Exim 4.92) (envelope-from ) id 1u2YQM-0005l9-O0; Wed, 09 Apr 2025 16:37:14 +0000 Received: by outflank-mailman (output) from mailman id 944345.1342865; Wed, 09 Apr 2025 16:37:14 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQM-0005k6-Hh; Wed, 09 Apr 2025 16:37:14 +0000 Received: by outflank-mailman (input) for mailman id 944345; Wed, 09 Apr 2025 16:37:13 +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 1u2YQL-0004du-GQ for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:13 +0000 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [2a00:1450:4864:20::329]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e3873bf4-1560-11f0-9eab-5ba50f476ded; Wed, 09 Apr 2025 18:37:13 +0200 (CEST) Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so47453455e9.1 for ; Wed, 09 Apr 2025 09:37:13 -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-43f233c817dsm20947455e9.23.2025.04.09.09.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 09:37:11 -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: e3873bf4-1560-11f0-9eab-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216632; x=1744821432; 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=IltmhtHT5BBVSpsleYVnDmlWB3S52pBC6IXbUI4pNWI=; b=AK5staHq0nth2sCdNcGTytOj1Tl8l7+R88tjEXHf95zrS+j+b5O7FLmL2o4awBtLo2 UQA/sWIYNvibLf7SKSPdd/FIHIdMFWMDrzkq4ONjhy9ZZlwQuSn2DnoowvTgA92xF0s3 93QOO8pXpfQTH1D+I3eEmDVHns6qIH8ZdrpJA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216632; x=1744821432; 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=IltmhtHT5BBVSpsleYVnDmlWB3S52pBC6IXbUI4pNWI=; b=GLrH4jm3y3H4TTvEqRWmKpCOdVibwoJwwacwY2thCNdUoaVfcEL0UsaRhIBqqltK32 mdt4hd8afD3gdIQjVP/GbR9MimodE7pKxM/tx2M3qosg5ANow1aPYfYvVfOMFn84NK8y GKz8Scog2/4dpcCzApnfUwWuU+g4ZjAZ18hAGSnujPn11+R1EmZgS8WdmEm4dyYkQfEc wZCBJrvnH2fuoUdBnlJDyGcZ2l0tvM2qgs8UYNmuXZ7lK3Tuh7vXj7HFXVumCdCpVHWw 4YWIGqE7wHUA+mgOwb/2gpd28+fWkdezg560Ox7blLZMmV0T8z+I1ZXjYJCqRBuZlZ8g pGwA== X-Gm-Message-State: AOJu0YxVZxZMgNSonAvj6RhAvnR8uhIviB0Zd0UlKqLqalfwb1c4Uxi1 U9kS9ToQcJzHhr3NitxEs0Pxk9+uVsFxZ7P1rZCzp3afNS83vzWbQGW8BTxz+sdcUU8TSv+KQrh 9xUQ= X-Gm-Gg: ASbGncvCrw+VMJF1LXzjiEdZsWoflovsyoXrBgT+JQCTxw+YEzurRWndUtjxg+SjD9u MfsxBG9Xl8GO6waznamcC/T2rz7RGxZtnXEX3Wb5LbkPUUndJWnRAtKxXd0UOrxHPO1Eaw+9vun +RZ9syhg/63jmAWLKNzmDqOcd3oWtGcJLa48fCpRLmQDv/WANjHh3y0JSx6t+aS0EPrFy1cPoLc GlUZxlnYIewVrdyvzkuhD6e6E2UiZ35anKY05vLmwWovJD25fDYdBoJMj2qbRFON4IA6xjd/Ni/ C7L4qtR2OIRxeQ6txhG0KNarAo2zFL1gxctW01JXxcT308eQfgBEOfl5w78CaGz/ws1SeEOS3og 3HAHop6bKwEGt/4ZUD1HOs0e+ X-Google-Smtp-Source: AGHT+IEWpUEEFYkSqnG+ZB6hcoZyumqk8nW6Xhw9oFU/OuNIS9ePZMvLjHfUbXh/CYGghUEQluNSXQ== X-Received: by 2002:a05:600c:46ca:b0:43d:fa58:700d with SMTP id 5b1f17b1804b1-43f1ed6f0abmr33987875e9.32.1744216632086; Wed, 09 Apr 2025 09:37:12 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Anthony PERARD Subject: [PATCH 6/8] Factor our x86-isms in the linux build script Date: Wed, 9 Apr 2025 17:37:00 +0100 Message-Id: <20250409163702.2037301-7-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250409163702.2037301-1-andrew.cooper3@citrix.com> References: <20250409163702.2037301-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: 1744216664429019000 ... in preparation to use it for arm64 too. Rename the script. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-G=C3=B3recki --- CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki CC: Anthony PERARD --- .gitlab-ci.yml | 3 +- ...{x86_64-kernel-linux.sh =3D> build-linux.sh} | 34 +++++++++++++------ 2 files changed, 24 insertions(+), 13 deletions(-) rename scripts/{x86_64-kernel-linux.sh =3D> build-linux.sh} (55%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a0a853e551d..ff8dce7be05d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,8 +31,7 @@ stages: # x86_64-kernel-linux-6.6.56: extends: .x86_64-artifacts - script: - - . scripts/x86_64-kernel-linux.sh + script: ./scripts/build-linux.sh variables: LINUX_VERSION: 6.6.56 =20 diff --git a/scripts/x86_64-kernel-linux.sh b/scripts/build-linux.sh similarity index 55% rename from scripts/x86_64-kernel-linux.sh rename to scripts/build-linux.sh index 5a0160655bea..5e25e958c0f3 100755 --- a/scripts/x86_64-kernel-linux.sh +++ b/scripts/build-linux.sh @@ -9,6 +9,7 @@ set -ex -o pipefail =20 WORKDIR=3D"${PWD}" COPYDIR=3D"${WORKDIR}/binaries/" +UNAME=3D$(uname -m) =20 # Build Linux MAJOR=3D${LINUX_VERSION%%.*} @@ -16,17 +17,28 @@ curl -fsSLO \ https://cdn.kernel.org/pub/linux/kernel/v"${MAJOR}".x/linux-"${LINUX_V= ERSION}".tar.xz tar oxf linux-"${LINUX_VERSION}".tar.xz cd linux-"${LINUX_VERSION}" -make ARCH=3Dx86 defconfig -make ARCH=3Dx86 xen.config + +make defconfig ./scripts/config --enable BRIDGE ./scripts/config --enable IGC ./scripts/config --enable TUN -cp .config .config.orig -cat .config.orig \ - | grep 'XEN' \ - | grep '=3Dm' \ - | sed 's/=3Dm/=3Dy/g' \ - >> .config -make ARCH=3Dx86 olddefconfig -make -s -j "$(nproc)" ARCH=3Dx86 -cp arch/x86/boot/bzImage "${COPYDIR}" + +case $UNAME in + x86_64) + make xen.config + cp .config .config.orig + cat .config.orig \ + | grep 'XEN' \ + | grep '=3Dm' \ + | sed 's/=3Dm/=3Dy/g' >> .config + ;; +esac + +make olddefconfig + +case $UNAME in + x86_64) + make -j$(nproc) bzImage + cp arch/x86/boot/bzImage "${COPYDIR}" + ;; +esac --=20 2.39.5 From nobody Fri Dec 19 04:18:36 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=1744216660; cv=none; d=zohomail.com; s=zohoarc; b=FerEqn8DMCWOrCSeNEjqoDniuYAe+jUcPBmiLdLnKN1JDJEnZgKiB1aD/pEO1z1nVh1hYT9jrQFx3t4DU4+Pxy6ULjGfdXPw+Yso5dXzbKJa80K9RakEdch2g1nD50AQGUbSddyUB5B4vPUV8TMv4nWkp8cTy+AqJ8kU/iPLI+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744216660; 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=I2mT/JfncdqV5tSU+jW+RQIjWQnr3c8c6UD7AZjsbPw=; b=Gt9LAJUwiHYJ0A0YrgSMCMMP7ohE1DXnp3Rf8SNxgvTanubdZr1VLKI8NE7ftfbIMVGR1mI48J8iT+xjHShCssRNULggSYOMKZOExM3lyi0/Wflrq1q0Q6gB2u78XVPY38Jj2yMwCms4mOfEcyH534OlAre57HmiSpffHOrZU88= 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 1744216660544980.7648660847624; Wed, 9 Apr 2025 09:37:40 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944346.1342880 (Exim 4.92) (envelope-from ) id 1u2YQO-0006Ds-1H; Wed, 09 Apr 2025 16:37:16 +0000 Received: by outflank-mailman (output) from mailman id 944346.1342880; Wed, 09 Apr 2025 16:37:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQN-0006BE-SM; Wed, 09 Apr 2025 16:37:15 +0000 Received: by outflank-mailman (input) for mailman id 944346; Wed, 09 Apr 2025 16:37:14 +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 1u2YQM-0004du-GT for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:14 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e40489f6-1560-11f0-9eab-5ba50f476ded; Wed, 09 Apr 2025 18:37:13 +0200 (CEST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43690d4605dso48219915e9.0 for ; Wed, 09 Apr 2025 09:37:13 -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-43f233c817dsm20947455e9.23.2025.04.09.09.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 09:37:12 -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: e40489f6-1560-11f0-9eab-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216633; x=1744821433; 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=I2mT/JfncdqV5tSU+jW+RQIjWQnr3c8c6UD7AZjsbPw=; b=tflH/FYjDwX7xQc0Ia9LGU84CfnbLIXcTvbwtUHYYrdbsWUAMGqgRikS0cOx+cwORv qseHPNuC+6EeGZHrp2mRF8wGpjejY3QwGX8zM9ujCd/gy83ADxzp0ikGDWp1xQFrVn2t G5o7cvpfUnsYb97zvjUOY8Zrm7R/egfYbkrws= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216633; x=1744821433; 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=I2mT/JfncdqV5tSU+jW+RQIjWQnr3c8c6UD7AZjsbPw=; b=Lu0tdoAItzoYStkBI7a/Yv5BdHO0qmPTG16DkftYO/e8SxN8EU/n9kMNxk+bdjd+Mm Delr1oA26YfCtREZhJoh8h37DVBaRIiI8Jha6ZNOYEQyckteCkMGyEjkitk+/aZm1PZS KerNPPvCyiWWGHd6uqHkgiKW37daRIQXXIU3OTXuSQLwXrePaCtI+soqx7PndB0TOFOP 0beXwN3ge7aB7ltbLjbFazBANLzP+VOagxggIoEDAFoENA0wxzwbn+3oHXiP+Q1iqfpx 8SU2gbX/0fQCmBbURbgf1RiakFW11XMlo+4DZAsWMXm73Km0DZx6KlFCPc7pB2S6j4rX VB1A== X-Gm-Message-State: AOJu0YweKRBvBnsRyUsE4oQTu2eWcoNX10OnK4Y9n80l83+aIWrxzMx+ C/HK5ik730Zy2BDZ7gtEMp3pf5R7IdI1ytJ7Ic7C4cgTVNlBZqJgNXA2l7MWSJ+CNMa1ZsjSM8X Na8o= X-Gm-Gg: ASbGncvlwWkczXAWWpfqpWCMHE7N9ZvyL7qw/CbbCB3cMN9qWNaE2SK8gotUoF4yNoh J+I3nYhZc/XscCR2rqexy7svQjcfNsG+j4Tnu4Be5NQ0VpI1Pw9aP0gVPyTA5GITib45D2DcUrd 61y1sLqm9qNljeh0LNCY7pKeAUW7Hekp0Carr5lKKhJN0BQcZrxSUGt4xpixsqTzLl1op44ysq9 hXBSa5UP0paVewGvSIKhAPJ7aDvfk+cWLfke9ou+KjxxlBbp5kq6xMwYCbVzpzm2WsHiBytJuXh fd1MV4d5a4oZRpO2taOwxrufPuTyXwxMgoCMBam2ViK2e/ERR46K9pUQH2JfBnyTQVuOTp4VJkC PLrrQXIsoh7SanksRHx9h/ydu X-Google-Smtp-Source: AGHT+IFeAOIEsPP+PKgdQeDrOa66hkGlAAR3QFoVe90GA0l/Y3sZ1wzkRcbvByRiqErOlzaGnHWv8Q== X-Received: by 2002:a05:6000:40d9:b0:39a:c9ed:8555 with SMTP id ffacd0b85a97d-39d88539008mr3376723f8f.23.1744216632825; Wed, 09 Apr 2025 09:37:12 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Anthony PERARD Subject: [PATCH 7/8] Infrastructure for arm64 linux builds Date: Wed, 9 Apr 2025 17:37:01 +0100 Message-Id: <20250409163702.2037301-8-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250409163702.2037301-1-andrew.cooper3@citrix.com> References: <20250409163702.2037301-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: 1744216662493019000 Signed-off-by: Andrew Cooper --- CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki CC: Anthony PERARD --- .gitlab-ci.yml | 7 ++++++ containerize | 1 + images/alpine/3.18-arm64-build.dockerfile | 27 +++++++++++++++++++++++ scripts/build-linux.sh | 10 +++++++++ 4 files changed, 45 insertions(+) create mode 100644 images/alpine/3.18-arm64-build.dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff8dce7be05d..6e38c2f2a108 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,13 @@ stages: exclude: - binaries/.gitignore =20 +.arm64-artifacts: + extends: .artifacts + tags: + - arm64 + variables: + CONTAINER: alpine:3.18-arm64-build + .x86_64-artifacts: extends: .artifacts tags: diff --git a/containerize b/containerize index c32e40f5a6d9..6664ef9821d0 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-build) CONTAINER=3D"${BASE}/alpine:3.18-arm64-build= " ;; _alpine-x86_64-base) CONTAINER=3D"${BASE}/alpine:x86_64-base" ;; _alpine-x86_64-build|_) CONTAINER=3D"${BASE}/alpine:x86_64-build" ;; esac diff --git a/images/alpine/3.18-arm64-build.dockerfile b/images/alpine/3.18= -arm64-build.dockerfile new file mode 100644 index 000000000000..c76ac435e8dd --- /dev/null +++ b/images/alpine/3.18-arm64-build.dockerfile @@ -0,0 +1,27 @@ +# syntax=3Ddocker/dockerfile:1 +FROM --platform=3Dlinux/arm64/v8 alpine:3.18 +LABEL maintainer.name=3D"The Xen Project" \ + maintainer.email=3D"xen-devel@lists.xenproject.org" + +RUN apk --no-cache add bash + +RUN bash -ex <> .config ;; + + aarch64) + ./scripts/config --enable XEN_NETDEV_BACKEND + ;; esac =20 make olddefconfig @@ -41,4 +46,9 @@ case $UNAME in make -j$(nproc) bzImage cp arch/x86/boot/bzImage "${COPYDIR}" ;; + + aarch64) + make -j$(nproc) Image + cp arch/arm64/boot/Image "${COPYDIR}" + ;; esac --=20 2.39.5 From nobody Fri Dec 19 04:18:36 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=1744216667; cv=none; d=zohomail.com; s=zohoarc; b=Cm5WnLyfUX7PVnj4ng4sugmDh9MtgkqlUHMyFLA+PiwuYOWTIZ9PxUIFIeY3x8s38ek3fluqYh0ghnJEQtzs9toniH4wHJNhk/6CvXIzB1eqSED9TB1dw9X9MswCe+tDLBcRq6l9O7O3Bqmm3xKU+BEKNLd46FYi3UTPZ2P5yg0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744216667; 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=oz7vc3ZdkGUN8uURs2tZVEn3NKyi4BmiHGUDzuUaSbo=; b=BWfLUm8rlJ5OShB1k5vTtFEqD1dZAdyh6GLTh5hqs1H8y9waFH2iaUAURD0E3qxzPO1Gq968CWMSOv5h2F1eTtTUGtdd8ppPQ0+A89CAO6p9tKAxsMRdh2UkhFkPcPGTQ+kbr80p6P0GGMNkcMJzeg+rp38IRJpQaQAFNAt/ORc= 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 1744216667225128.62790328505923; Wed, 9 Apr 2025 09:37:47 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.944347.1342888 (Exim 4.92) (envelope-from ) id 1u2YQO-0006H5-Kv; Wed, 09 Apr 2025 16:37:16 +0000 Received: by outflank-mailman (output) from mailman id 944347.1342888; Wed, 09 Apr 2025 16:37:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2YQO-0006G1-Ar; Wed, 09 Apr 2025 16:37:16 +0000 Received: by outflank-mailman (input) for mailman id 944347; Wed, 09 Apr 2025 16:37:15 +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 1u2YQN-0004du-Gg for xen-devel@lists.xenproject.org; Wed, 09 Apr 2025 16:37:15 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id e46da20f-1560-11f0-9eab-5ba50f476ded; Wed, 09 Apr 2025 18:37:14 +0200 (CEST) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43cfb6e9031so63656425e9.0 for ; Wed, 09 Apr 2025 09:37:14 -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-43f233c817dsm20947455e9.23.2025.04.09.09.37.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Apr 2025 09:37:13 -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: e46da20f-1560-11f0-9eab-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744216633; x=1744821433; 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=oz7vc3ZdkGUN8uURs2tZVEn3NKyi4BmiHGUDzuUaSbo=; b=jeXBuhV9/VH0N/gWYVF0KcO2Nc7e4QN3xxRNV1qXOvyZIHLw9Ygv3D/3ordHN41Rqw WCkWH3MMwmi+N0m2zLZ9qEOz/bJgaO/spT3xhsgvsF7xkaxKNwQ/7kh4owlZgMHHb7A8 NjsSe27+hU5ABxFw22yYgD/lsFDnDEqrUz4gY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744216633; x=1744821433; 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=oz7vc3ZdkGUN8uURs2tZVEn3NKyi4BmiHGUDzuUaSbo=; b=jrJFG81+KNmLC6BXCf68kO2Y2PHjLX7y/hD+q01yXMvJWEK1uZjNHcGoLytm+6gULX sOTDfW3PBmNoHIeAJGZ01b3MfDF8LDJMEZtgEC75XsUIzYT+tHALJW07MHDUDiNRUfJ9 4neYIpeyNNS0gWr9qBbrf0aQan64eFaFLVtW/a4nopTHAipwfpVgaryGC/9iHAywgsmt K+SwMZ9H6QFwZJJRnvP0KNWtc4Kz0BnGYUDR8ZSSzpXbXpPC319HyzuOwVtcGZlJn+o7 +/mBnikD5MB+zGFngWJF2ic2sKxGDNYc6fKJzGDmf7o7etYoyqlwNL/J8w5mSD0Vvhbs dmng== X-Gm-Message-State: AOJu0Yxme7FHNMPALZBE0Nxs+lnJM+ypr4vRaQzJeoD+djwt4BuPdQMW bJ7wli9TG2Jar1C9ZRja0aS3HvCaJlGuxrz5KUYjOBGugWVi3GdQB3hnj5IIdYr9OQnCg3gH0On MUrU= X-Gm-Gg: ASbGncu3JW+nfRW9KKH581ild4J+a3rsJbOUvN3eOxeFb00kZH7TTbLe2EQtvNnrOj0 erY7LQgkAz9pAgzmmklp6T0Aghdta6GHITU4cvc+p8uF7RCNBwu57jaAOnoycb3SL/gVjVNftx9 2RF+rRzCWdJFQraJKHVEsdtY7LTLG/u7fDQhg5w07JdqwzT/lqw8uz4NoN5aitE2B0EX0pWOTxC AQTD+y92mOdrIH8waBR/ChGU9zowUBuHEzZTs9zTwqmBxX6TZuRZbVfAmXmiRm6Zt9Z5ghqqc4B FxytU8h8v+bfj+qqVsjnVfow/jHOW/9jKF5CB2mNsQexLRuIAQKKspIw/z81Xs/tpOJjeHHrSw9 hp9AFumSeOskdoA== X-Google-Smtp-Source: AGHT+IHttXZM3QfI72bPFKdKuNhqirIDtNLYAizvEnHznLSXNn9Np69KRJv/47G7CNoqnu5dUnfLgg== X-Received: by 2002:a05:600c:450c:b0:43d:683:8cb2 with SMTP id 5b1f17b1804b1-43f1fe2164amr29220135e9.14.1744216633654; Wed, 09 Apr 2025 09:37:13 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Michal Orzel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Anthony PERARD Subject: [PATCH 8/8] Linux 6.6.86 for x86 and arm64 Date: Wed, 9 Apr 2025 17:37:02 +0100 Message-Id: <20250409163702.2037301-9-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250409163702.2037301-1-andrew.cooper3@citrix.com> References: <20250409163702.2037301-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: 1744216668534019000 It's the latest 6.6 at the time of writing. Signed-off-by: Andrew Cooper --- CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-G=C3=B3recki CC: Anthony PERARD --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e38c2f2a108..c1ce3f38e8b8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,6 +33,18 @@ stages: variables: CONTAINER: alpine:x86_64-build =20 +linux-6.6.86-arm64: + extends: .arm64-artifacts + script: ./scripts/build-linux.sh + variables: + LINUX_VERSION: 6.6.86 + +linux-6.6.86-x86_64: + extends: .x86_64-artifacts + script: ./scripts/build-linux.sh + variables: + LINUX_VERSION: 6.6.86 + # # The jobs below here are legacy and being phased out. # --=20 2.39.5