From patchwork Sat Jul 25 16:51:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Todor Colov X-Patchwork-Id: 1336287 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=abv.bg Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=JbAizXln; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=abv.bg header.i=@abv.bg header.a=rsa-sha256 header.s=smtp-out header.b=nrKJ2Ayl; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BDXFQ2N84z9sPf for ; Sun, 26 Jul 2020 02:53:14 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RZ0yRkSvsprBIj/9ncI+YWhLO5aftKgsiRKsJT0Ahm4=; b=JbAizXlnO1eIoqtc2tGYyuwHe WiCMqPDwzYcQ1cO1Iw72N0kCxelYp5OEdIAFrYkdTM7xcPeDH0cPKUzvzgfXjtLZ8icauo2YPUaS7 qzKJdV4aHyLxVtC7MqCsloIzv+jpzqDLqQT/n+yim9yEE6WcpVwz2ZOwu52IoTWGEXAqtzJPuN727 isWPxB7K0Kyp6qRpFQ2W2sd+iiP8X31bSXiqfMsHYdUVi3tyA9d+hzcx6Azhl2mNKiSQgoPcK6g5n TlcxXskfiXX4EOeGUdfSvoBLHGuvushJblUOxvBrArCrU3mp/ACkUpoEwhkzwSqeNMuO8qlFlqcF3 2HR4U6gTw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jzNOz-0003sF-Iq; Sat, 25 Jul 2020 16:52:01 +0000 Received: from pop31.abv.bg ([194.153.145.221]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jzNOx-0003re-GH for openwrt-devel@lists.openwrt.org; Sat, 25 Jul 2020 16:52:00 +0000 Received: from smtp.abv.bg (localhost [127.0.0.1]) by pop31.abv.bg (Postfix) with ESMTP id 1B1471805D33; Sat, 25 Jul 2020 19:51:58 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=abv.bg; s=smtp-out; t=1595695918; bh=dPaCx8ZY32lUlXoSJaII60iTpUxDozaKXuAU7Bd+MeA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nrKJ2Aylm7gdGBqhS9t+uEdV4hTwz8bvn2TJAQd/XWdTbO03qf36Z1RbV2ooCgtBg R4OI3d+ZUaIrHFOKRo/9sF3tDqEUKs+lkMl0Ofu6M74nR4+/BTHlu9ShqzIq9MkoRV VZRHhInfoCQIbAopR7h2ZidPrQUiaqzuopUR0zHg= X-HELO: tchome.lan Authentication-Results: smtp.abv.bg; auth=pass (plain) smtp.auth=todorcolov@abv.bg Received: from unknown.interbgc.com (HELO tchome.lan) (130.204.242.199) by smtp.abv.bg (qpsmtpd/0.96) with ESMTPSA (ECDHE-RSA-AES256-GCM-SHA384 encrypted); Sat, 25 Jul 2020 19:51:58 +0300 From: Todor Colov To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/1] base-files: fix nand.sh to remove metadata before ubiformat Date: Sat, 25 Jul 2020 19:51:49 +0300 Message-Id: <20200725165149.3726-2-todorcolov@abv.bg> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200725165149.3726-1-todorcolov@abv.bg> References: <20200725165149.3726-1-todorcolov@abv.bg> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200725_125159_753992_2552D2AA X-CRM114-Status: UNSURE ( 5.49 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [todorcolov[at]abv.bg] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Todor Colov Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Signed-off-by: Todor Colov --- package/base-files/files/lib/upgrade/nand.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh index e7d7bf8d13..923c01a72d 100644 --- a/package/base-files/files/lib/upgrade/nand.sh +++ b/package/base-files/files/lib/upgrade/nand.sh @@ -224,6 +224,7 @@ nand_upgrade_ubinized() { local mtddev="/dev/mtd${mtdnum}" ubidetach -p "${mtddev}" || true sync + fwtool -q -t -i /dev/null "$1" ubiformat "${mtddev}" -y -f "${ubi_file}" ubiattach -p "${mtddev}" nand_do_upgrade_success