From patchwork Wed Apr 5 21:44:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "txt.file" X-Patchwork-Id: 747534 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 3vyztC3LdKz9s83 for ; Thu, 6 Apr 2017 07:45:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="p84o6/YO"; 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qooYv2f/QMvWu1raGtk7yYrHFoHUJTK8n028i2HI3uw=; b=p84o6/YO4vHYZu c1UyfPEuzlSpPi+6ugrxxzr2kRYh9yRjvUkukCsfKx+DmaNhgA2bevFbGI/Spd9xZOHYV6CMTGALO qZQHljzp0rFr34oRuvaXQhiJRk8X+o7qXf1cqTUEl04WOJISaCQLe+/X5NmaQXLK6pJkpo+VZAIRe GUy7ISe+TlbxHkIYPhJ7pIPjfzNRmhnQ5ScfGS6M0/eczoKZt49RS+KDlr5V7L3Re06oTB//34mNw lehZ0P71vDkS8zWH+9/zQ/MqMxZY+AjZfFEOoWoMpIfXPt//MD7AZ6Aoah2qtzEifPDJWsRGVbgvZ J7zdcfjO0uZee2DWtrQg==; 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 1cvskG-0002lC-RF; Wed, 05 Apr 2017 21:45:40 +0000 Received: from mx2.mailbox.org ([80.241.60.215]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cvskC-0002hj-96 for lede-dev@lists.infradead.org; Wed, 05 Apr 2017 21:45:39 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id A9EE145292; Wed, 5 Apr 2017 23:45:07 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id 1-9Prr5BTvYb; Wed, 5 Apr 2017 23:45:03 +0200 (CEST) From: Matthias Fritzsche To: lede-dev@lists.infradead.org Date: Wed, 5 Apr 2017 23:44:06 +0200 Message-Id: <1491428646-20936-1-git-send-email-txt.file@txtfile.eu> In-Reply-To: <26195c7f-07eb-f52a-8a9c-f729d297ff6a@txtfile.eu> References: <26195c7f-07eb-f52a-8a9c-f729d297ff6a@txtfile.eu> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170405_144536_524431_BAD2F135 X-CRM114-Status: UNSURE ( 6.26 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [80.241.60.215 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH] ar71xx: change image version for ubiquiti devices 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: , Cc: Matthias Fritzsche MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org changes the image version from hardcoded OpenWrt to $VERSION_DIST. AirOS shows a notification with the image version during a firmware upgrade. fixes #582 Signed-off-by: Matthias Fritzsche --- target/linux/ar71xx/image/ubnt.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ar71xx/image/ubnt.mk b/target/linux/ar71xx/image/ubnt.mk index b203d6a..056dced 100644 --- a/target/linux/ar71xx/image/ubnt.mk +++ b/target/linux/ar71xx/image/ubnt.mk @@ -6,7 +6,7 @@ # routerboard creates partitions out of the ubnt header define Build/mkubntimage -$(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ + -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v0.0.0-$(VERSION_DIST)-$(REVISION) \ -k $(IMAGE_KERNEL) \ -r $@ \ -o $@ @@ -19,7 +19,7 @@ define Build/mkubntimage-split dd if=$@ of=$@.old1 bs=1024k count=1; \ dd if=$@ of=$@.old2 bs=1024k skip=1; \ $(STAGING_DIR_HOST)/bin/mkfwimage \ - -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ + -B $(UBNT_BOARD) -v $(UBNT_TYPE).$(UBNT_CHIP).v0.0.0-$(VERSION_DIST)-$(REVISION) \ -k $@.old1 \ -r $@.old2 \ -o $@; \ @@ -28,7 +28,7 @@ endef define Build/mkubntimage2 -$(STAGING_DIR_HOST)/bin/mkfwimage2 -f 0x9f000000 \ - -v $(UBNT_TYPE).$(UBNT_CHIP).v6.0.0-OpenWrt-$(REVISION) \ + -v $(UBNT_TYPE).$(UBNT_CHIP).v0.0.0-$(VERSION_DIST)-$(REVISION) \ -p jffs2:0x50000:0xf60000:0:0:$@ \ -o $@.new @mv $@.new $@