From patchwork Thu Mar 31 16:11:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 931 Return-Path: Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 66366154433 for ; Thu, 31 Mar 2011 18:11:49 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@narfation.org; dkim-adsp=pass Received: from sven-desktop.home.narfation.org (i59F6B6DC.versanet.de [89.246.182.220]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id C5053940CF; Thu, 31 Mar 2011 18:11:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1301587907; bh=J0n0veb/Z6ecfOXrFAYMQRpIQcJhVK7lJHiWeNLUGxI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=CSRrrBDCLWs7xFa6LaDEVAL2i8pSYsbv+7a755ygxKqUfTA/lhEEWQlKXmxf3Jefq boXeS2OIvFq67ShRwOU6YRNgxDUL0lKH1CnRxAgxjG6xy1J6HAI+Os81G51gbSYJgN G1z6BmpBsO1w6FNDQsN/Rdn1zb25S03DuvlNoTu4= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 31 Mar 2011 18:11:39 +0200 Message-Id: <1301587899-9449-3-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1301587899-9449-1-git-send-email-sven@narfation.org> References: <1301587899-9449-1-git-send-email-sven@narfation.org> Subject: [B.A.T.M.A.N.] [PATCH 2/2] batctl: Remove subversion/svk revision information X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Mar 2011 16:11:57 -0000 The current version of batctl cannot be obtained from subversion or svk anymore. It is unnecessary to provide the functionality to retrieve the current revision using these tools. We only have to differenciate between git checkout and official release. We cannot detect a git snapshot and thus the distribution has to provide the REVISION variable for snapshots. Signed-off-by: Sven Eckelmann --- Makefile | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index b5b4e2b..217a00a 100644 --- a/Makefile +++ b/Makefile @@ -47,24 +47,8 @@ PACKAGE_NAME = batctl BINARY_NAME = batctl SOURCE_VERSION_HEADER = main.h -REVISION= $(shell if [ -d .svn ]; then \ - if which svn > /dev/null; then \ - echo rv$$(svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'); \ - else \ - echo "[unknown]"; \ - fi; \ - elif [ -d .git ]; then \ - if which git > /dev/null; then \ - echo $$(git describe --always --dirty 2> /dev/null); \ - else \ - echo "[unknown]"; \ - fi; \ - elif [ -d ~/.svk ]; then \ - if which svk > /dev/null; then \ - echo rv$$(svk info | grep "Mirrored From" | awk '{print $$5}'); \ - else \ - echo "[unknown]"; \ - fi; \ +REVISION= $(shell if [ -d .git ]; then \ + echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \ fi) REVISION_VERSION =\"\ $(REVISION)\"