From patchwork Fri Dec 8 16:02:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13485599 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 42B82C4167B for ; Fri, 8 Dec 2023 16:02:43 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.650717.1016475 (Exim 4.92) (envelope-from ) id 1rBdJD-0002P8-Rp; Fri, 08 Dec 2023 16:02:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 650717.1016475; Fri, 08 Dec 2023 16:02:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rBdJD-0002Oz-Nq; Fri, 08 Dec 2023 16:02:35 +0000 Received: by outflank-mailman (input) for mailman id 650717; Fri, 08 Dec 2023 16:02:34 +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 1rBdJC-0002KL-PV for xen-devel@lists.xenproject.org; Fri, 08 Dec 2023 16:02:34 +0000 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [2a00:1450:4864:20::431]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 32d90217-95e3-11ee-98e8-6d05b1d4d9a1; Fri, 08 Dec 2023 17:02:34 +0100 (CET) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-33350fcb2c7so1662199f8f.2 for ; Fri, 08 Dec 2023 08:02:34 -0800 (PST) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id s3-20020a5d69c3000000b00333320cf08bsm2300535wrw.102.2023.12.08.08.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 08:02:31 -0800 (PST) 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: 32d90217-95e3-11ee-98e8-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1702051352; x=1702656152; 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=4+zyK/oiTkm1dgGGOn54iVXU0W1VNBdMRp0zkH25QpU=; b=WsHDQYryihwTO81AxY6ZSk7THz5P6uH8YWUvt0AJnbL+AK7HGjH64fqQxnegaukXa0 W37/An6F4QQRI0NtRQ1yKUKbfNKXC4RIgsY8PEeEPp9J+0Cn/K7Z1VV6vyM7BlN3aEcV LMT+eT7HqTfttJJ1LJfe+6tlfyXJFEuYzazuw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702051352; x=1702656152; 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=4+zyK/oiTkm1dgGGOn54iVXU0W1VNBdMRp0zkH25QpU=; b=D7+5goBeZiFU5NCCOIrW0vY9I2Y2M6vDzDO9/UCTXrkDc6SHollao/B8L/waC+4k2w kr9MZ59zxN9xT3kFyvafmD48w1OVowr3VL8Qu6/CRuIGPPhB1e5xxUldK59G5WdFm4Qr +9OqaZkfneZ3vx9sZCZXL+0h6qTh/JxR7oah0R1mSR2Mv3pYs8NkfapU1bBexRLyOGJ9 CSMxpF1P9igpM1Iw/TzpX/+GAeXciMFslSDbytTjweeKMAQ4hcyVLdCbnncKlaytT2qH 7sErAoW6uZASKGeYF2c38CBLaEv91IGhO39eYCLTBm0XlJ9orMF5ox9WJ0n2aD0JHvCY TB2Q== X-Gm-Message-State: AOJu0Yze+yZZYJFZevseHOOM+SSvvWQI1S/O72EAQXF2w2pD3hO3EOHM jjPZ1Yy5TpjGPD31bZQoYthrovcwneOwU1vD0kU= X-Google-Smtp-Source: AGHT+IFQTdIlvsMdCJ+RHxBahKu2ud4weU+5uTYJfRDWIuC1a6AKQKRCP34gb8bDVY+ezFs6Mp73Tw== X-Received: by 2002:a05:6000:369:b0:333:2fd2:8166 with SMTP id f9-20020a056000036900b003332fd28166mr153110wrf.131.1702051352114; Fri, 08 Dec 2023 08:02:32 -0800 (PST) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Anthony PERARD Subject: [OSSTEST PATCH 1/3] create_build_jobs: Set reset pvops_kconfig_overrides Date: Fri, 8 Dec 2023 16:02:24 +0000 Message-Id: <20231208160226.14739-2-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231208160226.14739-1-anthony.perard@citrix.com> References: <20231208160226.14739-1-anthony.perard@citrix.com> MIME-Version: 1.0 Those two variables, and especially "pvops_kconfig_overrides", aren't reset for the next loop of `for arch ...`. So when "pvops_kconfig_overrides" is for "armhf", it is also set for "arm64" as this is the next "arch" in the loop. Avoid this by setting default values for the variables before the `case` command. This changes Linux arm64 builds which will not have "CONFIG_EXT4_FS=y" anymore, but should get "CONFIG_EXT4_FS=m" instead from `ts-kernel-build`. But resulting build still have "CONFIG_EXT4_FS=y", so no change. Signed-off-by: Anthony PERARD --- mfi-common | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mfi-common b/mfi-common index 51eb4a9c..1a131c27 100644 --- a/mfi-common +++ b/mfi-common @@ -284,6 +284,11 @@ create_build_jobs () { build_matrix_branch_filter_callback || continue + pvops_kconfig_overrides="" + pvops_kernel=" + tree_linux=$TREE_LINUX + revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} + " case "$arch" in armhf) case "$xenbranch" in @@ -314,12 +319,6 @@ create_build_jobs () { revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} " ;; - *) - pvops_kernel=" - tree_linux=$TREE_LINUX - revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} - " - ;; esac case "$arch" in From patchwork Fri Dec 8 16:02:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13485602 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 9613FC10DC1 for ; Fri, 8 Dec 2023 16:02:46 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.650718.1016491 (Exim 4.92) (envelope-from ) id 1rBdJF-0002qb-3r; Fri, 08 Dec 2023 16:02:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 650718.1016491; Fri, 08 Dec 2023 16:02:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rBdJF-0002qU-17; Fri, 08 Dec 2023 16:02:37 +0000 Received: by outflank-mailman (input) for mailman id 650718; Fri, 08 Dec 2023 16:02:35 +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 1rBdJD-0002KL-Po for xen-devel@lists.xenproject.org; Fri, 08 Dec 2023 16:02:35 +0000 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [2a00:1450:4864:20::434]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 339894f1-95e3-11ee-98e8-6d05b1d4d9a1; Fri, 08 Dec 2023 17:02:35 +0100 (CET) Received: by mail-wr1-x434.google.com with SMTP id ffacd0b85a97d-332c0c32d19so2680838f8f.3 for ; Fri, 08 Dec 2023 08:02:35 -0800 (PST) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id s3-20020a5d69c3000000b00333320cf08bsm2300535wrw.102.2023.12.08.08.02.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 08:02:32 -0800 (PST) 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: 339894f1-95e3-11ee-98e8-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1702051354; x=1702656154; 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=Fr3W+U/Mp2tq5rXlzz6Wl7JrCdke4I/2nydwyKcZdGM=; b=uiY2U8286Iv7/0a6l9LLCoacW0B5EBA5gmBKIlRk58CfTmEQrU1946HPcRDJrIXiJY YnIjXvX8hAldIO6qRUjzHG9EfeAAc6nmymIGBXnGB0Bp5w9Ncs1jWedhDnLkaTglLp5b fPZ4KhxRjzM3aqrw+VOUrBZj3namFOUGLp7ow= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702051354; x=1702656154; 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=Fr3W+U/Mp2tq5rXlzz6Wl7JrCdke4I/2nydwyKcZdGM=; b=Ec7npX82R46h5iKX8aB/DiLWutKZegAwU+UYokfU6TfURb10VDNKSwNkJSl8VIJvW+ B3Pu4va+vfctm3Sc0U+8U0J8Pe8uZ6/7tZVD1z5+JvcrW4wYAHplBjdssmaffNej+A6R x6OibPn8nbRFsSr/cL1II8A2wYZ1Tog33KicHWwNapO2B4luU9PQ8KuDqYph+azUG2lQ b+BEFPL5PV2uGXrPj3mdSc6OUQidKoGYK4qxX2j6c114qdrCzQa6HGsY8mgi+YObw3tJ cAPOZCt4ykO2o2LJrw2pUi1yU4fEl5OkUaMKsRjcCBn8Y0pKCEi5zvnrGqgu9/zHo3ay mJBg== X-Gm-Message-State: AOJu0YyJH/WupZQqFwNNeqTA3TwGeaRV9QrGcSTJn4lVY/7h5QnvClvR hfZ8p0dGgdLojjGWbC8MLAK93Fe0lCuR49CQ18Q= X-Google-Smtp-Source: AGHT+IE9xrxUFQDJ3sF2wXBv+u9YgkgTTACfK/+HSMfPlKpwhtmu9Hkd5sOKBDQPgvSP24m325ZWzA== X-Received: by 2002:a05:6000:136d:b0:333:145a:759b with SMTP id q13-20020a056000136d00b00333145a759bmr155989wrz.20.1702051353986; Fri, 08 Dec 2023 08:02:33 -0800 (PST) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Anthony PERARD , Juergen Gross Subject: [OSSTEST PATCH 2/3] create_build_jobs: Enable X86_GENERIC for i386 kernel pvops jobs. Date: Fri, 8 Dec 2023 16:02:25 +0000 Message-Id: <20231208160226.14739-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231208160226.14739-1-anthony.perard@citrix.com> References: <20231208160226.14739-1-anthony.perard@citrix.com> MIME-Version: 1.0 This is following a failure to build "arch/x86/xen/enlighten.c" in build-i386-pvops jobs with linux 968f35f4ab1c ("Merge tag 'v6.7-rc3-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6") in linux-linus branch. Suggested-by: Juergen Gross Signed-off-by: Anthony PERARD --- mfi-common | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mfi-common b/mfi-common index 1a131c27..d8d167fd 100644 --- a/mfi-common +++ b/mfi-common @@ -319,6 +319,11 @@ create_build_jobs () { revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} " ;; + i386) + pvops_kconfig_overrides=" + kconfig_override_y=CONFIG_X86_GENERIC + " + ;; esac case "$arch" in From patchwork Fri Dec 8 16:02:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13485601 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 6B67AC10F05 for ; Fri, 8 Dec 2023 16:02:46 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.650719.1016500 (Exim 4.92) (envelope-from ) id 1rBdJG-00036t-C0; Fri, 08 Dec 2023 16:02:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 650719.1016500; Fri, 08 Dec 2023 16:02:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rBdJG-00036k-8g; Fri, 08 Dec 2023 16:02:38 +0000 Received: by outflank-mailman (input) for mailman id 650719; Fri, 08 Dec 2023 16:02:36 +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 1rBdJE-0002KL-Q1 for xen-devel@lists.xenproject.org; Fri, 08 Dec 2023 16:02:36 +0000 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [2a00:1450:4864:20::330]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3442881a-95e3-11ee-98e8-6d05b1d4d9a1; Fri, 08 Dec 2023 17:02:36 +0100 (CET) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40c2a444311so21202975e9.2 for ; Fri, 08 Dec 2023 08:02:36 -0800 (PST) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id s3-20020a5d69c3000000b00333320cf08bsm2300535wrw.102.2023.12.08.08.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 08:02:34 -0800 (PST) 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: 3442881a-95e3-11ee-98e8-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1702051355; x=1702656155; 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=pSsVO6gcxnExdYHK0SsUQHNQOnlSg2S/CO5a381FM3A=; b=R+AoFSFRuq7slvwbae3niNQh2cKT285JRQ1iC2gemo0Z5SsEJXbQ2W8M/L9UpxWMVo pxFOhpa2Uv+51HyvcsuYvHbECPgrH5X50N0HQKFE6X3mjtiW0pSuyg3IZf5IutM3+tBY S9pRnl/YXQcy0NpM7RLJ7xbuWWxo7xkyvBSKI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702051355; x=1702656155; 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=pSsVO6gcxnExdYHK0SsUQHNQOnlSg2S/CO5a381FM3A=; b=sEDAcyALt/9zS9z2/xcR2SqAbZhXPog6GvHlt3WnUTO8m05fDCX9ULi5XHTbVaOY3g +9b9m/72ZdfRnDn4zfLg+nWMKplOC3/gC/B8Sdnu1apMRwAhztkRRvgcXMu745ZUMo4F Og+E2lhmAKqT+D+CAV4u519/mh8zIz7HTc0ZfZp9cRNY7iM5S+2mFprt8zn0PuX6+x45 xGtfGtcByOzU8Rh5D/6fl0A5hNJ1/INRFgV6MHfgaNAWLd99Z34JwHeDGCyTvCBIflts NMelO+o+CFKQq4v1fyq2uASSQRm0TDp9ohYKw54w2vKRvDchKTrhimRIxQxOe4mVdatB LtYA== X-Gm-Message-State: AOJu0Yx1WNEponJ76QGiR7z2tky9q2VfDr06vPbUfQq4Sk+AHwdFJMpb zfiFO8Vh1a2awSxmYMwbafmURON69vZyE1QDYBg= X-Google-Smtp-Source: AGHT+IHLx86dhJ8ZTjptI1zz7HBOK2kUyJA7NCPvp3MoIQWN5+bUntmMsRNRNoSiTKPZV8uooukTjQ== X-Received: by 2002:a05:600c:1f1a:b0:40b:5f03:b447 with SMTP id bd26-20020a05600c1f1a00b0040b5f03b447mr45827wmb.361.1702051355214; Fri, 08 Dec 2023 08:02:35 -0800 (PST) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Anthony PERARD Subject: [OSSTEST PATCH 3/3] ts-kernel-build: Remove use of $XEN_TARGET_ARCH Date: Fri, 8 Dec 2023 16:02:26 +0000 Message-Id: <20231208160226.14739-4-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231208160226.14739-1-anthony.perard@citrix.com> References: <20231208160226.14739-1-anthony.perard@citrix.com> MIME-Version: 1.0 osstest doesn't set $XEN_TARGET_ARCH, and this is a Xen build variable, not a Linux build one. So, this code have been running with an empty $XEN_TARGET_ARCH for a while which mean none of those `setopt` has run in a while. Signed-off-by: Anthony PERARD --- ts-kernel-build | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/ts-kernel-build b/ts-kernel-build index 719b33aa..05da9a7f 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -607,19 +607,6 @@ setopt CONFIG_AHCI_XGENE y setopt CONFIG_POWER_RESET_XGENE y setopt CONFIG_RTC_DRV_XGENE y -case ${XEN_TARGET_ARCH} in - x86_32) setopt CONFIG_64BIT n ;; - x86_64) - setopt CONFIG_64BIT y - setopt CONFIG_IA32_EMULATION y - setopt CONFIG_IA32_AOUT n - setopt CONFIG_CRYPTO_AES_X86_64 n - setopt CONFIG_CRYPTO_SALSA20_X86_64 n - setopt CONFIG_CRYPTO_TWOFISH_X86_64 n - ;; - *) ;; -esac - # Disable components that don't build setopt CONFIG_TEGRA_HOST1X n