diff mbox

[Xen-devel,OSSTEST,v2,3/4] Use ts-kernel-build for build-*-oldkern

Message ID 1395330988-4613-3-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell March 20, 2014, 3:56 p.m. UTC 
instead of using the kernel build integration in xen.git, which is going away.

There is no difference to the .config produced. No test jobs seem to rely on
these kernels so I have not worried about making the contents of dist be
identical (specifically the filenames under /boot have lost their -xen suffix)

Remove the now unused xen and qemu(u) tree/revision stuff from the jobs'
runvars. Add the appropriate kconfighow and kimagefile runvars and implement
an appropriate kconfighow handler to use the create_config.sh present in this
tree (the xen.git intergration called the same script)

If the 2.6.18 build starts to fail, xen-unstable pushes will be broken
until they are fixed, as before.  Previously such a build failure might be due
to changes in xen.git so that was slightly justifiable.  But in practice this
is quite rare.  This situation, while anomalous, is tolerable.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: stole some of your words for the commit message, I hope I am grasping the
correct end of the stick.
---
 mfi-common      | 12 +++---------
 ts-kernel-build | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 9 deletions(-)

Comments

Ian Jackson March 20, 2014, 4:01 p.m. UTC | #1 
Ian Campbell writes ("[PATCH OSSTEST v2 3/4] Use ts-kernel-build for build-*-oldkern"):
> v2: stole some of your words for the commit message, I hope I am grasping the
> correct end of the stick.

Yes.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
diff mbox

Patch

diff --git a/mfi-common b/mfi-common
index df7f8b0..2fff802 100644
--- a/mfi-common
+++ b/mfi-common
@@ -167,18 +167,12 @@  create_build_jobs () {
 
     if [ "x$REVISION_LINUX_OLD" != xdisable ]; then
 
-      ./cs-job-create $flight build-$arch-oldkern build                 \
-                arch=$arch                                              \
-        tree_qemu=$TREE_QEMU                                            \
-        tree_qemuu=$TREE_QEMU_UPSTREAM                                  \
-        tree_xen=$TREE_XEN                                              \
+      ./cs-job-create $flight build-$arch-oldkern build-kern            \
+                arch=$arch kconfighow=create-config-sh                  \
+                kimagefile=vmlinux                                      \
                 $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_OLD_RUNVARS        \
                 $arch_runvars $suite_runvars                            \
                 host_hostflags=$build_hostflags                         \
-                xen_kernels=linux-2.6-xen                               \
-                revision_xen=$REVISION_XEN                              \
-                revision_qemu=$REVISION_QEMU                            \
-                revision_qemuu=$REVISION_QEMU_UPSTREAM                  \
         tree_linux=http://xenbits.xen.org/linux-2.6.18-xen.hg           \
         revision_linux=$REVISION_LINUX_OLD
 
diff --git a/ts-kernel-build b/ts-kernel-build
index df31709..8618709 100755
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -265,6 +265,22 @@  END
     # /;
 }
 
+sub config_create_config_sh () {
+    die "only x86" unless $r{arch} =~ m/^amd64|i386$/;
+
+    my $xta = $r{arch} eq "amd64" ? "x86_64" : "x86_32";
+
+    target_cmd_build($ho, 1000, $builddir, <<END);
+        cd linux
+	sh buildconfigs/create_config.sh .config "-xen" $xta
+	if [ x$xta = xx86_32 ] ; then
+            sed -i.bak -e 's!^CONFIG_HIGHMEM4G=y\$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set\$!CONFIG_HIGHMEM64G=y!' .config
+	fi
+        yes '' | make oldconfig
+END
+    # /;
+}
+
 sub config () {
     my $confighow= $r{kconfighow};
     $confighow =~ s/\W/_/g;