From patchwork Wed Jul 15 20:58:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiko Thiery X-Patchwork-Id: 1329821 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=K2CnVF6r; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B6VGj6VLZz9sRf for ; Thu, 16 Jul 2020 07:03:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 646038B0AA; Wed, 15 Jul 2020 21:03:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id N-8dKnRV8hYV; Wed, 15 Jul 2020 21:03:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 81FEC8AF8A; Wed, 15 Jul 2020 21:03:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id DECCF1BF40F for ; Wed, 15 Jul 2020 21:03:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D94138AF8A for ; Wed, 15 Jul 2020 21:03:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FswWgbSr5DFA for ; Wed, 15 Jul 2020 21:03:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id B6A148AF11 for ; Wed, 15 Jul 2020 21:03:21 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id r12so4283713wrj.13 for ; Wed, 15 Jul 2020 14:03:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GGqBedWTHDJzA2eJzB8V3BdfSuI8e6rKDNLQ+oaMf5U=; b=K2CnVF6r6OnPfsD+lrcs4qWhjARDc0jIvpx8zLyBV2UqVj0cDOxBctPnI2c/h2xk3i /XR93HdZTkoKQ7JNI1TkFm215hHTIV06JlK20W9SGKgFTdtItCu2T5vxwEvjiH0zL2vB n+7UvY87nB50Un4rjLDpY+G9w7XanesyMaBDbO4UCPu4hXET4YbHTxGwFHsi/aRfTyOY 1Pf4CHKytQni1YeXHepUtE1xvXWsjSFV4iM9y/5aDOGAkvtjJBx3yphI7YrCQLXuCync o+71Kl3Ay80XnobjDwb3ERJV1gJcoiZR0wsREOMSe9ryDjnl2+WrtVOQ19jgjCaTxj0p kUCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GGqBedWTHDJzA2eJzB8V3BdfSuI8e6rKDNLQ+oaMf5U=; b=E9Okwne1xq45U2RrGrARIMfklShutID4X5gdw0hqpgU9Lw+B0pm8gbkYFwK6RiusTA WFX1/SgNSCjefdWVZ968t8o9w/OJNa/gGKIGjAlfNypeBa5bV+RWS7KkiA3YnbRQ2SOP 5wrKo4kR8dohCrpMur06eT1WI76/7wM4NN4WviokuyknQW/ZckzYiDCeX+fqCwof3d+4 eLIMdu6+Qc5gV8w/w2YXSH+w73/e87NMFGHHLBHfbq4oH8QlApsYR8NvD27/3VM98bel 8eUXRUX2tN1kIfpna8XngmepLb2wnYqNc+38nPnZHZWVdYdy8u1jICj2GKc7bidk30je y4Ww== X-Gm-Message-State: AOAM531VMzEROyiqQcc6tdpVzKFLa55TCuEYKSCuaZZt0sJU3ddUeTj5 ge8Ph20l591bjHieHM3nWotOlhlz X-Google-Smtp-Source: ABdhPJwfCG4AtrcvHQCEfee/x5YJZXnyl+p6+zLHzXg5qs1AwRpOlzzDh7iUPQNcJYYtZ+FpVE7Jsg== X-Received: by 2002:adf:e38d:: with SMTP id e13mr1419982wrm.304.1594846999905; Wed, 15 Jul 2020 14:03:19 -0700 (PDT) Received: from t450s.fritz.box (ip5b426f84.dynamic.kabel-deutschland.de. [91.66.111.132]) by smtp.gmail.com with ESMTPSA id y77sm5508322wmd.36.2020.07.15.14.03.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 14:03:19 -0700 (PDT) From: Heiko Thiery To: buildroot@buildroot.org Date: Wed, 15 Jul 2020 22:58:38 +0200 Message-Id: <20200715205838.22062-1-heiko.thiery@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/mtd: bump to version 2.1.2 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matt Weber , Heiko Thiery , Barry Grussling , David Oberhollenzer , Thomas De Schampheleire Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - drop patch included in version - update hash file formatting (2 spaces) Signed-off-by: Heiko Thiery --- ...-utils-Fix-return-value-of-ubiformat.patch | 60 ------------------- package/mtd/mtd.hash | 6 +- package/mtd/mtd.mk | 2 +- 3 files changed, 4 insertions(+), 64 deletions(-) delete mode 100644 package/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patch diff --git a/package/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patch b/package/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patch deleted file mode 100644 index 88c8389a64..0000000000 --- a/package/mtd/0001-mtd-utils-Fix-return-value-of-ubiformat.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 95633c4dfe943a701d4fcd809e6cabf4bf8710b8 Mon Sep 17 00:00:00 2001 -From: Barry Grussling -Date: Sun, 12 Jan 2020 12:33:32 -0800 -Subject: [PATCH] mtd-utils: Fix return value of ubiformat - -This changeset fixes a feature regression in ubiformat. Older versions of -ubiformat, when invoked with a flash-image, would return 0 in the case no error -was encountered. Upon upgrading to latest, it was discovered that ubiformat -returned 255 even without encountering an error condition. - -This changeset corrects the above issue and causes ubiformat, when given an -image file, to return 0 when no errors are detected. - -Tested by running through my loading scripts and verifying ubiformat returned -0. - -Signed-off-by: Barry Grussling -Signed-off-by: David Oberhollenzer -Backported-from: 95633c4dfe943a701d4fcd809e6cabf4bf8710b8 -Signed-off-by: Thomas De Schampheleire ---- - ubi-utils/ubiformat.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/ubi-utils/ubiformat.c b/ubi-utils/ubiformat.c -index 64afad2..be40e52 100644 ---- a/ubi-utils/ubiformat.c -+++ b/ubi-utils/ubiformat.c -@@ -550,6 +550,7 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, - struct ubi_vtbl_record *vtbl; - int eb1 = -1, eb2 = -1; - long long ec1 = -1, ec2 = -1; -+ int ret = -1; - - write_size = UBI_EC_HDR_SIZE + mtd->subpage_size - 1; - write_size /= mtd->subpage_size; -@@ -643,8 +644,10 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, - if (!args.quiet && !args.verbose) - printf("\n"); - -- if (novtbl) -+ if (novtbl) { -+ ret = 0; - goto out_free; -+ } - - if (eb1 == -1 || eb2 == -1) { - errmsg("no eraseblocks for volume table"); -@@ -669,7 +672,7 @@ static int format(libmtd_t libmtd, const struct mtd_dev_info *mtd, - - out_free: - free(hdr); -- return -1; -+ return ret; - } - - int main(int argc, char * const argv[]) --- -2.24.1 - diff --git a/package/mtd/mtd.hash b/package/mtd/mtd.hash index 2e23fbb819..fda5a6ea36 100644 --- a/package/mtd/mtd.hash +++ b/package/mtd/mtd.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.1.tar.bz2.asc -sha256 8d15e8b70f036d6af1a66011f8ca0e048e9675fa7983d33bea92c24313a232d2 mtd-utils-2.1.1.tar.bz2 -sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING +# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-2.1.2.tar.bz2.asc +sha256 8ad4c5f34716d40646aa28724a2f5616d325a6f119254f914e26976f1f76e9d6 mtd-utils-2.1.2.tar.bz2 +sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 3477460200..74b19c7e4a 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTD_VERSION = 2.1.1 +MTD_VERSION = 2.1.2 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0