From patchwork Thu Apr 10 11:46:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 14046433 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D919FC369A9 for ; Thu, 10 Apr 2025 11:47:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.945326.1343530 (Exim 4.92) (envelope-from ) id 1u2qNC-0003hh-96; Thu, 10 Apr 2025 11:47:10 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 945326.1343530; Thu, 10 Apr 2025 11:47:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2qNC-0003ha-6C; Thu, 10 Apr 2025 11:47:10 +0000 Received: by outflank-mailman (input) for mailman id 945326; Thu, 10 Apr 2025 11:47:09 +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 1u2qNB-0003hP-6y for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 11:47:09 +0000 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [2a00:1450:4864:20::32c]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 87210490-1601-11f0-9ffb-bf95429c2676; Thu, 10 Apr 2025 13:47:06 +0200 (CEST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-43690d4605dso5814435e9.0 for ; Thu, 10 Apr 2025 04:47:06 -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-39d893776dfsm4651418f8f.33.2025.04.10.04.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 04:47:05 -0700 (PDT) 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: 87210490-1601-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744285626; x=1744890426; 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=5CtNKRTRSK/rh7mfkGTUf4JbHupBQBE1a+8umq7jRL4=; b=Flrv8nXNG7Fw+3lHHiYCELOWTcZu6eudDrYTytTFa5ZGsSCVSTl5SC53/692aG7aQX UPJVZHQLuuP62q81EG3nQQkLRURPviy5sr+dRfXB27U4zRDpI06vU+9zX39pA0I4NUVe Qnth5+kTzvTw0beeblKiLJ/lNM03LoqQDmGjg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744285626; x=1744890426; 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=5CtNKRTRSK/rh7mfkGTUf4JbHupBQBE1a+8umq7jRL4=; b=bAraLzUBrH7f0lS/Vr0Iqxr/rCXHAc1RNqObGovdtpu/CNaaW4c2Y28edVSmzxa5lP szPtlHX9QIiVWRmfd4lGZM0dKqGY5bRMnrY3U/aZzOcQqexIcH3lxgWwNDWXUtFkaSE/ 2Py2IPNpk0dpZhatYLNl0vmBXWQstez6c1+5RaNEvlZqhesPP6z0ZmyOHLRyl92Eo3Qk kcERyBGP3qb7Js+LnQKUo/Oql17SF7+ca7PuEOTo12leUCHD8agHH3ZcevaBl3F6fo87 hUm5bd4v2MUoDrm1v1dUgSF+fZTUv4Mmv4VjkTE2yoFnHKmA1ajSeuzYHg8fjbJT3Wax baqA== X-Gm-Message-State: AOJu0Yzkpx3tFTKoVOgBZjWcjxJtUX7lbThIH53N5aCn7gOAmMc04Gtm CE4JfdsO1IA3YB2jpU/geHALixIIPD2kxBoxXTVGjNbYvF5HJAnyPuBcaOAQnv4qMNFUuWy2NS3 xPdM= X-Gm-Gg: ASbGncsoea5aqhOIoMPGS2BFz0LN7wZ6b8hySludgYmaudKnx3O3f3uIEy9YpTyvVv4 5jeppIcplmYImJMtiN7+pA7BmAqEHVjodTr+0UQM1SFKbLsZP2W7+Fns74ax4h+b9BMP2tSDVMf L9kK9AR22UEo4qSdTBZG5SVulWGd90WKPIvEJLur/mP46x1L+ZyJnM/HUEG3XllElNazU+J5E85 Ai8mQlt5Ryhw/z+QcoTQmFUPVEDsK9HB+YjfJKmYAE6UNe11phEVg+WorpVxe/7DTtghchTuT96 3YRrLHQvTArk5uhCMrIAzhTMwEvsxzqyTXXDaVqvLprzi3Bd5u/X+oV9LzLadlM/dPskgQagVY+ lGzp64sirsg/H7w== X-Google-Smtp-Source: AGHT+IH8tzbinte0Su6EBQfrqSQaMnvh3Ng3xFtV5WfRAKJiiiZIXrrGSXXOE+q6rSqTU1beeuMEqA== X-Received: by 2002:a05:6000:1ac5:b0:391:4095:49b7 with SMTP id ffacd0b85a97d-39d8f474e61mr1928536f8f.25.1744285626045; Thu, 10 Apr 2025 04:47:06 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Stefano Stabellini , Michal Orzel , =?utf-8?q?Marek_Marczykowski-G=C3=B3re?= =?utf-8?q?cki?= , Anthony PERARD Subject: [PATCH 1/6] Port containerise Date: Thu, 10 Apr 2025 12:46:23 +0100 Message-Id: <20250410114628.2060072-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410114628.2060072-1-andrew.cooper3@citrix.com> References: <20250410114628.2060072-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 While it pains me to keep the wrong spelling, do so for consistency. Signed-off-by: Andrew Cooper Reviewed-by: Anthony PERARD --- CC: Roger Pau Monné CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-Górecki CC: Anthony PERARD v2: * Switch back to alpine:x86_64-rootfs as the rename isn't in the series yet. --- containerize | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100755 containerize diff --git a/containerize b/containerize new file mode 100755 index 000000000000..fd488cc57596 --- /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=${DOCKER_CMD:-"docker"} +[ "$DOCKER_CMD" = "podman" ] && userns_podman="--userns=keep-id" selinux=",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="registry.gitlab.com/xen-project/hardware/test-artifacts" +case "_${CONTAINER}" in + _alpine-x86_64-rootfs) CONTAINER="${BASE}/alpine:x86_64-rootfs" ;; + _alpine-x86_64-build|_) CONTAINER="${BASE}/alpine:x86_64-build" ;; +esac + +# Use this variable to control whether root should be used +case "_${CONTAINER_UID0}" in + _1) userarg="-u 0" ;; + _0|_) userarg="-u $(id -u) $userns_podman" ;; +esac + +# Save the commands for future use +cmd=("$@") + +# If no command was specified, just drop us into a shell if we're interactive +[ $# -eq 0 ] && tty -s && cmd=("/bin/bash") + +# Are we in an interactive terminal? +tty -s && termint=t + +# +# Fetch the latest version of the container in hub.docker.com, +# unless it's a newly created local copy. +# +if [[ "_${CONTAINER_NO_PULL}" != "_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=greadlink +elif [[ $(uname -s) == "Darwin" ]]; then + echo "Unable to forward SSH agent without coreutils installed" + unset SSH_AUTH_SOCK +else + READLINK=readlink +fi + +# Ensure we've got what we need for SSH_AUTH_SOCK +if [[ -n ${SSH_AUTH_SOCK} ]]; then + fullpath_sock=$(${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=$(dirname ${fullpath_sock}) + SSH_AUTH_NAME=$(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=$(git rev-parse --show-toplevel) +fi + +# Kick off Docker +einfo "*** Launching container ..." +exec ${docker_cmd} run \ + ${userarg} \ + ${SSH_AUTH_SOCK:+-e SSH_AUTH_SOCK="/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[@]}" From patchwork Thu Apr 10 11:46:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 14046436 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1FC7C369AB for ; Thu, 10 Apr 2025 11:47:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.945327.1343540 (Exim 4.92) (envelope-from ) id 1u2qND-0003vV-FP; Thu, 10 Apr 2025 11:47:11 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 945327.1343540; Thu, 10 Apr 2025 11:47: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 1u2qND-0003vO-Bx; Thu, 10 Apr 2025 11:47:11 +0000 Received: by outflank-mailman (input) for mailman id 945327; Thu, 10 Apr 2025 11:47:09 +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 1u2qNB-0003hP-SV for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 11:47:09 +0000 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [2a00:1450:4864:20::332]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8793fdcd-1601-11f0-9ffb-bf95429c2676; Thu, 10 Apr 2025 13:47:07 +0200 (CEST) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43cfe574976so5117565e9.1 for ; Thu, 10 Apr 2025 04:47:07 -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-39d893776dfsm4651418f8f.33.2025.04.10.04.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 04:47:06 -0700 (PDT) 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: 8793fdcd-1601-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744285627; x=1744890427; 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=CmUAg7jU1oFEVgNmFtaK3OHtZvMFInF5GgxTSJzMnuw=; b=FKqzwgoU6A/C4/miMEmjyOntZzLtToA+56MOLrn9PmzYEUAwuU6No1MoaEe/5a/kRt AL79Gq0ljwRV7KdEYfZ3DRJvdBAloMkiVs4il8iLhGRcnzm3y709wjJ3pVa/hrp7aVdJ PIxV3DzWvR4nzwt8XHSlJlcIM3QIkeFDyYSGA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744285627; x=1744890427; 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=CmUAg7jU1oFEVgNmFtaK3OHtZvMFInF5GgxTSJzMnuw=; b=HhVnnRs7Uz7JKfq8HWSKoooNsIDv/GlrVneqK5my2/6A1H/y4zNc8xPKVtuNEG0KS6 9duJTRoRubdioqV/jEAlD+7Cysf+F0B/mWXnlWF5b5J2IQ/KbBHeR70PAyV1cM8fqFGt y+ta0TQUljrkmO3j2j8939UBDDot2UA8NyFuJloxp4d2aqQWDHlh5tTbrbLkIBtS2yZt KQJv1PI3BCVJvBsXpOnNLPRlzO6VRVzHAEloUWRdSpelCPRiStjEgaFViwSNK3zUOX/s 3PVNftLhWvutVei3bBd3WmNiS5MYy3DLtaEwnKuorR/PnNpd+c+AzeDfT+Ga6KGb125d +sOA== X-Gm-Message-State: AOJu0YzxDsWOV18hoKnnxE1SO7nf5ConOa5bEVVw54h0YVM+N9y4efJ8 c0Hv7F3M1f2L9UJIirXNkA1IGOBZuaQmamI5FsIb1jarrvLVbnnPILdkM5nAoj1sPcmroj+N4ua hJyg= X-Gm-Gg: ASbGncv7Mx/kcOL6rl2BvxsosEYZKJQHz+Z5FBOKQ3fKz/YzfjfxuKP+gocnJJQAYcG 7hFnEwRMYwMTBOhajkuuoPIpwe2vc3+yexcnVGcDUUfCXhlJOlclp7kQVSQsX+D59lPEJ7Cx2L/ 52i03qhNCuqOs3RWudv3uWZ3vGrLrb9twzXS3Ur3vmLd0vkp6Zwo62lfEHzzi5WLAl9k2Csfese pqEy/z9KANFCm2+pZx4sdPv/gVe23cJsYMY3/vrGD/FpEajVMCObSqkVag0cVPe4QM3ulNtSVb/ Pr9WwhvcZBNSWtQ0aMkajWaYP8srCOPt7PHUVCBlvDVQtYBOZx3MrZwUpAgmdeC0aI+rkYQX0mj eRTwj2YgZSp54rn7FKxgk9YGv X-Google-Smtp-Source: AGHT+IEtA0sWJV4QWwpV9KTtrtVIst7z+N9OHlMYzZ9RWBUae0cIQ2HP+CgUpXTnASNk+vdrh0kdZw== X-Received: by 2002:a5d:648c:0:b0:391:3988:1c97 with SMTP id ffacd0b85a97d-39d8f46a059mr1680392f8f.17.1744285626831; Thu, 10 Apr 2025 04:47:06 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Stefano Stabellini , Michal Orzel , =?utf-8?q?Marek_Marczykowski-G=C3=B3re?= =?utf-8?q?cki?= , Anthony PERARD Subject: [PATCH 2/6] Clean up Gitlab yaml Date: Thu, 10 Apr 2025 12:46:24 +0100 Message-Id: <20250410114628.2060072-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410114628.2060072-1-andrew.cooper3@citrix.com> References: <20250410114628.2060072-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Factor out the registry into a common location. Drop the worflow name, as all it does is hide the commit message of the change that triggered the pipeline. List all the stages. Set a default expiry of 1 month. Note all the current jobs as legacy. Their naming scheme needs changing, and we'll use this opportunity to switch formats too. However, the artefacts need to stay using the old name until the final staging-* branch using them is phased out. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki Reviewed-by: Anthony PERARD --- CC: Roger Pau Monné CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-Górecki CC: Anthony PERARD v2: * Drop the workflow name. --- .gitlab-ci.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36ec6a7e1ee5..734f3982c46f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,12 +1,16 @@ -workflow: - name: "xen test artifacts" +variables: + REGISTRY: registry.gitlab.com/xen-project/hardware/test-artifacts + +stages: + - build .artifacts: stage: build image: - name: registry.gitlab.com/xen-project/hardware/test-artifacts/${CONTAINER} + name: ${REGISTRY}/${CONTAINER} artifacts: name: "${CI_JOB_NAME_SLUG}" + expire_in: 1 month paths: - binaries/ exclude: @@ -19,6 +23,9 @@ workflow: variables: CONTAINER: alpine:x86_64-build +# +# The jobs below here are legacy and being phased out. +# x86_64-kernel-linux-6.6.56: extends: .x86_64-artifacts script: From patchwork Thu Apr 10 11:46:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 14046431 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9DE48C369AA for ; Thu, 10 Apr 2025 11:47:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.945328.1343549 (Exim 4.92) (envelope-from ) id 1u2qNE-0004AG-Mj; Thu, 10 Apr 2025 11:47:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 945328.1343549; Thu, 10 Apr 2025 11:47: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 1u2qNE-0004A9-JJ; Thu, 10 Apr 2025 11:47:12 +0000 Received: by outflank-mailman (input) for mailman id 945328; Thu, 10 Apr 2025 11:47: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 1u2qNC-0003hP-Sk for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 11:47:10 +0000 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [2a00:1450:4864:20::431]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 880e98f1-1601-11f0-9ffb-bf95429c2676; Thu, 10 Apr 2025 13:47:08 +0200 (CEST) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-391342fc0b5so461252f8f.3 for ; Thu, 10 Apr 2025 04:47: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 ffacd0b85a97d-39d893776dfsm4651418f8f.33.2025.04.10.04.47.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 04:47:07 -0700 (PDT) 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: 880e98f1-1601-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744285627; x=1744890427; 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=W4Z3kIHuhnklBdlhCOBG5oTaOo1JbFmkMLZhiqPUPak=; b=eFp45YLJ/uq++N4gZbCnq1JVSlI3G5/GTtqKYu5NpKeL1duAH4/FBUnWHBHWFXu+Fv RyOTmUnsWXUVdlhpRNg05a3mTEis0JaxVJcO4kx24wbPxHADNK38ZoDdjysaNcEfFIcb 3GQQhozMiybmz1ZGnqddkElFzsChjfRNfDRz4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744285627; x=1744890427; 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=W4Z3kIHuhnklBdlhCOBG5oTaOo1JbFmkMLZhiqPUPak=; b=hJ3sDQO7CFsh0EsXnmGQVTDohC6IsSpcxo9i4nnPne+UFg1hWhxcCSzY8liVKYJbcR 9ze0UhMf+MzL484hYfZXOeQoY69Mu4LlpOMtOJC/CVEGIO+B02mJyxDLI6GAcDHlRbDd P2wlCy14Kth2o92zHm7Uwl7SZ9YibBJ5+H2BtEt0oAcVRtXF+V5qAzRsDzsUVbC5B0oW h8+h006+u9FFaBenAG8ctH7BwjopkTRH7T3mRs3zYA8PhyzaJZKbq5qegT6Ia7WzwPeC uZQYQjMnhiocVN9qYxasTH/nmsZsHUGQR/5jvjlOWQpNPDch1Cg0jjbFD7tBqd8YpFmi iqBA== X-Gm-Message-State: AOJu0Yz4303vNElnUQC0hOkv+imFYEqJO3yyiAwi+ewCvsrb0IrESdP1 B++tlAVUUcQiZ/yiSyP60GU7f0hbaZeCgfjOZuTH8mLBUMTB5gMnSk4q2ht3igcnnQt6mTcl00a QPjE= X-Gm-Gg: ASbGnct9m6m304Z4p96BildYB/2VYOsOjtP+zNAvr17WW0H2zE/TIiigdzFy+bLNnXs XIH1vlewdIWBRd3ersyr6PUaZcwh1RSYFsdwXScM7C7177pC25HZuCfdP0EDBtRv8v5+b9OBYOL y/zluD91aeZjhgm5HXPe4Rmrem54KPvMX0o3hJEkND72tCCtxtfHN7y/Vtdjol+qo32KnGm8Mt4 o3Hs7E53LlODixsOT9XZgBKKAbN1wHwJJUdV4/erqYhh79pPRE91sUo9mn6u+bihlLzyOC1PdD7 qxzFHoPKEeYeaCH3qZ9NGFyUqyGNv3BlNc6Lb5M0N/jS3lbcZAn6HojIDsp4FhUZNE/z1ylepDW LpmtVWmFAx118lQ== X-Google-Smtp-Source: AGHT+IFo0dsiWLK8PK4pbqdkf6C7kBzISX9YV7JBCkAkIEdHG7SOFQo4Cdh311PwZPkDMbyUO0B9MQ== X-Received: by 2002:a05:6000:40c9:b0:391:2d76:baaa with SMTP id ffacd0b85a97d-39d8f4d3a7cmr2053029f8f.46.1744285627573; Thu, 10 Apr 2025 04:47:07 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Stefano Stabellini , Michal Orzel , =?utf-8?q?Marek_Marczykowski-G=C3=B3re?= =?utf-8?q?cki?= , Anthony PERARD Subject: [PATCH 3/6] Adjust Linux build script to work with other major versions Date: Thu, 10 Apr 2025 12:46:25 +0100 Message-Id: <20250410114628.2060072-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410114628.2060072-1-andrew.cooper3@citrix.com> References: <20250410114628.2060072-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Simply the tar expression, as 'tar xf' can figure out the compression automatically. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki --- CC: Roger Pau Monné CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-Górecki CC: Anthony PERARD v2: * Use 'tar xf' --- 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..5ed5608628bc 100755 --- a/scripts/x86_64-kernel-linux.sh +++ b/scripts/x86_64-kernel-linux.sh @@ -11,9 +11,10 @@ WORKDIR="${PWD}" COPYDIR="${WORKDIR}/binaries/" # Build Linux +MAJOR=${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_VERSION}".tar.xz +tar xf linux-"${LINUX_VERSION}".tar.xz cd linux-"${LINUX_VERSION}" make ARCH=x86 defconfig make ARCH=x86 xen.config From patchwork Thu Apr 10 11:46:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 14046432 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0C4EC369A8 for ; Thu, 10 Apr 2025 11:47:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.945330.1343564 (Exim 4.92) (envelope-from ) id 1u2qNF-0004Nu-Id; Thu, 10 Apr 2025 11:47:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 945330.1343564; Thu, 10 Apr 2025 11:47: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 1u2qNF-0004LG-Ay; Thu, 10 Apr 2025 11:47:13 +0000 Received: by outflank-mailman (input) for mailman id 945330; Thu, 10 Apr 2025 11:47: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 1u2qND-0003hP-T5 for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 11:47:11 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 888446a5-1601-11f0-9ffb-bf95429c2676; Thu, 10 Apr 2025 13:47:09 +0200 (CEST) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43d2d952eb1so5802565e9.1 for ; Thu, 10 Apr 2025 04:47: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 ffacd0b85a97d-39d893776dfsm4651418f8f.33.2025.04.10.04.47.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 04:47:07 -0700 (PDT) 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: 888446a5-1601-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744285628; x=1744890428; 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=8oR7MLPF5r2CabjIPs5otgDPIkflYO1C7gLrLM21PNY=; b=sJLnZvh9vLi6V8GIm5fSBerHHR2phkg4cNc0nZM6CptZbaztCW5hnPYxcIpLKr+dAq I0yIzRCGZOgb4CvllsJDSUmRqlE73CNddF+bJH4DZIeeEVf5FiCOwCFsoR2UHjW1wgmb G98n7OTd7pw2D5YjbkmCET1/7CnSTI7OHBlCU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744285628; x=1744890428; 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=8oR7MLPF5r2CabjIPs5otgDPIkflYO1C7gLrLM21PNY=; b=QxhKRvO6b6uMcOs3DCl2zue8/l/6AsXr2h4djybRuNk4Yd0Wn1KbbFM2U2fQywYpKq puA8JSFeb02Ermh8KT1GuKI/BLhB3tr1aVJtgOO10zsPJ/joEku/Z9lKrhnagICsXMj0 IrrNZmoMLvcopOYCVnB6B2k/e79Epg7G8wtb81IWBCqRfv4Dmpz9u7ogRs2k536W5Wx+ efSNHQbZ7jqLCGl+1oXu4qYEaC7/1AOg0M2jXFhvX/9YxhKUo0GgVrMAn8u8UgnQ68O9 emTW26AmgxC6VPiLMAig3IEaThsQJm/5W0RtMJXtqvJitm7QIDdc363sXZkFKR+NaA16 Hogg== X-Gm-Message-State: AOJu0YzdG/U0W7iFTMDWJK5aY23DuxN+oyORf9spMUxtn8LANBC9ADv6 XPuwlmHVsYCOgDW+4Eo3/kVwcBGbSXZAI0Ugx3w/OMMeI1vg3NQvpBsuAGSetLwGTkXYaLiYW+o BtNQ= X-Gm-Gg: ASbGncvX3Pk1IhOaeqXMXfZo6hOoiojut3iK3fV0O1SHbTMnTR5kMsdg+vXU/0ZolA1 Zal63Sj+hrJhJmhBvebwH84Dl8XqNmr0VMpFZHhzWHe4Rg3Y3vhaosOLqDKmUfIlP9MO+o44xLG 4D1lzzAqj3xw561gxhuiWfWYFpmpCZu9ky2HWHzbz1mHCYOE6CrXzB2BNUUZIw0f5Nb7hkhUfk7 UkUSvxCnlcLT9uLI65ZHOfBR/s8MLQHBFiwDSNXP1wns4ciIUhL45PbJTL4mdz9pb8hf2x/XmEP 2S686vlNE8UTWMxtNakChH6JJE8Iksa4ZBIlsFNsEC0dP00WwMlGGSf0fS7dZqGqcNgvs+GLPjE XPqbnNYamaN+9JA== X-Google-Smtp-Source: AGHT+IHp9CcvKpKQofVYiEDgkozYwHI52e8wyqB+JBcEyl6/M6yyPe4KENEfa71LNOyFUIVJLIVErg== X-Received: by 2002:a05:600c:468b:b0:43d:fa58:700d with SMTP id 5b1f17b1804b1-43f2d99ac9bmr20222035e9.32.1744285628355; Thu, 10 Apr 2025 04:47:08 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?utf-8?q?Marek_Marczykowski-?= =?utf-8?q?G=C3=B3recki?= , =?utf-8?q?Roger?= =?utf-8?q?_Pau_Monn=C3=A9?= , Stefano Stabellini , Michal Orzel , Anthony PERARD Subject: [PATCH 4/6] Factor our x86-isms in the linux build script Date: Thu, 10 Apr 2025 12:46:26 +0100 Message-Id: <20250410114628.2060072-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410114628.2060072-1-andrew.cooper3@citrix.com> References: <20250410114628.2060072-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 ... in preparation to use it for arm64 too. Rename the script. Signed-off-by: Andrew Cooper Reviewed-by: Marek Marczykowski-Górecki --- CC: Roger Pau Monné CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-Górecki CC: Anthony PERARD --- .gitlab-ci.yml | 3 +- ...{x86_64-kernel-linux.sh => build-linux.sh} | 34 +++++++++++++------ 2 files changed, 24 insertions(+), 13 deletions(-) rename scripts/{x86_64-kernel-linux.sh => build-linux.sh} (55%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 734f3982c46f..a8e56b165ed6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,8 +28,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 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 5ed5608628bc..c78cd6ca46da 100755 --- a/scripts/x86_64-kernel-linux.sh +++ b/scripts/build-linux.sh @@ -9,6 +9,7 @@ set -ex -o pipefail WORKDIR="${PWD}" COPYDIR="${WORKDIR}/binaries/" +UNAME=$(uname -m) # Build Linux MAJOR=${LINUX_VERSION%%.*} @@ -16,17 +17,28 @@ curl -fsSLO \ https://cdn.kernel.org/pub/linux/kernel/v"${MAJOR}".x/linux-"${LINUX_VERSION}".tar.xz tar xf linux-"${LINUX_VERSION}".tar.xz cd linux-"${LINUX_VERSION}" -make ARCH=x86 defconfig -make ARCH=x86 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 '=m' \ - | sed 's/=m/=y/g' \ - >> .config -make ARCH=x86 olddefconfig -make -s -j "$(nproc)" ARCH=x86 -cp arch/x86/boot/bzImage "${COPYDIR}" + +case $UNAME in + x86_64) + make xen.config + cp .config .config.orig + cat .config.orig \ + | grep 'XEN' \ + | grep '=m' \ + | sed 's/=m/=y/g' >> .config + ;; +esac + +make olddefconfig + +case $UNAME in + x86_64) + make -j$(nproc) bzImage + cp arch/x86/boot/bzImage "${COPYDIR}" + ;; +esac From patchwork Thu Apr 10 11:46:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 14046430 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C800C369A6 for ; Thu, 10 Apr 2025 11:47:32 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.945329.1343555 (Exim 4.92) (envelope-from ) id 1u2qNE-0004CS-Vb; Thu, 10 Apr 2025 11:47:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 945329.1343555; Thu, 10 Apr 2025 11:47: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 1u2qNE-0004Bc-QQ; Thu, 10 Apr 2025 11:47:12 +0000 Received: by outflank-mailman (input) for mailman id 945329; Thu, 10 Apr 2025 11:47:11 +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 1u2qND-0003vN-Dz for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 11:47:11 +0000 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [2a00:1450:4864:20::42b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8927a9f4-1601-11f0-9eac-5ba50f476ded; Thu, 10 Apr 2025 13:47:10 +0200 (CEST) Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-399749152b4so290956f8f.3 for ; Thu, 10 Apr 2025 04:47: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 ffacd0b85a97d-39d893776dfsm4651418f8f.33.2025.04.10.04.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 04:47:08 -0700 (PDT) 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: 8927a9f4-1601-11f0-9eac-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744285629; x=1744890429; 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=KDlRltBQlDK5HzUxWDgj0k+9YEzjv0UHHKFuSv9/huI=; b=BnEQQgntFcg9KYbjHgUJf3zo1L2aGy6ioxbFXHrXdef8Du29ZnYQ/cA1ulO+1MNhlC xmVyPKwr5UaOvwXrPDqu+dDlD63N3L50cXc++go6/eI2Hwdx5pOiWPeQrWgJMqN//9BW 8EooCouxK1eOqxeUVzpNT3lwmkH1gHPQc5o5I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744285629; x=1744890429; 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=KDlRltBQlDK5HzUxWDgj0k+9YEzjv0UHHKFuSv9/huI=; b=Je5KUPmTFjRG+G7iFOpUweu6O1lFfGfdPPUuOE61+EhtiF7Ky3t4oR4FKAKmYqw51Y 3AfQmk9UIXEeD8cOZv70znDyAa9Q9kiLwvdJwbfOmcFzB5GtJbpJVv0/4C3+220nd1sx SKX41VyonoMGaouQ48HlzfIb8aZPylzpk9mAksaToJroD3Xvx1Jdgo2ewCfRF0MBJM4E xxukJIOX/XhsUrn++kywqf8m9y42axHYmgaCkUacaSO1PxDr8a5HEriTyyrjsKVTL4hN c9FDSnEHuOEXME7MvyoPaoH3XTs6ms7YdIAR4/45XMD6glog+kXKe08mi4IyfmNnBAML xgJg== X-Gm-Message-State: AOJu0YwbqdQzWQPIQ6dcodDplHE+Uu+gKa+NqglIRiQQbVQWspWmt3DL KlxaROy+aTk6w6aOGOVffYtKsXE2RDta2shz5062M7Vwc4pKa9W5KmwfO7eVmbDzptaRha+rGRF oUlQ= X-Gm-Gg: ASbGncsj1VtNeJoGbdw24vWzTL5rCtesg7oeWZglCg5J9fyHjuadStlriqXsre2XcFB YuXNQLzm0qejWFtfC2lTqSNrsXqj19TT2cVOKRTeYsbPr7v3h37waUt9E11stVuA6tONNi3mKBf MNmIUFU157m/Noe1q+lmXZhJfZoZUFhwRcVudsJ8T8iWxXDOLVWywfvU5b3gYfN6+xaNQqu42pf o2LT1cu6oyNfg4UI2PQAucIIkNjBzKt3pG1YgIG66+z0wQQTtSiKz/7nI+IClJ63PNu9Ugxiu9C qTkPS9a5cb1rzjiRvVA8Tgv9M4oL4YmlT73sEu+yeWfYVae/Kheu7yJtLTfCNHfS0g0l/iJpAbf 6YlmUjviJh4AJaA== X-Google-Smtp-Source: AGHT+IEi369RxGSg/Usod6vfW65JYGq/Nc8vCcbbU/LfGgo17meuZmZCJuIfe2wKsSey9HbCPSbN6Q== X-Received: by 2002:a05:6000:2a8:b0:391:48d4:bcf2 with SMTP id ffacd0b85a97d-39d8f276117mr1993700f8f.12.1744285629150; Thu, 10 Apr 2025 04:47:09 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Stefano Stabellini , Michal Orzel , =?utf-8?q?Marek_Marczykowski-G=C3=B3re?= =?utf-8?q?cki?= , Anthony PERARD Subject: [PATCH 5/6] Infrastructure for arm64 linux builds Date: Thu, 10 Apr 2025 12:46:27 +0100 Message-Id: <20250410114628.2060072-6-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410114628.2060072-1-andrew.cooper3@citrix.com> References: <20250410114628.2060072-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Signed-off-by: Andrew Cooper --- CC: Roger Pau Monné CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-Górecki CC: Anthony PERARD v2: * Drop musl-dev. It's brought in by build-base. * Include findutils to fix build warnings. --- .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 a8e56b165ed6..6faa85d8dd7c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,13 @@ stages: exclude: - binaries/.gitignore +.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 fd488cc57596..7abeb119ff6a 100755 --- a/containerize +++ b/containerize @@ -24,6 +24,7 @@ die() { # BASE="registry.gitlab.com/xen-project/hardware/test-artifacts" case "_${CONTAINER}" in + _alpine-3.18-arm64-build) CONTAINER="${BASE}/alpine:3.18-arm64-build" ;; _alpine-x86_64-rootfs) CONTAINER="${BASE}/alpine:x86_64-rootfs" ;; _alpine-x86_64-build|_) CONTAINER="${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..b6d9bd1af531 --- /dev/null +++ b/images/alpine/3.18-arm64-build.dockerfile @@ -0,0 +1,27 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 alpine:3.18 +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +RUN apk --no-cache add bash + +RUN bash -ex <> .config ;; + + aarch64) + ./scripts/config --enable XEN_NETDEV_BACKEND + ;; esac 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 From patchwork Thu Apr 10 11:46:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 14046434 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A57F1C369AC for ; Thu, 10 Apr 2025 11:47:33 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.945332.1343590 (Exim 4.92) (envelope-from ) id 1u2qNH-00058k-W7; Thu, 10 Apr 2025 11:47:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 945332.1343590; Thu, 10 Apr 2025 11:47: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 1u2qNH-00058Y-SG; Thu, 10 Apr 2025 11:47:15 +0000 Received: by outflank-mailman (input) for mailman id 945332; Thu, 10 Apr 2025 11:47: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 1u2qNF-0003hP-TR for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 11:47:13 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 896c174a-1601-11f0-9ffb-bf95429c2676; Thu, 10 Apr 2025 13:47:10 +0200 (CEST) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-43cfa7e7f54so4780455e9.1 for ; Thu, 10 Apr 2025 04:47: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 ffacd0b85a97d-39d893776dfsm4651418f8f.33.2025.04.10.04.47.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 04:47:09 -0700 (PDT) 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: 896c174a-1601-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744285630; x=1744890430; 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=RQtcmdgC+7vfQg2A8IxuYMtTNVD5Qv9GQXTpir99CIU=; b=GgHF0oGoS+72C4yATUemQTKfSH6SnhLfbCdapOIp1sRJCIaU6xLhkuK2OojeAGStp+ q15UOJIM0WLJK9KlJvbR7j3qAtAVIIwAcsUHye+fktBgwtzm3MuNh1SnBPTudCNWnLnp bEcat/Q2nTUAfOhVU+IiiN2To3EifQqGOuIDc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744285630; x=1744890430; 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=RQtcmdgC+7vfQg2A8IxuYMtTNVD5Qv9GQXTpir99CIU=; b=afnlfCIVMirdkzSeQXssC6YLJcCG78Z8Tbk7ePe4Np3HUGYHEFd7tnNFPLY/vChdeI aBibKtk7W7NtvFLpXqx9pk732hcEnuHbsmhD5pgqZtKD10NxJ/EWh/CUnvdHGQ+CbBu1 ShbAx0y9bEMBV1PljZipyfN6QFK6JHcFXPAFZ9DVNDbNxDZmaz+BjfEdzdbWwrNa0wWH HSC5ULLvBuM0wQZPYop3pJ/xFhbPOgaapWBzFj7xHclHIqE8UPx9oR6+ra+e9RD1SVnC XrN3D3UcYF3Rn0uEU9jtAKbidixSwBHXd4FvtPKg3J2wqVpBzLvF6YhJQUGCR142iNrd QYOA== X-Gm-Message-State: AOJu0YxFj5++iuBQ8ed3mbYzfC4NCz+Qj/37c/BQ/uqxhi4aI0Mg5rYL 1S7uP5pxUwjZX9jJfs8AyjglcGtYFw80tEcR92wM6LCfDZOhafXMEW0bqGhZ6uMeVDjziP113Jb zCTY= X-Gm-Gg: ASbGncu4OeH5YOieaItzc1RIu0khhe3UcAL4MC25AKkr4ZVx8iBR2TBSBOAF/HTq7Qz jY7W+4VfN43D5VG0BHbTFZ6U9uoKHU2+87EiqXhQtdak8km1DEr2mrV5ms978x6MuZ6RFGcJMgv zhgAi3lODEYrnTYrhUMAb2G7LBz6duPNST8L+xKV4A/DqfDS4gWRVV9y9cbS+gpXK+9Ct6oJU9q 7gkRN/Tl9+I8wBW/1dkFym9gRH/Mo4lnVAz06/7oVJ9f6UIFNQ5xyfcF1FFtn+jCU5DrJdDJnnM 7OLdsLnVTbViPEzDe1PxfiJIvQgGTecK+SCeMq9kvIPsCeeEqOpuM8WxNgHotZ0lKvvN/3XyD69 fg5KMb3xKKpBXLg== X-Google-Smtp-Source: AGHT+IFioVQOmsy44gPyli+5f1vsL2eu8Mopp7MqvGSQ4NU6+BDYI4RKpJFWw4yp6NJmDv22eEdPpw== X-Received: by 2002:a05:600c:8711:b0:439:9737:675b with SMTP id 5b1f17b1804b1-43f2f0614eamr20779155e9.7.1744285629884; Thu, 10 Apr 2025 04:47:09 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , =?utf-8?q?Roger_Pau_Monn?= =?utf-8?q?=C3=A9?= , Stefano Stabellini , Michal Orzel , =?utf-8?q?Marek_Marczykowski-G=C3=B3re?= =?utf-8?q?cki?= , Anthony PERARD Subject: [PATCH 6/6] Linux builds for x86 and ARM64 Date: Thu, 10 Apr 2025 12:46:28 +0100 Message-Id: <20250410114628.2060072-7-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410114628.2060072-1-andrew.cooper3@citrix.com> References: <20250410114628.2060072-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 For ARM64, the tests in Xen currently use 6.6.74, but 6.6.86 works so update to the latest. For x86, stay at 6.6.56. There's a PVH regression upstream in need of fixing. Signed-off-by: Andrew Cooper Acked-by: Anthony PERARD --- CC: Roger Pau Monné CC: Stefano Stabellini CC: Michal Orzel CC: Marek Marczykowski-Górecki CC: Anthony PERARD v2: * Move x86 back to 6.6.56 until the PVH regression is fixed. --- .gitlab-ci.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6faa85d8dd7c..670f9621e26d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,6 +30,24 @@ stages: variables: CONTAINER: alpine:x86_64-build +# +# ARM64 artifacts +# +linux-6.6.86-arm64: + extends: .arm64-artifacts + script: ./scripts/build-linux.sh + variables: + LINUX_VERSION: 6.6.86 + +# +# x86_64 artifacts +# +linux-6.6.56-x86_64: + extends: .x86_64-artifacts + script: ./scripts/build-linux.sh + variables: + LINUX_VERSION: 6.6.56 + # # The jobs below here are legacy and being phased out. #