From patchwork Mon Jul 10 00:19:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Schiffer X-Patchwork-Id: 785977 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x5Qqf4gZvz9s7C for ; Mon, 10 Jul 2017 10:21:18 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="vAUD+XT6"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=oWwnzU7OAHOJifbMwGLMxfIqK3Obnftj44WK+CGN0X0=; b=vAUD+XT6Cj5Q6r6rUfojqDvxA8 lK7lsiRG6aWzcGDchMUmSPbAEehZvN4iykoiOWfu7LhhJUy79FmAutMiJCb3XyFA/8kWXwgehUNTk 6KJySx4K4ukxG5q/SYtYsQm448/0WwWwGP3PJJQ0RUbToTvjDZOC4Z8IOCkAFz/Jj87IZzNKHsq/Q 43dHCtopCM4b6bWjgF2lMAap1sXMVe+G6u0FRCKnc/TVZm1yJ4uOtKORwK8LaneIDzaMlBgeZWep1 qmBDiwSEVOe8K7KkKvMJHjHE1CvMhOLZ6TAdetxzTm2dhVi6c2CLeqC98EkKWHquueQajG0qG8UWP tlPI3nGw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dUMRo-0000uY-UR; Mon, 10 Jul 2017 00:21:08 +0000 Received: from chaos.universe-factory.net ([31.24.148.19]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dUMR2-0007Qt-Bt for lede-dev@lists.infradead.org; Mon, 10 Jul 2017 00:20:23 +0000 Received: from localhost.localdomain (unknown [IPv6:fd1b:c28a:2fd6::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by chaos.universe-factory.net (Postfix) with ESMTPSA id D68751870AC; Mon, 10 Jul 2017 02:19:55 +0200 (CEST) From: Matthias Schiffer To: lede-dev@lists.infradead.org, zajec5@gmail.com Date: Mon, 10 Jul 2017 02:19:49 +0200 Message-Id: X-Mailer: git-send-email 2.13.2 In-Reply-To: <9fad4778d3a473af19977460c001ad7b2b9bcee4.1499645991.git.mschiffer@universe-factory.net> References: <9fad4778d3a473af19977460c001ad7b2b9bcee4.1499645991.git.mschiffer@universe-factory.net> In-Reply-To: <9fad4778d3a473af19977460c001ad7b2b9bcee4.1499645991.git.mschiffer@universe-factory.net> References: <9fad4778d3a473af19977460c001ad7b2b9bcee4.1499645991.git.mschiffer@universe-factory.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170709_172020_730009_02B27B32 X-CRM114-Status: UNSURE ( 6.37 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH 2/4] scripts/getver.sh: drop try_hg X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org We don't use Mercurial, try_hg didn't understand GET_REV, and its output didn't have anything to do with the way LEDE counts revisions. Signed-off-by: Matthias Schiffer --- scripts/getver.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/getver.sh b/scripts/getver.sh index 1032fa324e..215bb036a5 100755 --- a/scripts/getver.sh +++ b/scripts/getver.sh @@ -50,12 +50,5 @@ try_git() { [ -n "$REV" ] } -try_hg() { - [ -d .hg ] || return 1 - REV="$(hg log -r-1 --template '{desc}' | awk '{print $2}' | sed 's/\].*//')" - REV="${REV:+r$REV}" - [ -n "$REV" ] -} - -try_version || try_git || try_hg || REV="unknown" +try_version || try_git || REV="unknown" echo "$REV"