[OSSTEST,10/15] ts-kernel-build: Introduce cmd()

Commit Message

Ian Jackson April 26, 2019, 4:39 p.m. UTC

Right now this is a simple wrapper around target_cmd_build.

No functional change.

Signed-off-by: Ian Jackson <[e-mail]>
---
 ts-kernel-build | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

Patch

diff --git a/ts-kernel-build b/ts-kernel-build
index 3dad7d36..72ca98a1 100755
--- a/ts-kernel-build
+++ b/ts-kernel-build
@@ -48,6 +48,11 @@  my $parms = $archparms->{ $r{arch} };
 
 sub enable_xen_config ();
 
+sub cmd ($$) {
+    my ($timeout, $script) = @_;
+    target_cmd_build($ho, $timeout, $builddir, $script);
+}
+
 sub checkout () {
     return if $reuse;
 
@@ -58,7 +63,7 @@  sub checkout () {
     if (length($r{tree_pq_linux})) {
         build_clone($ho, 'pq_linux', $builddir, 'linux/.hg/patches');
         
-        target_cmd_build($ho, 1000, $builddir, <<END);
+        cmd(1000, <<END);
             cd $builddir/linux
             hg qpush -a
 END
@@ -346,7 +351,7 @@  END
 
     my $defconfig = $parms->{DefConfig} ?
 	$parms->{DefConfig}."_defconfig" : "defconfig";
-    target_cmd_build($ho, 1000, $builddir, <<END);
+    cmd(1000, <<END);
         ed <$edscript enable-xen-config
         chmod +x enable-xen-config
         cd linux
@@ -364,7 +369,7 @@  sub config_create_config_sh () {
 
     my $xta = $r{arch} eq "amd64" ? "x86_64" : "x86_32";
 
-    target_cmd_build($ho, 1000, $builddir, <<END);
+    cmd(1000, <<END);
         cd linux
 	sh buildconfigs/create_config.sh .config "-xen" $xta
 	if [ x$xta = xx86_32 ] ; then
@@ -382,7 +387,7 @@  sub config () {
 }
 
 sub build () {
-    target_cmd_build($ho, 9000, $builddir, <<END);
+    cmd(9000, <<END);
 	cd linux
         (make $makeflags all modules 2>&1 && touch ../build-ok-stamp) |tee ../log
         test -f ../build-ok-stamp
@@ -400,7 +405,7 @@  sub kinstall () {
     my $dtbs_install = '';
     $dtbs_install = 'dtbs_install' if $parms->{Dtbs};
 
-    target_cmd_build($ho, 300, $builddir, <<END);
+    cmd(300, <<END);
 	rm -rf dist
 	mkdir -p dist/boot dist/lib/modules
 	cd linux
@@ -421,7 +426,7 @@  END
 
     store_runvar('kernel_ver',$kernver);
 
-    target_cmd_build($ho, 100, $builddir, <<END);
+    cmd(100, <<END);
 	cd dist/boot
 	for f in vmlinuz System.map config; do
 		mv \$f \$f-$kernver
@@ -430,7 +435,7 @@  END
 }
 
 sub fwbuild () {
-    target_cmd_build($ho, 500, $builddir, <<END);
+    cmd(500, <<END);
 	cd linux-firmware
 	make SHELL=/bin/bash all
         echo ok.
@@ -438,7 +443,7 @@  END
 }
 
 sub fwinstall () {
-    target_cmd_build($ho, 500, $builddir, <<END);
+    cmd(500, <<END);
 	cd linux-firmware
 	make SHELL=/bin/bash DESTDIR=$builddir/dist install
 	echo ok.