From nobody Tue Dec 16 12:37:51 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=1744285659; cv=none; d=zohomail.com; s=zohoarc; b=Kxzfh7oofu5CgcSOf5WkOt1JehJcLF+s37z0Oo954S0v2dflNyi52iRN3tY+XG+W6+yGlpT0rp4LT3TDcznAXXzVquApwhJPgAqvQpqGnplKGRVaxK21BRkkCGpFla/hpoKHtk9SbtVXf2obbxTYXvUQGdGzT0W/4LHo7Hg2CIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744285659; 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=8oR7MLPF5r2CabjIPs5otgDPIkflYO1C7gLrLM21PNY=; b=Bw8IrFyEOOFTVNNnLVIkKdrFKBZSXmSLnxx8rSvuFxC0MW+ZFGAIBon1RBejvTRq6xSFAcQhV+npOtGFnfpJq3qLdJPefYvch4bsIstAa52QUHuGoDwlyyfJ8rFmz5vkq/5KV7IFHjzkQRROA5ymh134qJRZw85CM5ZObMBOXI0= 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 1744285659384688.4798190321807; Thu, 10 Apr 2025 04:47:39 -0700 (PDT) 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 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-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: 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=20Marczykowski-G=C3=B3recki?= , =?UTF-8?q?Roger=20Pau=20Monn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1744285661030019000 ... 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 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 =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 5ed5608628bc..c78cd6ca46da 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 xf 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