From: Anthony PERARD <anthony.perard@citrix.com>
Date: Mon, 4 Dec 2023 16:46:24 +0000 (+0000)
Subject: create_build_jobs: Enable X86_GENERIC for i386 kernel pvops jobs.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6b5290760ef6ebe2fc33ff04b18d7a6d115eb41c;p=osstest.git

create_build_jobs: Enable X86_GENERIC for i386 kernel pvops jobs.

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.

Today the cpu type for a 32-bit x86 kernel is not specified in the
used kernel config, resulting in the M686 to be used.

Instead of using the M686 which isn't even a 64-bit cpu (thus not
capable to run a Xen guest), use the X86_GENERIC variant which is
more appropriate.

Suggested-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
---

diff --git a/mfi-common b/mfi-common
index 1a131c2..d8d167f 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