From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <ian.jackson@eu.citrix.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH 2/3] osstest: set the make command to use for xen-build
Date: Mon, 2 Jul 2018 10:41:01 +0200 [thread overview]
Message-ID: <20180702084102.90577-3-roger.pau@citrix.com> (raw)
In-Reply-To: <20180702084102.90577-1-roger.pau@citrix.com>
The default make on FreeBSD is the BSD make, and Xen requires the GNU
make in order to build. Set the make command based on the OS for the
Xen build.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
ts-xen-build | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/ts-xen-build b/ts-xen-build
index 57913d4f..57a6157a 100755
--- a/ts-xen-build
+++ b/ts-xen-build
@@ -28,6 +28,7 @@ tsreadconfig();
selectbuildhost(\@ARGV);
our $dokconfig = 1;
+our $make = $ho->{OS} eq "freebsd" ? "gmake" : "make";
while (@ARGV && $ARGV[0] =~ m/^-/) {
$_ = shift @ARGV;
@@ -156,24 +157,24 @@ END
buildcmd_stamped_logged(600, 'xen', 'kconfig', '',<<END,'') if $dokconfig;
if test -f xen/Kconfig; then
- $make_prefix make -C xen olddefconfig
+ $make_prefix $make -C xen olddefconfig
fi
END
if (!@make_args) {
buildcmd_stamped_logged(9000, 'xen', 'build', '',<<END,'');
- $make_prefix make $makeflags build
+ $make_prefix $make $makeflags build
END
}
buildcmd_stamped_logged(9000, 'xen', 'all', '',<<END,'');
- $make_prefix make $makeflags @make_args
+ $make_prefix $make $makeflags @make_args
END
if ($enable_xsm) {
my $xen_version = target_cmd_output($ho, <<END, 30);
cd $builddir/xen
- $make_prefix make xenversion
+ $make_prefix $make xenversion
END
store_runvar("flaskpolicy", "xenpolicy-" . $xen_version);
}
@@ -181,7 +182,7 @@ END
if ($enable_livepatch) {
substep_eval('/dist-test', sub {
buildcmd_stamped_logged(600, 'xen', 'xenlpt', '',<<END,'');
- $make_prefix make $makeflags dist-tests
+ $make_prefix $make $makeflags dist-tests
END
});
}
--
2.17.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2018-07-02 8:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-02 8:40 [PATCH 0/3] osstest: initial support for building Xen on FreeBSD Roger Pau Monne
2018-07-02 8:41 ` [PATCH 1/3] osstest: remove duplicate set_freebsd_runvars Roger Pau Monne
2018-07-03 15:10 ` Ian Jackson
2018-07-03 15:50 ` Roger Pau Monné
2018-07-03 16:53 ` Ian Jackson
2018-07-04 7:50 ` Roger Pau Monné
2018-07-02 8:41 ` Roger Pau Monne [this message]
2018-07-03 15:12 ` [PATCH 2/3] osstest: set the make command to use for xen-build Ian Jackson
2018-07-03 15:51 ` Roger Pau Monné
2018-07-03 16:54 ` Ian Jackson
2018-07-02 8:41 ` [PATCH 3/3] osstest: add FreeBSD Xen build job Roger Pau Monne
2018-07-03 15:22 ` Ian Jackson
2018-07-03 16:10 ` Roger Pau Monné
2018-07-03 16:56 ` Ian Jackson
2018-07-04 7:57 ` Roger Pau Monné
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180702084102.90577-3-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.