Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
0x4A6F
FFS Gluon
Commits
f5876dda
Unverified
Commit
f5876dda
authored
7 years ago
by
Matthias Schiffer
Browse files
Options
Downloads
Patches
Plain Diff
prereq: backport changes to git detection to work with newer Git versions
parent
58b83930
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
patches/openwrt/0120-prereq-backport-changes-to-git-detection-to-work-with-newer-Git-versions.patch
+19
-0
19 additions, 0 deletions
...es-to-git-detection-to-work-with-newer-Git-versions.patch
with
19 additions
and
0 deletions
patches/openwrt/0120-prereq-backport-changes-to-git-detection-to-work-with-newer-Git-versions.patch
0 → 100644
+
19
−
0
View file @
f5876dda
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 30 Jul 2017 21:03:05 +0200
Subject: prereq: backport changes to git detection to work with newer Git versions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index f36d57ce06c46be7ac33f3034ad08a3ce603089d..dbc273bcfe25f5ed6e24678462c0496e4c27ec31 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -144,8 +144,8 @@
$(eval $(call SetupHostCommand,python,Please install Python 2.x, \
$(eval $(call SetupHostCommand,svn,Please install the Subversion client, \
svn --version | grep Subversion))
-$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.6.5, \
- git clone 2>&1 | grep -- --recursive))
+$(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \
+ git --exec-path | xargs -I % -- grep -q -- --recursive %/git-submodule))
$(eval $(call SetupHostCommand,file,Please install the 'file' package, \
file --version 2>&1 | grep file))
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment