From 87a4e713d25596991913cfe52032370fec2841af Mon Sep 17 00:00:00 2001 From: Grant Erickson Date: Mon, 30 Apr 2018 09:04:31 -0700 Subject: [PATCH] [build] Update to nlbuild-autotools 1.5.2 to Address git Compatibility Issues (#2689) Update to reflect upstream repository 'https://github.com:nestlabs/nlbuild-autotools' at tag '1.5.2'. --- third_party/nlbuild-autotools/repo/.default-version | 2 +- third_party/nlbuild-autotools/repo/CHANGES | 5 +++++ third_party/nlbuild-autotools/repo/make/pre/macros/git.mak | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/third_party/nlbuild-autotools/repo/.default-version b/third_party/nlbuild-autotools/repo/.default-version index 26ca59460..4cda8f19e 100644 --- a/third_party/nlbuild-autotools/repo/.default-version +++ b/third_party/nlbuild-autotools/repo/.default-version @@ -1 +1 @@ -1.5.1 +1.5.2 diff --git a/third_party/nlbuild-autotools/repo/CHANGES b/third_party/nlbuild-autotools/repo/CHANGES index fa589611d..39e1394e4 100644 --- a/third_party/nlbuild-autotools/repo/CHANGES +++ b/third_party/nlbuild-autotools/repo/CHANGES @@ -1,3 +1,8 @@ +1.5.2 (2018-04-26) + + * Since the '--name-only' option only appears in git-2.6 and later + and there are production systems using git version as old as + git-1.9, do not use '--name-only' when processing 'repos.conf'. 1.5.1 (2018-04-20) diff --git a/third_party/nlbuild-autotools/repo/make/pre/macros/git.mak b/third_party/nlbuild-autotools/repo/make/pre/macros/git.mak index 145e01125..3d810269e 100644 --- a/third_party/nlbuild-autotools/repo/make/pre/macros/git.mak +++ b/third_party/nlbuild-autotools/repo/make/pre/macros/git.mak @@ -30,7 +30,7 @@ nlGitGetConfigFromFileCommand = $(GIT) config --file $(1) # # Command to list all variables set in the specified config file -nlGitListConfigFromFileCommand = $(call nlGitGetConfigFromFileCommand,$(1)) --list --name-only +nlGitListConfigFromFileCommand = $(call nlGitGetConfigFromFileCommand,$(1)) --list # nlGitGetConfigFromFile # @@ -38,7 +38,7 @@ nlGitListConfigFromFileCommand = $(call nlGitGetConfigFromFileCommand,$(1 nlGitGetConfigFromFile = $(shell $(call nlGitGetConfigFromFileCommand,$(1))) -# NlGitListConfigFromFile +# nlGitListConfigFromFile # # List all variables set in the specified config file