diff mbox

[Xen-devel,OSSTEST,4/4] ts-xen-build: Drop ability to build kernels

Message ID 1395229675-13658-4-git-send-email-ian.campbell@citrix.com
State New
Headers show

Commit Message

Ian Campbell March 19, 2014, 11:47 a.m. UTC 
These are now all handled by ts-kernel-build.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 ts-xen-build | 59 +++++------------------------------------------------------
 1 file changed, 5 insertions(+), 54 deletions(-)

Comments

Ian Jackson March 19, 2014, 12:15 p.m. UTC | #1 
Ian Campbell writes ("[PATCH OSSTEST 4/4] ts-xen-build: Drop ability to build kernels"):
> These are now all handled by ts-kernel-build.
...
> -               (nonempty($kerns) ? <<END : <<END)
> -	echo >>.config KERNELS='$kerns'
> -END
> -	echo >>.config KERNELS=''
> -END

You need to at least set KERNELS=''.  We do sometimes still build very
old xens which try to build a kernel by default.

Ian.
Ian Campbell March 19, 2014, 12:27 p.m. UTC | #2 
On Wed, 2014-03-19 at 12:15 +0000, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST 4/4] ts-xen-build: Drop ability to build kernels"):
> > These are now all handled by ts-kernel-build.
> ...
> > -               (nonempty($kerns) ? <<END : <<END)
> > -	echo >>.config KERNELS='$kerns'
> > -END
> > -	echo >>.config KERNELS=''
> > -END
> 
> You need to at least set KERNELS=''.  We do sometimes still build very
> old xens which try to build a kernel by default.

Good point. Will do.

Ian.
diff mbox

Patch

diff --git a/ts-xen-build b/ts-xen-build
index 7bc7cbc..190e5ec 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -35,21 +35,10 @@  my $builddir= "$homedir/$leaf";
 my $makeflags= get_host_property($ho, 'build make flags', '-j4');
     
 sub checkout () {
-    my $kerns= $r{xen_kernels};
-    $kerns='' unless defined $kerns;
-    $kerns =~ s/,/ /g;
-
     target_cmd($ho, "rm -rf $builddir && mkdir $builddir", 60);
 
     build_clone($ho, 'xen', $builddir, 'xen-unstable');
 
-    my $linux_url_envvar= 'XEN_LINUX_GIT_URL';
-    my $linux_rev_envvar= 'XEN_LINUX_GITREV';
-    if (defined $r{tree_linux} && $r{tree_linux} =~ m/\.hg$/) {
-        $linux_url_envvar= 'XEN_LINUX_HGREPO';
-        $linux_rev_envvar= 'XEN_LINUX_HGREV';
-    }
-
     my $debug_build = $r{xen_build_debug} || 'y';
 
     # Do not set this unless you know what you are doing. This arm
@@ -83,20 +72,9 @@  END
                (nonempty($earlyprintk) ? <<END : '').
 	echo >>.config CONFIG_EARLY_PRINTK=$earlyprintk
 END
-               (nonempty($r{tree_linux}) ? <<END : '').
-	echo >>.config export $linux_url_envvar='$r{tree_linux}'
-END
-               (nonempty($r{revision_linux}) ? <<END : '').
-	echo >>.config export $linux_rev_envvar='$r{revision_linux}'
-END
-               ($ho->{Suite} =~ m/squeeze|wheezy/ ? <<END : ''). #Debian #693721
+               ($ho->{Suite} =~ m/squeeze|wheezy/ ? <<END : '') #Debian #693721
 	echo >>.config PYTHON_PREFIX_ARG=
 END
-               (nonempty($kerns) ? <<END : <<END)
-	echo >>.config KERNELS='$kerns'
-END
-	echo >>.config KERNELS=''
-END
                );
 }
 
@@ -155,50 +133,24 @@  sub collectversion_qemu () {
     store_revision($ho, 'seabios', "$tools/seabios-dir", 1);
 }
 
-sub collectversions_kernel () {
-    my $whichkerns= target_cmd_output($ho, <<END);
-        set -e
-        cd $builddir/xen-unstable
-        echo linux*/.{git,hg}
-END
-    my (@kerndirs,@vcss,@revisions);
-    foreach my $kerndir (sort split / /, $whichkerns) {
-        next if $kerndir =~ m/\*/;
-        die "$kerndir ?" unless $kerndir =~ m/^linux.*\.(git|hg)$/;
-        my $vcs= $1;
-        push @kerndirs, $kerndir;
-        push @vcss, $vcs;
-        push @revisions,
-            vcs_dir_revision($ho,"$builddir/xen-unstable/$kerndir", $vcs);
-    }
-    if (@revisions) {
-	store_vcs_revision('linux',"@revisions","@vcss");
-	store_runvar('built_xen_kerneldirs',"@kerndirs");
-    }
-}
-
 sub divide () {
     target_cmd_build($ho, 100, $builddir, <<END);
         cd xen-unstable/dist
-        mkdir kerninstall xeninstall
+        mkdir xeninstall
 	for f in *install; do
 	    mkdir -p \$f/lib
 	done
         if test -d install/boot; then
-            mv install/boot kerninstall/.
-            if test -d install/lib/modules; then
-                mv install/lib/modules kerninstall/lib/.
-            fi
-            if test -f kerninstall/boot/xen.gz || test -f kerninstall/boot/xen; then
+            if test -f install/boot/xen.gz || test -f install/boot/xen; then
                 mkdir xeninstall/boot
-                mv kerninstall/boot/xen* xeninstall/boot/.
+                mv install/boot/xen* xeninstall/boot/.
             fi
         fi
 END
 }
 
 sub stash () {
-    foreach my $part ('', 'kern', 'xen') {
+    foreach my $part ('', 'xen') {
         built_stash($ho, $builddir,
                     "xen-unstable/dist/${part}install",
                     "${part}dist");
@@ -243,7 +195,6 @@  checkout();
 
 trapping(\&build);
 trapping(\&collectversion_qemu);
-trapping(\&collectversions_kernel);
 
 die "*** something failed:\n\n".(join "\n\n",@probs)."\n** something failed"
     if @probs;