[PATCH OSSTEST] ts-kernel-build: override kernel config from runvars

[PATCH OSSTEST] ts-kernel-build: override kernel config from runvars

[Ian Campbell]

Use this to build EXT4 into the kernel statically for armhf build to work
around the lack of guest initrd support on ARM at the moment.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
When we branch for xen 4.4 we should make this apply to 4.3 and 4.4 only, so
that when we test unstable from that point on we are reminded of the lack of
initrd support...
---
 make-flight     |  5 ++++-
 ts-kernel-build | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/make-flight b/make-flight
index a13b38e..fea642c 100755
--- a/make-flight
+++ b/make-flight
@@ -61,6 +61,9 @@ if [ x$buildflight = x ]; then
 	tree_linux=$TREE_LINUX_ARM
 	revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
       "
+      pvops_kconfig_overrides="
+        kconfig_override_y=CONFIG_EXT4_FS
+      "
       ;;
     *)
       case "$branch" in
@@ -151,7 +154,7 @@ if [ x$buildflight = x ]; then
 		host_hostflags=$build_hostflags    \
 		xen_kernels=linux-2.6-pvops				     \
 		revision_xen=$REVISION_XEN				     \
-		$pvops_kernel						\
+		$pvops_kernel $pvops_kconfig_overrides			     \
 		${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX}	\
 		tree_linuxfirmware=$TREE_LINUXFIRMWARE			     \
 		revision_linuxfirmware=$REVISION_LINUXFIRMWARE
diff --git a/ts-kernel-build b/ts-kernel-build
index 478d912..96f6b74 100755
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -203,7 +203,21 @@ END
     return $edscript;
 }
 
+sub kconfig_overrides ($) {
+    my ($to) = @_;
+    return '' unless $r{"kconfig_override_$to"};
+    my $overrides = '';
+    foreach my $override (split /,/, $r{"kconfig_override_$to"}) {
+        $overrides .= "setopt $override $to\n";
+    }
+    return $overrides;
+}
+
 sub config_xen_enable_xen_config () {
+    my $config_runvars = kconfig_overrides('y');
+    $config_runvars .= kconfig_overrides('m');
+    $config_runvars .= kconfig_overrides('n');
+
     my $edscript= stash_config_edscript(<<END);
 
 setopt CONFIG_HIGHMEM64G y
@@ -228,6 +242,7 @@ setopt CONFIG_HYPERVISOR_GUEST y
 
 $config_hardware
 $config_features
+$config_runvars
 END
 
     target_cmd_build($ho, 1000, $builddir, <<END);
-- 
1.8.5.2