diff mbox series

[OSSTEST,1/3] create_build_jobs: Set reset pvops_kconfig_overrides

Message ID 20231208160226.14739-2-anthony.perard@citrix.com (mailing list archive)
State New, archived
Headers show
Series Set CONFIG_X86_GENERIC=y for i386 kernel build | expand

Commit Message

Anthony PERARD Dec. 8, 2023, 4:02 p.m. UTC 
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 <anthony.perard@citrix.com>
---
 mfi-common | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
diff mbox series

Patch

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