[OSSTEST PATCH 07/26] rumprun: ts-rumprun-build: Remove $bodges

[Ian Jackson <ian.jackson@eu.citrix.com>]

This is very obsolete.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
---
 ap-common        |  5 -----
 ts-rumprun-build | 46 +---------------------------------------------
 2 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/ap-common b/ap-common
index 212da18..62d2e4f 100644
--- a/ap-common
+++ b/ap-common
@@ -42,11 +42,6 @@
 : ${BASE_TREE_RUMPRUN:=git://xenbits.xen.org/osstest/rumprun.git}
 : ${PUSH_TREE_RUMPRUN:=$XENBITS:/home/xen/git/osstest/rumprun.git}
 
-: ${TREE_RUMPRUN_RUMPSRC:=$(besteffort_repo https://github.com/rumpkernel/rumpkernel-netbsd-src)}
-: ${TREEVCS_RUMPRUN_RUMPSRC:=git}
-# rumpsrc-related runvars needed only for old rumpuser-xen
-# (ie ones which need $bodges=1 in ts-rumprun-build)
-
 : ${TREE_SEABIOS_UPSTREAM:=git://git.seabios.org/seabios.git}
 : ${PUSH_TREE_SEABIOS:=$XENBITS:/home/xen/git/osstest/seabios.git}
 : ${BASE_TREE_SEABIOS:=git://xenbits.xen.org/osstest/seabios.git}
diff --git a/ts-rumprun-build b/ts-rumprun-build
index abc1f7d..55420f0 100755
--- a/ts-rumprun-build
+++ b/ts-rumprun-build
@@ -28,7 +28,7 @@ builddirsprops();
 our %submodmap = qw(buildrump.sh buildrumpsh
                     src-netbsd netbsdsrc);
 
-our ($rux, $bodges);
+our ($rux);
 
 sub checkout () {
     prepbuilddirs();
@@ -38,53 +38,9 @@ sub checkout () {
     my $submodules =
 	submodulefixup($ho, 'rumprun', 'rumprun', \%submodmap);
     $rux = "$builddir/rumprun";
-
-    $bodges = submodule_have($submodules,'nblibs')
-	  && !submodule_have($submodules,'netbsdsrc');
-
-    if ($bodges) {
-	my $rumpsrcgitrevr = "$rux/buildrump.sh/.srcgitrev";
-	my $rumpsrcgitrevl = "buildrump-srcgitrev";
-	my $rev = $r{revision_rumprun_rumpsrc};
-	if (length $rev) {
-	    target_putfilecontents_stash($ho,30,
-					 "$r{revision_rumprun_rumpsrc}\n",
-					 $rumpsrcgitrevr, $rumpsrcgitrevl);
-	} else {
-	    target_getfile($ho,30,$rumpsrcgitrevr,"$stash/$rumpsrcgitrevl");
-	    $rev = get_filecontents("$stash/$rumpsrcgitrevl");
-	    chomp $rev or die;
-	    $rev =~ m/^[0-9a-f]+$/ or die;
-	    store_runvar('revision_rumprun_rumpsrc', $rev);
-	}
-
-	build_clone($ho, "rumprun_rumpsrc", $builddir,
-		    "rumprun/rumpsrc");
-	store_vcs_revision('rumprun_rumpsrc', $rev, 'git');
-    }
 }
 
 sub massage() {
-    return unless $bodges;
-
-    # Very poor
-    target_editfile($ho, "$rux/buildxen.sh", undef,
-		    "$rux/grievous-bodge-nblibs", sub {
-        while (<EI>) {
-	    next unless m/^\Qif [ ! -d rumpsrc ]; then\E/..m/^fi/;
-	    next unless m/cp -Rp nblibs/;
-	    print EO or die $!;
-	}
-    });
-    target_cmd_build($ho, 2000, $rux, "bash -x grievous-bodge-nblibs");
-
-    # Rather poor
-    target_editfile($ho, "$rux/Config.mk", sub {
-        while (<EI>) {
-	    s/^XEN_HEADERS=/XEN_HEADERS?=/;
-	    print EO or die $!;
-	}
-    });
 }
 
 sub build() {
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel