compat-wireless: remove master-tag file

The master-tag file was used to describe from where we pulled
code from when wireless-testing was used instead of linux-next.git.
It turns out the way this was being done could lead to incorrect
descriptions given that the master-tag file was generated by
looking at all the git tags present and using the latest master
tag. The assumption is that your tree would not have any newer
master tags. Turns out that we can use git describe to extract
correctly the proper master tag, at least now this seems to work
well on wireless-testing. Even if it does not work the git describe
tag is a better representation and would lead to less mistakes.

Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>

diff --git a/.gitignore b/.gitignore
index b615253b56d1b48db9416c681a158be46feada7e..881d0b4c3919fa2e755f0affd4a8fd8c66a9bd9b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,6 @@ udev
 *~
 git-describe
 compat-release
-master-tag
 Module.symvers
 module.order
 .pc

diff --git a/scripts/admin-clean.sh b/scripts/admin-clean.sh
index 4f8c4d1d52c3a74d3da8436a0b060f4f2968bdad..340a19717fa53b23014b7fd337f6ab1460462703 100755 (executable)
--- a/scripts/admin-clean.sh
+++ b/scripts/admin-clean.sh
@@ -7,7 +7,6 @@ rm -rf drivers
 rm -rf include
 rm -rf compat
 rm -rf udev
-rm -f master-tag
 rm -f .compat_base_tree
 rm -f .compat_base_tree_version
 rm -f .compat_version

diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index ff4aa9ce2ed2d6bca9aa4a25defadfa68d1dc2c0..7e095b42b1b42927efae6c0b2f293d163c3f571e 100755 (executable)
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -615,17 +615,9 @@ if [ -d ./.git ]; then
 
        case $TREE_NAME in
        "wireless-testing.git") # John's wireless-testing
-               # We override the .compat_base_tree_version for wireless-testing
-               # as john keeps the Linus' tags and does not write a tag for his
-               # tree himself so git describe would yield a v2.6.3x.y-etc but
-               # what is more useful is just the wireless-testing master tag
-               MASTER_TAG=$(git tag -l| grep master | tail -1)
-               echo $MASTER_TAG > $DIR/.compat_base_tree_version
                echo -e "This is a ${RED}wireless-testing.git${NORMAL} compat-wireless release"
                ;;
        "linux-next.git") # The linux-next integration testing tree
-               MASTER_TAG=$(git tag -l| grep next | tail -1)
-               echo $MASTER_TAG > $DIR/master-tag
                echo -e "This is a ${RED}linux-next.git${NORMAL} compat-wireless release"
                ;;
        "linux-stable.git") # Greg's all stable tree