From patchwork Thu Mar 31 16:11:38 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 945 Return-Path: Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 9FD121543E6 for ; Thu, 31 Mar 2011 18:11:46 +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 232DF940D0; Thu, 31 Mar 2011 18:11:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1301587904; bh=0Nzgau+zIDKpHmv5N40FoCPHADtt71yuqBSesOX2tXY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=CVZea8/omt4C0cFPkr0Mu10rw4bJ87oZauD1rmM+F9bI8DrUW25Qh8jVf4AaraRCv HxLKFHbEUqr1KgTwN7fp2qiy4KlXGHXzszpyn0Ff3X44VBfLNmMftymZ0gl6AJKcsj Aieq+D4Re1DJZV/w1b+A/m8CQ+spwPk4Rh2Y9UIA= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Thu, 31 Mar 2011 18:11:38 +0200 Message-Id: <1301587899-9449-2-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] batman-adv: 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:46 -0000 The current version of batman-adv 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 830c53b..84828ea 100644 --- a/Makefile +++ b/Makefile @@ -29,24 +29,8 @@ endif export KERNELPATH -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) NUM_CPUS = $(shell nproc 2> /dev/null || echo 1)