From nobody Mon Feb 9 10:42:03 2026 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=1744321077; cv=none; d=zohomail.com; s=zohoarc; b=NSJbWstpWTZhvVvHvkINvo2bDwxD/+n6SndMUagotLNc74CcGtr7v4JC2CVS0IOz75d8XxS9g1JiHS0DHA2MiwY9HiIBhe6xv+HBq5dnt2I6FO9y43dkdkObS4oQkZm9W+zjcD9CAWFu3IXlYhgCJ2H+P1pvcN6lNjpI0eyfjig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744321077; 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=O2OaDotK41umOfviUF7yzwa9T5+3+M0L5HXJtNxyImc=; b=d10T/hx3zNE/bkPOQizi1z7v8H/M7BBr14ityNeZJwkuoXWx+5LRy3NiFofzvFO5u3U7z2DJR+J91vtRFnlKwxjIrFTzWZRUQOAc4mX6wvLxMaMFjr+wlp8tr4LLnDI7JSpKsi5PO8BGWh1KXjXpSDgruEHPShEH+5dbTSRhhbM= 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 1744321077047864.7532351747851; Thu, 10 Apr 2025 14:37:57 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.946383.1344300 (Exim 4.92) (envelope-from ) id 1u2zaY-0008Oi-1j; Thu, 10 Apr 2025 21:37:34 +0000 Received: by outflank-mailman (output) from mailman id 946383.1344300; Thu, 10 Apr 2025 21:37:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2zaX-0008OQ-O0; Thu, 10 Apr 2025 21:37:33 +0000 Received: by outflank-mailman (input) for mailman id 946383; Thu, 10 Apr 2025 21:37:32 +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 1u2zaW-0008Ll-Kz for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 21:37:32 +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 014a5587-1654-11f0-9ffb-bf95429c2676; Thu, 10 Apr 2025 23:37:30 +0200 (CEST) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-391342fc0b5so918158f8f.3 for ; Thu, 10 Apr 2025 14:37:30 -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-39eae9780a0sm100427f8f.50.2025.04.10.14.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 14:37:29 -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: 014a5587-1654-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744321049; x=1744925849; 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=O2OaDotK41umOfviUF7yzwa9T5+3+M0L5HXJtNxyImc=; b=JrHY9+U5xL4pu6u594H5EYi3nz5Qc7KgskW5cRuI+ck+s+XVusw7WEUlZ3HjHcCJab M9dwx5lkhES0NreQgU3xNLFGADguD4QHbFxFadiqpPZuvuBNC4bSleXEu0NvgdQEvhR5 tX97ZOqStpllLvLwYtujIPoYL5+IVzuma0NNA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744321049; x=1744925849; 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=O2OaDotK41umOfviUF7yzwa9T5+3+M0L5HXJtNxyImc=; b=Sd+NviK+7HHWNYRviBQILK1+460oXF/zXKJH1kYZo5hg7wevbBAwiJSM9yaZd4yGKj /yzqgojHlG4jC7T8UAj4Cn/8EcMPBuuIAxLgb9F8Ko6xcbEj1kqznr3QB9nKckD9rNjd oAtyNOEL+N6vFva1N25z6GAWohe4nM1QMFSXNoNwY1Bj4uT+/sKZ7lY5sXug8nRa3ICl mzuVk6b0c6duFVrHtBK7zApXMNnAVBtng2EZl+mw6Ef3e04invGSoksD8j4EnF/HvfnP qF4jBlF8qKqlmZEJ6BliFVx61+L7KnlLBaPGKAkS96IwhtVsq60dc46v7Q6A7Frmjftu c5QQ== X-Gm-Message-State: AOJu0YzWC0eWVRrCx09r8L9W7FY5zxINid/UzL+wGK65cy5mkKlzGgkj EYTnp4KZCLPuIc2pHnX8+H73WGv1t/tebqjYbqi3Kj4QlwuF76Mbm51d7UNh/Q1CESJUVmh6ikw 1P1M= X-Gm-Gg: ASbGncssj4ItsVIH97bNAj5760cvSwkdYSPCBvAgNa3YQEKdoCw7f573/+d1HtKjykD exi7ZcuCmqDyHOhMpxeyTn4oKejj226AHKHzaBJCht3HxylIvDFUOemPgo8xS6yW0eEA3YnWwIC US+Tk2fdbhZQQjrk3hwfX5BXQDuGEOvqIYosuu93XJKLT7ObumS2iYomgS/JOF5ow7npJKFez/N 6jwZmfj5vud20mclfdxvYS+iPQSrO4oDSWC0CjWEFTctLFaanXkQUFc494bSlJrQYTWGdkzpsBX KvrlaWsT5ILOoQTCQ4N1ZvYtnmVtGhBCg/s/q8Pqdim1L3Hl9Srqck1Ukcyy3kDddKkP91XQVM2 yi+Ckoo/DW0tCrNBTUwfL7/DX X-Google-Smtp-Source: AGHT+IHeXj2OwodjCDoZRm/Aihv9FR+qeh0A5wNYoJt5fKTkBgxWEgmIyOPfWZO/cOugQ6jv+yb/oQ== X-Received: by 2002:a05:6000:401f:b0:391:3f4f:a172 with SMTP id ffacd0b85a97d-39eaaed1ebbmr163260f8f.49.1744321049617; Thu, 10 Apr 2025 14:37:29 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Jason Andryuk , "Daniel P . Smith" Subject: [PATCH 1/4] Rename and adjust x86 containers Date: Thu, 10 Apr 2025 22:37:21 +0100 Message-Id: <20250410213724.2098383-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410213724.2098383-1-andrew.cooper3@citrix.com> References: <20250410213724.2098383-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: 1744321078101019000 Insert the Alpine version as we'll need a newer version in due course, and rename 'rootfs' to 'base' as the container really is not a rootfs on it's o= wn. In base, add bash. It's added later by the rootfs generation anyway, but t= his way we can write the generation script in bash too. In build, group and sort the packages. Drop the ones we don't need, or are pulled in by dependencies. Include diffutils, findutils and gawk to avoid warnings in the kernel build. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki CC: Jason Andryuk CC: Daniel P. Smith --- .gitlab-ci.yml | 4 +-- containerize | 4 +-- images/alpine/3.18-x86_64-base.dockerfile | 6 ++++ ...ockerfile =3D> 3.18-x86_64-build.dockerfile} | 32 ++++++++++++------- images/alpine/x86_64-rootfs.dockerfile | 4 --- 5 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 images/alpine/3.18-x86_64-base.dockerfile rename images/alpine/{x86_64-build.dockerfile =3D> 3.18-x86_64-build.docke= rfile} (54%) delete mode 100644 images/alpine/x86_64-rootfs.dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 670f9621e26d..fb997cc62162 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ stages: tags: - x86_64 variables: - CONTAINER: alpine:x86_64-build + CONTAINER: alpine:3.18-x86_64-build =20 # # ARM64 artifacts @@ -62,7 +62,7 @@ x86_64-rootfs-alpine-3.18: script: - . scripts/x86_64-rootfs-alpine.sh variables: - CONTAINER: alpine:x86_64-rootfs + CONTAINER: alpine:3.18-x86_64-base =20 x86_64-argo-linux-6.6.56: extends: .x86_64-artifacts diff --git a/containerize b/containerize index 7abeb119ff6a..c23f55ead737 100755 --- a/containerize +++ b/containerize @@ -25,8 +25,8 @@ 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-rootfs) CONTAINER=3D"${BASE}/alpine:x86_64-rootfs" ;; - _alpine-x86_64-build|_) CONTAINER=3D"${BASE}/alpine:x86_64-build" ;; + _alpine-3.18-x86_64-base) CONTAINER=3D"${BASE}/alpine:3.18-x86_64-base= " ;; + _alpine-3.18-x86_64-build|_) CONTAINER=3D"${BASE}/alpine:3.18-x86_64-b= uild" ;; esac =20 # Use this variable to control whether root should be used diff --git a/images/alpine/3.18-x86_64-base.dockerfile b/images/alpine/3.18= -x86_64-base.dockerfile new file mode 100644 index 000000000000..a8cb274d5821 --- /dev/null +++ b/images/alpine/3.18-x86_64-base.dockerfile @@ -0,0 +1,6 @@ +# syntax=3Ddocker/dockerfile:1 +FROM --platform=3Dlinux/amd64 alpine:3.18 +LABEL maintainer.name=3D"The Xen Project" +LABEL maintainer.email=3D"xen-devel@lists.xenproject.org" + +RUN apk --no-cache add bash diff --git a/images/alpine/x86_64-build.dockerfile b/images/alpine/3.18-x86= _64-build.dockerfile similarity index 54% rename from images/alpine/x86_64-build.dockerfile rename to images/alpine/3.18-x86_64-build.dockerfile index 98969a5be1da..eac0cda4fed3 100644 --- a/images/alpine/x86_64-build.dockerfile +++ b/images/alpine/3.18-x86_64-build.dockerfile @@ -1,31 +1,39 @@ # syntax=3Ddocker/dockerfile:1 FROM --platform=3Dlinux/amd64 alpine:3.18 -LABEL maintainer.name=3D"The Xen Project" \ - maintainer.email=3D"xen-devel@lists.xenproject.org" +LABEL maintainer.name=3D"The Xen Project" +LABEL maintainer.email=3D"xen-devel@lists.xenproject.org" =20 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 1744321071930239.8025869421008; Thu, 10 Apr 2025 14:37:51 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.946382.1344294 (Exim 4.92) (envelope-from ) id 1u2zaX-0008M6-Kh; Thu, 10 Apr 2025 21:37:33 +0000 Received: by outflank-mailman (output) from mailman id 946382.1344294; Thu, 10 Apr 2025 21:37:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2zaX-0008Lz-HJ; Thu, 10 Apr 2025 21:37:33 +0000 Received: by outflank-mailman (input) for mailman id 946382; Thu, 10 Apr 2025 21:37:32 +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 1u2zaW-0008Lk-Jh for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 21:37:32 +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 01c67ee5-1654-11f0-9eac-5ba50f476ded; Thu, 10 Apr 2025 23:37:31 +0200 (CEST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cef035a3bso9589305e9.1 for ; Thu, 10 Apr 2025 14:37:31 -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-39eae9780a0sm100427f8f.50.2025.04.10.14.37.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 14:37:30 -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: 01c67ee5-1654-11f0-9eac-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744321050; x=1744925850; 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=xV671OWsZPCz48qmFfXSAWovXOQaZ6EW+7MHCndadN0=; b=IgCwI6NdaoATUmngf/vNYe+x9mttRVhvS6B0pBIpPuo5uRAQWE9v0y3BQ2GuSs++9k 9xg+CxQj3xu/60WaCuy4nfLC6/rzDWEylxeCz6F5I7uNfhouLSY9xfrcq5siYzqLgaAe Yd47yvVsdrR5UJAlV6ZoGwGhpc49aHQAj4us8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744321050; x=1744925850; 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=xV671OWsZPCz48qmFfXSAWovXOQaZ6EW+7MHCndadN0=; b=Esyvcr+cLT5xL7DzSP18Ry8Tn/e75H9kaaYN0+ZJyvULV2AQ0sqPcBQz1WQpeeU8Sq Foodk2+gHzoeDMAF1VPTfVvxWPKBfO2sjbhKxCW4A7R06zCg6HR9+Oh1opl3D6bWFiEd aEKysxMQKn9mtSZSzodiFXdb5XysTUgelwmq/ihZkfd5WpVwoQ2pUlcJfH+S49Q8XcJr A0k1S4qdj0/Q5V5Qcp7fBhBCMlRHFbbSlDytaJ+dJsOW6SGkeUa7X6w1l+jGW2xNLFK6 TM9hiHw9mKImVYe4CCZpFrCuVGoTxub+s3HVO2VZl8hSEm5r4ogkD25YoDE/wSwcyFlL 9eIw== X-Gm-Message-State: AOJu0YzbCgOX068IpA/6TefyPVD8PPDFpVOpYQIhhYwRak+EBnGfFt3j Tw8DVYUgu+k1IgBLjtYqtFl3BoKUWkKf+MtpTJpLi6hl9lsRHjK7BET/6BT26t3xuOjP04PxE5v kfuk= X-Gm-Gg: ASbGncsCkmzn/6l1izjfT4S5i89vdrAT4rcPsbn3j4sfj+ihzyEq6NB3Cxu93s4h8F+ IKaGxWbZ/qEZjS3SjJd0AgL66+C06+0I7Bsjk9iQD6CVehwd4oJh9rjxXwgua4fqrTeasHDuqhK dDr+5gDoHZ7WsDAusWOehHwOIEOaMJZ73PoAL+vCXBGHxISSBUQucb2OpobhkDFM1nffYdd8WVz g9AUZCzV4Um5AbNjIUwAnTxZ1IInka7gT3h+ExyeHXUnD7dDdbpcJyWCwGybHzO9osHePxozJih 1H1k5P5FaC4iIbAfhbqilN/Q5rPEzFy8J3REKSlkxMbBjlYVbxufnPbUzYItNznYbvx4SlD7O0C EYoefV9wPMaxtvMMgOqm0z1tH X-Google-Smtp-Source: AGHT+IECMtO23JY0XskOeZwL58XeaLKbykah1JSxnjUgUWHdV33sbRKTKFF0RSZnnD+qP1yrqYe5Mg== X-Received: by 2002:a05:600c:3baa:b0:43c:efed:732c with SMTP id 5b1f17b1804b1-43f3a9b0285mr936615e9.28.1744321050452; Thu, 10 Apr 2025 14:37:30 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Jason Andryuk , "Daniel P . Smith" Subject: [PATCH 2/4] Overhaul how Argo is built and packged Date: Thu, 10 Apr 2025 22:37:22 +0100 Message-Id: <20250410213724.2098383-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410213724.2098383-1-andrew.cooper3@citrix.com> References: <20250410213724.2098383-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: 1744321073835019100 Right now, the argo artefacts are a pile of files which the test has to turn back into something which resembles a filesystem. Furthermore, because we = do not build modules for the main kernel, it is extra important to make sure t= hat xen-argo.ko doesn't get out of sync. Build argo unconditionally as part of the linux artefact. It's ~100kb all together, compared to ~14M for the kernel. Produce a single argo.cpio.gz with xen-argo.ko in the standard location. Prune userspace down to just the executables and libraries. This is cribbed from the existing scripts/x86_64-linux-argo.sh, which stays= in place in the short term until Xen can be updated to use the new scheme. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki CC: Jason Andryuk CC: Daniel P. Smith I tried to make MODPOST work properly, but we don't build enough of it for = the kernel, and I didn't feel like adding an extra 10 mins to the build (all modules) just to get the metadata right. --- .gitlab-ci.yml | 2 ++ scripts/build-argo.sh | 67 ++++++++++++++++++++++++++++++++++++++++++ scripts/build-linux.sh | 6 +++- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 scripts/build-argo.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fb997cc62162..790a6d9f9896 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,6 +47,8 @@ linux-6.6.56-x86_64: script: ./scripts/build-linux.sh variables: LINUX_VERSION: 6.6.56 + ARGO_SHA: "705a7a8a624b42e13e655d3042059b8a85cdf6a3" + ARGOEXEC_SHA: "d900429f6640acc6f68a3d3a4c945d7da60625d8" =20 # # The jobs below here are legacy and being phased out. diff --git a/scripts/build-argo.sh b/scripts/build-argo.sh new file mode 100644 index 000000000000..0b4005f3b9a0 --- /dev/null +++ b/scripts/build-argo.sh @@ -0,0 +1,67 @@ +# +# This is a partial script, sourced by build-linux.sh +# It has expectations about the environment +# + +cd "${WORKDIR}" + +# +# We're going to collect everything in argo.cpio.gz. Construct it under +# $ARGODIR as we go. +# +ARGODIR=3D"${WORKDIR}/argo-root" + +git clone https://github.com/OpenXT/linux-xen-argo.git --depth=3D1 +git -C "${WORKDIR}/linux-xen-argo" fetch origin "${ARGO_SHA}" +git -C "${WORKDIR}/linux-xen-argo" switch --detach FETCH_HEAD + +# Build xen-argo.ko against the target kernel, and install it. Install +# linux/argo.h too because userspace needs it. +make -C "linux-${LINUX_VERSION}" \ + M=3D"${WORKDIR}/linux-xen-argo/argo-linux" \ + KBUILD_MODPOST_WARN=3D1 \ + CFLAGS_MODULE=3D"-Wno-error" \ + modules +install -D -m644 "${WORKDIR}/linux-xen-argo/argo-linux/xen-argo.ko" \ + "${ARGODIR}/lib/modules/${LINUX_VERSION}/updates/xen-argo.ko" +install -D -m644 "${WORKDIR}/linux-xen-argo/argo-linux/include/linux/argo.= h" \ + "${ARGODIR}/usr/include/linux/argo.h" + +# Build and install libargo, applying fixes to build in Alpine Linux +cd "${WORKDIR}/linux-xen-argo/libargo" +sed -e "s|AM_INIT_AUTOMAKE|AC_CONFIG_AUX_DIR(.)\nAM_INIT_AUTOMAKE|" \ + -i configure.ac +sed -e "s/__SOCKADDR_COMMON (sxenargo_)/sa_family_t sxenargo_family/" \ + -e "s/__SOCKADDR_COMMON_SIZE/(sizeof (unsigned short int))/" \ + -i src/libargo.h + +autoreconf --install +./configure --prefix=3D/usr CPPFLAGS=3D"-I${PWD}/../argo-linux/include" +make +make install DESTDIR=3D"${ARGODIR}" + +# Build and install argo-exec, modifying for xilinx argo test +cd "${WORKDIR}" +curl -fsSLO \ + https://raw.githubusercontent.com/OpenXT/xenclient-oe/${ARGOEXEC_SHA}/= recipes-openxt/argo-exec/argo-exec/argo-exec.c +sed -e "/#include /d" \ + -e "s|ret =3D shuffle(s, fds\[0\], fds\[1\]);|ret =3D shuffle(s, 0, 1)= ;|" \ + -i argo-exec.c + +gcc -I"${ARGODIR}/usr/include" -L"${ARGODIR}/usr/lib/" \ + argo-exec.c -o "${ARGODIR}/usr/bin/argo-exec" -largo + +# +# Building is now complete. Strip the devel components and the nointerpos= er +# lib, which we don't care to deploy to the test system. +# +cd $ARGODIR +rm -r usr/include usr/lib/pkgconfig +find usr/lib -name \*nointerposer\* -delete +find usr/lib \( -name \*.a -o -name \*.so -o -name \*.la \) -delete + +# Package everything up +find . | cpio -R 0:0 -H newc -o | gzip > "$COPYDIR/argo.cpio.gz" + +# Print the contents for the build log +zcat "$COPYDIR/argo.cpio.gz" | cpio -tv diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh index 652fdba7b9d1..49b5ebed6424 100755 --- a/scripts/build-linux.sh +++ b/scripts/build-linux.sh @@ -8,7 +8,7 @@ fi set -ex -o pipefail =20 WORKDIR=3D"${PWD}" -COPYDIR=3D"${WORKDIR}/binaries/" +COPYDIR=3D"${WORKDIR}/binaries" UNAME=3D$(uname -m) =20 # Build Linux @@ -45,6 +45,10 @@ case $UNAME in x86_64) make -j$(nproc) bzImage cp arch/x86/boot/bzImage "${COPYDIR}" + + # Build argo + make modules_prepare + . "${WORKDIR}/scripts/build-argo.sh" ;; =20 aarch64) --=20 2.39.5 From nobody Mon Feb 9 10:42:03 2026 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=1744321073; cv=none; d=zohomail.com; s=zohoarc; b=MHd7/hdjbfi+iWCaHRI8FmLpSrhf8Ibj+1XQCWkLrXCm5nnBDi0bpqFiq0hd3VAk8BFqoxWsFLphDLxxmx0Lxc2nm9UZUXOxTfnISoeVir22pOoThezdxq1OqtpxrrLFCZ1h9qWJBNPG0CKYSJfRmCS8RlWjsQ7fzS0YAA2l1+I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744321073; 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=Nr3sOGZANa0DEvlAfKrqTmFvr3DzveYawZZlLIxI7wM=; b=n/y71qZCwQPhR+NBzF/DqPuq46dFKYKkxV3S0/l55BlJWIer7iad06h5WYLWI/Zgy1r4fxEDs4aIAmIypzGTgpqfjQfnl/mWJU4As25fO2lflwKY6AtaHFkbjTiroCEzbwAdaEkEoY2zC8R8ZCVZ1CkKwFwmurCTgoiuwnHgrQQ= 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 1744321073134169.24000546823243; Thu, 10 Apr 2025 14:37:53 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.946384.1344314 (Exim 4.92) (envelope-from ) id 1u2zaZ-0000NM-1L; Thu, 10 Apr 2025 21:37:35 +0000 Received: by outflank-mailman (output) from mailman id 946384.1344314; Thu, 10 Apr 2025 21:37:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2zaY-0000ND-UQ; Thu, 10 Apr 2025 21:37:34 +0000 Received: by outflank-mailman (input) for mailman id 946384; Thu, 10 Apr 2025 21:37:33 +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 1u2zaX-0008Ll-JG for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 21:37:33 +0000 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [2a00:1450:4864:20::42f]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 02369862-1654-11f0-9ffb-bf95429c2676; Thu, 10 Apr 2025 23:37:32 +0200 (CEST) Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3914bc3e01aso697195f8f.2 for ; Thu, 10 Apr 2025 14:37:32 -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-39eae9780a0sm100427f8f.50.2025.04.10.14.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 14:37:30 -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: 02369862-1654-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744321051; x=1744925851; 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=Nr3sOGZANa0DEvlAfKrqTmFvr3DzveYawZZlLIxI7wM=; b=IwMgOPL3wq/O4+1Xctg2qf+IfbOmKqyqBubbR0lZQuc2ENYGKFBTqub3tzCEpigR6G 7w8OXx5v+D1b3UtlvqW7noO5OstSH+v8X8mq8IzPylpfNhJgpe5xeAKEZGwYcLL1O+C4 Ialpr6cE8sY3rN1Cy8LyxiaeBcaxq0FRETFZE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744321051; x=1744925851; 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=Nr3sOGZANa0DEvlAfKrqTmFvr3DzveYawZZlLIxI7wM=; b=ZZdslhW41WJx5RCoBF5pqYFQIlHAsUCxa6M9Saset3K7UuwA5kX85DuB4uCT1dE71H yLRnsqYmuZcWPhKIAfyd17H0Mpn9YIMjIgOJg09mgJOoqY0cl4AQHCoRW8SJfo6KVm5G 4H5/GlGW4MCvnNsn6PYu/qApESXsMXOtnoXXe5nvSh9LpH1mUU5zJ4NUefhCPL1GCoGD C+AHioSgS4BFHiaEtr9SKyM8bqLU+Nv6QqzsHcpHKQV1mSQFDDUa5+eoFXO8Nhg5g267 sud2yK2C43SnADZjKEXyHh/wrsxwWQLd1pW7XaULM3c+/+yZwxQQD2oZqAvlHcwTXikc CnCA== X-Gm-Message-State: AOJu0YwEB2HisriiCwkHw/owx+b+Jxy85ODWRbwNuwelrqP3Ivk7IS3S UM41utqVeROoITr3EWkNcCzbQ2Um4x8Zzmn+ECjoPksOyZPGwdUM97aw50Hg19br7IuURxdIEtO XWIY= X-Gm-Gg: ASbGncs6JZN8Wptpj6QXd4SlkzOELh8lRVu3m4VsuQF9NW63aegieQrP+A9xrI1X2hM u904pTHE68ZQG04DoXGpG3WaeiuamHPtNaoP55P0RODvaiVyl5DrKy/Z4+/UsnqxKMloveMHakH 5YwinSoNCdIrw2xKi0d+2O1r1v6LN2AfQseEnUoD+6Z6rZHUHq74HKhzF7W6xGRN0n15RgWfNg+ 9VXdtR9QvOidlKklqPpbjBji7ica4IGP7ugbxT6XBptUOcH/x3XlQX+wEUcn9QMNmIRju6cBFix /W5NMupOEBRD63dvSV4Xk0kJWBPI4OjL2yvioAEAxQ4/RAosn8XaijWE9vcZNPKnVUPYKt1Yovc 8ReG1Qa6T0uKNvQ== X-Google-Smtp-Source: AGHT+IGS6VzZxRdAxk0y6aF/KnygVxAeBVRoxa28JHprLKXTrW4IjEUHdIdZHHhw+Qc2qJU6XGmLGA== X-Received: by 2002:a05:6000:1a88:b0:391:3cb7:d441 with SMTP id ffacd0b85a97d-39ea5212b03mr175108f8f.25.1744321051269; Thu, 10 Apr 2025 14:37:31 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Jason Andryuk , "Daniel P . Smith" Subject: [PATCH 3/4] Switch to fixed Argo Date: Thu, 10 Apr 2025 22:37:23 +0100 Message-Id: <20250410213724.2098383-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410213724.2098383-1-andrew.cooper3@citrix.com> References: <20250410213724.2098383-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: 1744321074060019000 https://github.com/OpenXT/linux-xen-argo/pull/21 Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki CC: Jason Andryuk CC: Daniel P. Smith Probably not for applying, but it would be really good if we could make the= se bugs go away. --- .gitlab-ci.yml | 2 +- scripts/build-argo.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 790a6d9f9896..1d2c72b268a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,7 +47,7 @@ linux-6.6.56-x86_64: script: ./scripts/build-linux.sh variables: LINUX_VERSION: 6.6.56 - ARGO_SHA: "705a7a8a624b42e13e655d3042059b8a85cdf6a3" + ARGO_SHA: "ca5473a56f62e2b4d59697c8552d151391d3fec1" ARGOEXEC_SHA: "d900429f6640acc6f68a3d3a4c945d7da60625d8" =20 # diff --git a/scripts/build-argo.sh b/scripts/build-argo.sh index 0b4005f3b9a0..a18a259779c6 100644 --- a/scripts/build-argo.sh +++ b/scripts/build-argo.sh @@ -11,7 +11,7 @@ cd "${WORKDIR}" # ARGODIR=3D"${WORKDIR}/argo-root" =20 -git clone https://github.com/OpenXT/linux-xen-argo.git --depth=3D1 +git clone https://github.com/andyhhp/linux-xen-argo.git --depth=3D1 git -C "${WORKDIR}/linux-xen-argo" fetch origin "${ARGO_SHA}" git -C "${WORKDIR}/linux-xen-argo" switch --detach FETCH_HEAD =20 @@ -20,7 +20,6 @@ git -C "${WORKDIR}/linux-xen-argo" switch --detach FETCH_= HEAD make -C "linux-${LINUX_VERSION}" \ M=3D"${WORKDIR}/linux-xen-argo/argo-linux" \ KBUILD_MODPOST_WARN=3D1 \ - CFLAGS_MODULE=3D"-Wno-error" \ modules install -D -m644 "${WORKDIR}/linux-xen-argo/argo-linux/xen-argo.ko" \ "${ARGODIR}/lib/modules/${LINUX_VERSION}/updates/xen-argo.ko" --=20 2.39.5 From nobody Mon Feb 9 10:42:03 2026 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=1744321073; cv=none; d=zohomail.com; s=zohoarc; b=OVBLXHwXTZGQYACMQchQ/G/p5K96mBhLqN8AoNNVxo31ynTbPmWFnYvolLVuTxTkR/lq7y4ZdDNpRTPTBgNjfWhF8+LmQDJ6ZWgsUyT5RKHPBzCx14g3ZgyCUi/LtJ129jAmByYU81ERUXQaHzdKZcbun6Oz/A/bv3yLdgoioLk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744321073; 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=D17IkUr2my28TpWIQRZBF41FCJbDL7Htbn47+p4/2zc=; b=Iil03WdBLiYsSInq4aoLuXYLJHeqmt8buE1QGN0m8xR2A3yK3qBMUUvSXpWAN7tU9KHeEYqfSOn5QmZBX2NsOi/T0y1fb7ZDHASBogpJqqoyHSd3RzgoOdI4xUL16RKYFVcGvqTLiLxtGfa+J3ZUFzDEIffFytJghCD7MluPbFw= 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 1744321073797620.127306915591; Thu, 10 Apr 2025 14:37:53 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.946386.1344330 (Exim 4.92) (envelope-from ) id 1u2zaa-0000gs-Op; Thu, 10 Apr 2025 21:37:36 +0000 Received: by outflank-mailman (output) from mailman id 946386.1344330; Thu, 10 Apr 2025 21:37:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u2zaa-0000fW-IW; Thu, 10 Apr 2025 21:37:36 +0000 Received: by outflank-mailman (input) for mailman id 946386; Thu, 10 Apr 2025 21:37:35 +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 1u2zaZ-0008Ll-BQ for xen-devel@lists.xenproject.org; Thu, 10 Apr 2025 21:37:35 +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 02b045b5-1654-11f0-9ffb-bf95429c2676; Thu, 10 Apr 2025 23:37:32 +0200 (CEST) Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43cfdc2c8c9so7402785e9.2 for ; Thu, 10 Apr 2025 14:37:32 -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-39eae9780a0sm100427f8f.50.2025.04.10.14.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 14:37:31 -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: 02b045b5-1654-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1744321052; x=1744925852; 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=D17IkUr2my28TpWIQRZBF41FCJbDL7Htbn47+p4/2zc=; b=vhNfjnP5ImEyjm0pw4c1eSVvtqhQnW41BdsiXgU8ezXc2A6zBRnVJsbTk+4XGsthcX 6z6dLQs4zLv1W80bkmqD2ULEHNxXqxD/gaUmqIGMyVnXQocbwEm7oH22emSRxf6tf4+M Vwdc9AA6YPGO2wm9wL/CA82SCELzAMXd/fS5k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744321052; x=1744925852; 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=D17IkUr2my28TpWIQRZBF41FCJbDL7Htbn47+p4/2zc=; b=EPtej3waveKS4GWagWqWJaPPqZT+roZT25LVT88pPloOYIUv3EbEYxEHkPvd65IL4H SbH9vyIIWK3o9wtvbWF/7MjXCm5Z9svSQoo5pQmdPFukdqEhLk8Jy7dp4qhi4021yHPA H267NJk3bVo4lBnsu1M2PtsRSsElA4/mqtqoA8nR4FNZDatCAx4Ks1lqjwj00gx26MuC ac2VJJaJIMIKIDFrKwRLGEl/15r1o/8CMIxGxeTjqQz0heE5DuXhMhiyjmn3pOHOb2c7 NkiLYCihaJcVO1AJy23tslCJPDSdRVVVHZTxwFP0T6dRHvFzX8hLKunXssaMWTEH1Bm0 OPdA== X-Gm-Message-State: AOJu0YyZSQC8e/cZWTt9M1cbhgNjv9p8lF6KMh7xup6jr20sF0ZAXoje xW0vfdFW56utB04NacNKEd/hZwOBfnpcdHr3GfN3A7EfixAEpMsSO/hyw9H2/yVBO2MmD6QloYl 6CGE= X-Gm-Gg: ASbGncvw78GOH6MB+Xy+UULJRRCNEi9tJNm1UxqGzv3WLBzI/1vIaSAuYX4kSL25L0L eYEkSPoyn0BSs9h7rUex+5J87o8mxXefWEzvXb3rVWu7Zl4VOBVmE1q8SqJjxZ+5d4yiyM7qhv5 d0iO1wVtIE/BBBpSRuPNMtOhLqz+aLVGD8ngpBLYWaDE04oAgWKlUecVleR1On32yxOx1E2P17P QWU9g1XFRBeojURFu9O+O34cZZ04hIHX0sq5Bp9SL228I0ijG+hgGyT4KXuDQ/DbwN9quCkdF3q L/0M0Xa9ipV+TC5bYjkRpqO1fpJhRfVi3R94sov/eT3mvbldTpxLrFZucRhlqVvt0Kn7yT8brwx Pz4VKi/6MXn7feVtyAYtPBOW4 X-Google-Smtp-Source: AGHT+IGIRZp3olHSsqY0SZOnyMzgDnMNtHsCxFHClUqNFDdZOJQ2BXNkvwtbK3pG1jKln6avwVSFnQ== X-Received: by 2002:a05:600c:5249:b0:43d:7588:6687 with SMTP id 5b1f17b1804b1-43f3a93f621mr1098065e9.12.1744321052014; Thu, 10 Apr 2025 14:37:32 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Stefano Stabellini , Michal Orzel , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Jason Andryuk , "Daniel P . Smith" Subject: [PATCH XEN 4/4] CI: Switch to new argo artefact Date: Thu, 10 Apr 2025 22:37:24 +0100 Message-Id: <20250410213724.2098383-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410213724.2098383-1-andrew.cooper3@citrix.com> References: <20250410213724.2098383-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: 1744321075377019100 xen-argo.ko has moved into the standard location. In the short term, simply unpack argo.cpio.gz, but this can be simply concatinated with the base root= fs when it is constructed in a more convenient way. No practical change. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Stefano Stabellini CC: Michal Orzel CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki CC: Jason Andryuk CC: Daniel P. Smith https://gitlab.com/xen-project/hardware/xen-staging/-/jobs/9690063969 diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 59a2de28c864..9a533eedb941 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -240,14 +240,11 @@ xilinx-smoke-dom0-x86_64-gcc-debug-argo: needs: - alpine-3.18-gcc-debug - project: xen-project/hardware/test-artifacts - job: x86_64-kernel-linux-6.6.56 + job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts job: x86_64-rootfs-alpine-3.18 ref: master - - project: xen-project/hardware/test-artifacts - job: x86_64-argo-linux-6.6.56 - ref: master =20 adl-smoke-x86-64-gcc-debug: extends: .adl-x86-64 diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/sc= ripts/xilinx-smoke-dom0-x86_64.sh index 7834ffbe0593..e97702f22827 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -66,7 +66,7 @@ then PASS_MSG=3D"TEST: Message from DOMU" XEN_CMD_EXTRA=3D"argo=3D1,mac-permissive=3D1" DOMU_CMD=3D" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko until false do echo \"${PASS_MSG}\" @@ -74,15 +74,13 @@ do done | argo-exec -p 28333 -d 0 -- /bin/echo " DOM0_CMD=3D" -insmod /root/xen-argo.ko +insmod /lib/modules/\$(uname -r)/updates/xen-argo.ko xl -vvv create /etc/xen/domU.cfg argo-exec -l -p 28333 -- /bin/echo " copy_dom0_files () { - cp "${WORKDIR}/binaries/xen-argo.ko" "root/" - cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" - cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" + zcat ${WORKDIR}/binaries/argo.cpio.gz | cpio -idv } copy_domU_files () { copy_dom0_files; } else