Linux 4.10 rebase for stabilization

1 files changed, 22 insertions, 3 deletions

diff --git a/scripts/generate-git-snapshot.sh b/scripts/generate-git-snapshot.sh
index b6fe0d6c1..242200ef6 100755
--- a/scripts/generate-git-snapshot.sh
+++ b/scripts/generate-git-snapshot.sh
@@ -1,10 +1,27 @@
 #!/bin/sh
+# This script allows for the generation of a git snapshot between the upstream
+# git tree and the current tree.
 #
-# Set LINUX_GIT to point to an upstream Linux git tree in your .bashrc or wherever.
+# Prerequisites:
+#     Set LINUX_GIT to point to an upstream Linux git tree in your .bashrc
+#     or wherever.
 
-[ ! -d "$LINUX_GIT" ] && echo "error: set \$LINUX_GIT to point at upstream git tree" && exit 1
+# Look to see if LINUX_GIT is set in local .bashrc
+if [ -f ~/.bashrc  ]; then
+    source ~/.bashrc
+fi
 
-VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz//)
+if [ ! -d "$LINUX_GIT" ]; then
+    echo "error: set \$LINUX_GIT to point at upstream git tree"
+    exit 1
+fi
+
+VER=$(grep patch sources | head -n1 | awk '{ print $2 }' | sed s/patch-// | sed s/-git.*// | sed s/.xz// | sed s/[\(\)]//g)
+
+if [ -z "$VER" ] ;
+then
+    VER=$(grep linux sources | head -1 | awk '{ print $2 }' | sed s/linux-// | sed s/.tar.xz// | sed s/[\(\)]//g)
+fi
 
 OLDGIT=$(grep gitrev kernel.spec | head -n1 | sed s/%define\ gitrev\ //)
 export NEWGIT=$(($OLDGIT+1))
@@ -14,9 +31,11 @@ pushd $LINUX_GIT
 git diff v$VER.. > /tmp/patch-$VER-git$NEWGIT
 xz -9 /tmp/patch-$VER-git$NEWGIT
 DESC=$(git describe)
+git rev-list --max-count=1 HEAD > /tmp/gitrev
 popd
 
 mv /tmp/patch-$VER-git$NEWGIT.xz .
+mv /tmp/gitrev .
 
 perl -p -i -e 's|%global baserelease.*|%global baserelease 0|' kernel.spec