From 37145e8055030cb662a09b63c0b61e5a66f70d99 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 27 Sep 2010 16:10:37 -0700 Subject: [PATCH] compat-wireless: update code-metrics to reflect extra patches applied This will peg the characters options we used to apply extra patches to our compat-wireless release to identify the extra patches applied. For example with "-s", we will now get: compat-wireless-v2.6.36-rc5-1-2-g2ac99dc-s This should be also picked up on the compat module which when loaded will display the above string. This is useful when troubleshooting issues and trying to find out what a user is using exactly. Signed-off-by: Luis R. Rodriguez --- scripts/admin-update.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh index c1cf1f21c87f..fc15e2031166 100755 --- a/scripts/admin-update.sh +++ b/scripts/admin-update.sh @@ -136,6 +136,7 @@ nagometer() { EXTRA_PATCHES="patches" REFRESH="n" GET_STABLE_PENDING="n" +POSTFIX_RELEASE_TAG="" if [ $# -ge 1 ]; then if [ $# -gt 4 ]; then usage $0 @@ -149,18 +150,22 @@ if [ $# -ge 1 ]; then if [[ "$1" = "-s" ]]; then GET_STABLE_PENDING="y" EXTRA_PATCHES="${EXTRA_PATCHES} pending-stable" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}s" shift; continue; fi if [[ "$1" = "-n" ]]; then EXTRA_PATCHES="${EXTRA_PATCHES} linux-next-cherry-picks" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}n" shift; continue; fi if [[ "$1" = "-p" ]]; then EXTRA_PATCHES="${EXTRA_PATCHES} linux-next-pending" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}p" shift; continue; fi if [[ "$1" = "-c" ]]; then EXTRA_PATCHES="${EXTRA_PATCHES} crap" + POSTFIX_RELEASE_TAG="${POSTFIX_RELEASE_TAG}c" shift; continue; fi if [[ "$1" = "refresh" ]]; then @@ -526,7 +531,11 @@ echo -e "${GREEN}Updated${NORMAL} from local tree: ${BLUE}${GIT_TREE}${NORMAL}" echo -e "Origin remote URL: ${CYAN}${GIT_REMOTE_URL}${NORMAL}" cd $DIR if [ -d ./.git ]; then - git describe > compat_version + if [[ ${POSTFIX_RELEASE_TAG} != "" ]]; then + echo -e "$(git describe)-${POSTFIX_RELEASE_TAG}" > compat_version + else + echo -e "$(git describe)" > compat_version + fi cd $GIT_TREE TREE_NAME=${GIT_REMOTE_URL##*/} -- 2.30.2