[openwrt/openwrt] prereq-build: diff requirement to GNU

LEDE Commits lede-commits at lists.infradead.org
Sat Jun 12 19:47:58 PDT 2021


aparcar pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/9bf654ac4742326ddda6656182f5bae00ad3757b

commit 9bf654ac4742326ddda6656182f5bae00ad3757b
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Sat Jun 12 16:02:29 2021 -0700

    prereq-build: diff requirement to GNU
    
    tools/quilt requires GNU diffutils to compile. Failure can be simulated
    by installing Alpine Linux without diffutils.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 include/prereq-build.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 639d1ad0fa..8fbf6f22c4 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -102,9 +102,9 @@ $(eval $(call SetupHostCommand,patch,Please install GNU 'patch', \
 	gpatch --version 2>&1 | grep 'Free Software Foundation', \
 	patch --version 2>&1 | grep 'Free Software Foundation'))
 
-$(eval $(call SetupHostCommand,diff,Please install diffutils, \
-	gdiff --version 2>&1 | grep diff, \
-	diff --version 2>&1 | grep diff))
+$(eval $(call SetupHostCommand,diff,Please install GNU diffutils, \
+	gdiff --version 2>&1 | grep GNU, \
+	diff --version 2>&1 | grep GNU))
 
 $(eval $(call SetupHostCommand,cp,Please install GNU fileutils, \
 	gcp --help 2>&1 | grep 'Copy SOURCE', \



More information about the lede-commits mailing list