From adaded2eaa6957de818510dd7aabd32bbbf1b6ed Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Wed, 1 Jul 2009 19:02:53 -0700
Subject: [PATCH] Help identify stable compat-wireless releases

admin-update.sh script now knows to distinguish between
regular bleeding edge compat-wireless releass and stable
compat-wireless releases.

We also update the gen compat autconf script accordingly.

Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 scripts/admin-update.sh        | 46 ++++++++++++++++++++++++++--------
 scripts/gen-compat-autoconf.sh |  4 +--
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index aab866e99b09..b3a4cd8e742e 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -45,7 +45,7 @@ if [ -z $GIT_TREE ]; then
 		exit 1
 	fi
 else
-	echo "You said your wireless-testing git tree is: $GIT_TREE"
+	echo "You said to use git tree at: $GIT_TREE"
 fi
 # Drivers that have their own directory
 DRIVERS="drivers/net/wireless/ath"
@@ -171,16 +171,40 @@ if [[ $RET -ne 0 ]]; then
 	exit $RET
 fi
 DIR="$PWD"
-cd $GIT_TREE && git describe > $DIR/git-describe && cd $DIR
-echo "Updated from ${GIT_TREE}, git-describe says:"
-cat git-describe
+cd $GIT_TREE
+GIT_DESCRIBE=$(git describe)
+echo "Updated from local tree: ${GIT_TREE}"
+echo "Origin remote URL: $(git config remote.origin.url)"
+cd $DIR
 if [ -d ./.git ]; then
 	git describe > compat-release
-	cd $GIT_TREE && git tag -l| grep master | tail -1 > $DIR/master-tag && cd $DIR
-	if [ -f master-tag ]; then
-		echo "wireless-testing latest tag:"
-		cat master-tag
-	fi
+
+	cd $GIT_TREE
+	TREE_NAME=$(git config remote.origin.url)
+	TREE_NAME=${TREE_NAME##*/}
+
+	echo $TREE_NAME > $DIR/git-describe
+	echo $GIT_DESCRIBE >> $DIR/git-describe
+
+	echo "git-describe for $TREE_NAME says: $GIT_DESCRIBE"
+
+	rm -f $DIR/master-tag
+	case $TREE_NAME in
+	"wireless-testing.git") # John's wireless-testing
+		MASTER_TAG=$(git tag -l| grep master | tail -1)
+		echo $MASTER_TAG > $DIR/master-tag
+		echo "This is a bleeding edge compat-wireless release based on: $MASTER_TAG"
+		;;
+	"linux-2.6-allstable.git") # HPA's all stable tree
+		echo "This is a stable compat-wireless release based on: $(git describe --abbrev=0)"
+		;;
+	"linux-2.6.git") # Linus' 2.6 tree
+		;;
+	*)
+		;;
+	esac
+
+	cd $DIR
 fi
-echo "This is compat-release:"
-cat compat-release
+
+echo "This is compat-release: $(cat compat-release)"
diff --git a/scripts/gen-compat-autoconf.sh b/scripts/gen-compat-autoconf.sh
index 3ddf8df78d3e..194064946c89 100755
--- a/scripts/gen-compat-autoconf.sh
+++ b/scripts/gen-compat-autoconf.sh
@@ -33,8 +33,8 @@ if [ ! -f $COMPAT_RELEASE  -o ! -f $KERNEL_RELEASE ]; then
 	exit
 fi
 
-CREL=$(cat $COMPAT_RELEASE)
-KREL=$(cat $KERNEL_RELEASE)
+CREL=$(cat $COMPAT_RELEASE | tail -1)
+KREL=$(cat $KERNEL_RELEASE | tail -1)
 DATE=$(date)
 
 # Defines a CONFIG_ option if not defined yet, this helps respect
-- 
2.30.2