From patchwork Mon Jan 25 22:33:29 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Darren Salt <linux@youmustbejoking.demon.co.uk>
X-Patchwork-Id: 75124
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id o0PMXdOa023648
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Mon, 25 Jan 2010 22:33:39 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752323Ab0AYWdi (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Mon, 25 Jan 2010 17:33:38 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752140Ab0AYWdi
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Mon, 25 Jan 2010 17:33:38 -0500
Received: from lon1-post-2.mail.demon.net ([195.173.77.149]:57061 "EHLO
	lon1-post-2.mail.demon.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1751572Ab0AYWdh (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Mon, 25 Jan 2010 17:33:37 -0500
Received: from youmustbejoking.demon.co.uk ([80.176.152.238]
	helo=pentagram.youmustbejoking.demon.co.uk)
	by lon1-post-2.mail.demon.net with esmtp (Exim 4.69)
	id 1NZXV2-0000HM-bc; Mon, 25 Jan 2010 22:33:36 +0000
Received: from [192.168.0.5] (helo=localhost.localdomain)
	by pentagram.youmustbejoking.demon.co.uk with esmtp (Exim 4.69)
	(envelope-from <linux@youmustbejoking.demon.co.uk>)
	id 1NZXV2-0003YF-6p; Mon, 25 Jan 2010 22:33:36 +0000
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
To: Johannes Berg <johannes@sipsolutions.net>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 1/3] Tweak version handling to allow vendor-specific
	suffixes without patching. This overrides the "git describe"
	suffix for when the packaging is in git.
Date: Mon, 25 Jan 2010 22:33:29 +0000
Message-Id: 
 <1264458811-21411-1-git-send-email-linux@youmustbejoking.demon.co.uk>
X-Mailer: git-send-email 1.6.5
X-SA-Exim-Connect-IP: 192.168.0.5
X-SA-Exim-Mail-From: linux@youmustbejoking.demon.co.uk
X-SA-Exim-Scanned: No (on pentagram.youmustbejoking.demon.co.uk);
	SAEximRunCond expanded to false
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


diff --git a/Makefile b/Makefile
index 2c5fd9e..770efd1 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,11 @@ VERSION_OBJS := $(filter-out version.o, $(OBJS))
 version.c: version.sh $(patsubst %.o,%.c,$(VERSION_OBJS)) rfkill.h Makefile \
 		$(wildcard .git/index .git/refs/tags)
 	@$(NQ) ' GEN ' $@
+ifeq (,$(VERSION_SUFFIX))
 	$(Q)./version.sh $@
+else
+	$(Q)./version.sh --suffix "$(VERSION_SUFFIX") $@
+endif
 
 %.o: %.c rfkill.h
 	@$(NQ) ' CC  ' $@
diff --git a/version.sh b/version.sh
index 957684b..8984b39 100755
--- a/version.sh
+++ b/version.sh
@@ -1,9 +1,18 @@
 #!/bin/sh
 
 VERSION="0.3"
+
+SUFFIX=
+if test "x$1" = x--suffix; then
+	shift
+	SUFFIX="-$1"
+	shift
+fi
 OUT="$1"
 
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+if test "x$SUFFIX" = ''; then
+	v="$VERSION"
+elif head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	git update-index --refresh --unmerged > /dev/null
 	descr=$(git describe 2>/dev/null || echo "v$VERSION")
 
@@ -17,7 +26,7 @@ if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 		v="$v"-dirty
 	fi
 else
-	v="$VERSION"
+	v="$VERSION$SUFFIX"
 fi
 
 echo "const char rfkill_version[] = \"$v\";" > "$OUT"