]> xenbits.xensource.com Git - people/aperard/osstest.git/commitdiff
create_build_jobs: Set reset pvops_kconfig_overrides
authorAnthony PERARD <anthony.perard@citrix.com>
Mon, 4 Dec 2023 16:46:08 +0000 (16:46 +0000)
committerAnthony PERARD <anthony.perard@citrix.com>
Wed, 13 Dec 2023 12:02:09 +0000 (12:02 +0000)
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>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
mfi-common

index 51eb4a9c23f2eae12d5a8f65d12d8092a311484d..1a131c27a534e3206a41a4a16b6093f6d465a6e2 100644 (file)
@@ -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