From 1ca909aa459bc27a22e2f724522153ea65b413ef Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 3 Dec 2012 10:43:21 -0600
Subject: [PATCH] merge script changes with master of stable-kernel
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/git.sh | 10 +++++++---
version.sh | 3 +++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/scripts/git.sh b/scripts/git.sh
index 88a10ed41..53d196d99 100755
--- a/scripts/git.sh
+++ b/scripts/git.sh
@@ -119,12 +119,16 @@ git_kernel () {
git pull ${GIT_OPTS} || true
+ git tag | grep v${KERNEL_TAG} | grep -v rc &>/dev/null || git_kernel_torvalds
+
if [ ! "${LATEST_GIT}" ] ; then
- git tag | grep v${KERNEL_TAG} | grep -v rc &>/dev/null || git_kernel_torvalds
git branch -D v${KERNEL_TAG}-${BUILD} &>/dev/null || true
- git checkout v${KERNEL_TAG} -b v${KERNEL_TAG}-${BUILD}
+ if [ ! "${KERNEL_SHA}" ] ; then
+ git checkout v${KERNEL_TAG} -b v${KERNEL_TAG}-${BUILD}
+ else
+ git checkout ${KERNEL_SHA} -b v${KERNEL_TAG}-${BUILD}
+ fi
else
- git tag | grep v${KERNEL_TAG} | grep -v rc &>/dev/null || git_kernel_torvalds
git branch -D top-of-tree &>/dev/null || true
git checkout v${KERNEL_TAG} -b top-of-tree
git describe
diff --git a/version.sh b/version.sh
index ad8b8b070..7705f67fb 100644
--- a/version.sh
+++ b/version.sh
@@ -26,6 +26,9 @@ KERNEL_REL=3.7
KERNEL_TAG=${KERNEL_REL}-rc7
BUILD=d0
+#v3.X-rcX + upto SHA
+#KERNEL_SHA=""
+
#git branch
#BRANCH="v3.8.x"
--
GitLab