From b5d8b2d199f1d53a38d127215d290ab0bb42c3f9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Apr 2019 23:05:25 +0200 Subject: [PATCH] fix version extraction when building in a larger git tree sslh uses host git to extract its own version number. In buildroot, this is an issue since extracted information is conflicting with buildroot git status if we use git as VCS for buildroot. Since these git calls are legitimate only if git is used for the sslh subtree only, this patch adds a check : a .git directory has to exist at the root of the project to enable git-extracted version string. Signed-off-by: David Bachelart [yann.morin.1998@free.fr: fix troll character U+c2a0] Signed-off-by: "Yann E. MORIN" [Retrieved from: https://git.buildroot.net/buildroot/tree/package/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch] Signed-off-by: Fabrice Fontaine --- genver.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/genver.sh b/genver.sh index 79fd0a0..5eec682 100755 --- a/genver.sh +++ b/genver.sh @@ -7,7 +7,7 @@ else QUIET=0 fi -if ! `(git status | grep -q "On branch") 2> /dev/null`; then +if [ ! -d .git ] || ! `(git status | grep -q "On branch") 2> /dev/null`; then # If we don't have git, we can't work out what # version this is. It must have been downloaded as a # zip file. @@ -25,7 +25,7 @@ if ! `(git status | grep -q "On branch") 2> /dev/null`; then fi fi -if head=`git rev-parse --verify HEAD 2>/dev/null`; then +if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then # generate the version info based on the tag release=`(git describe --tags || git --describe || git describe --all --long) \ 2>/dev/null | tr -d '\n'`