From: Matthias Schiffer Date: Sat, 14 Jul 2018 13:44:47 +0000 (+0200) Subject: include/prereq-build.mk: explicitly check for -f flag when using busybox time X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a7b2764879dbcf7c6b1d5463158c4e51ca993974;p=openwrt%2Fstaging%2F981213.git include/prereq-build.mk: explicitly check for -f flag when using busybox time On Debian, busybox does have a time applet, but it does not support the -f flag. Catch this in prereq check to give users to proper error message. Signed-off-by: Matthias Schiffer (cherry picked from commit b123921a92a957f08abb186e041aa38aa9328f3e) --- diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 72875aef4e..edd63e9ee6 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -138,10 +138,10 @@ $(eval $(call SetupHostCommand,bzip2,Please install 'bzip2', \ $(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \ wget --version | grep GNU)) -$(eval $(call SetupHostCommand,time,Please install GNU 'time' or BusyBox 'time', \ +$(eval $(call SetupHostCommand,time,Please install GNU 'time' or BusyBox 'time' that supports -f, \ gtime --version 2>&1 | grep GNU, \ time --version 2>&1 | grep GNU, \ - busybox time 2>&1 | grep BusyBox)) + busybox time 2>&1 | grep -- '-f FMT')) $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \ perl --version | grep "perl.*v5"))