linux-kernel - [PATCH] setlocalversion: fix error detectition of kernel git repository

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Sat, 21 Jan 2017 07:23:57 +0800
From:   xufeng <xufwang@....com>
To:     linux-kbuild@...r.kernel.org
Cc:     linux-kernel@...r.kernel.org,
        nico-linuxsetlocalversion@...ottelius.org, wsa@...-dreams.de
Subject: [PATCH] setlocalversion: fix error detectition of kernel git
 repository

This patch fixed the error using 'git rev-parse --show-cdup' to check
that git is used as SCM to track the current directory. The return
value of this command is not null string when the .git directory is
not in kernel topdir.

Signed-off-by: Xufeng Wang <xufwang@....com>
---
 scripts/setlocalversion | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 966dd39..7966e39 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -43,7 +43,7 @@ scm_version()
     fi
 
     # Check for git and a git repo.
-    if test -z "$(git rev-parse --show-cdup 2>/dev/null)" &&
+    if test -z "$(git rev-parse --show-cdup &>/dev/null)" &&
        head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
 
         # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore
-- 
2.9.3