From patchwork Mon Jul 22 22:57:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Weber X-Patchwork-Id: 1135305 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) 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=none (p=none dis=none) header.from=rockwellcollins.com 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 45sxpX69Csz9s8m for ; Tue, 23 Jul 2019 08:57:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 457F985BD3; Mon, 22 Jul 2019 22:57:52 +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 tjKnV5-9KmUw; Mon, 22 Jul 2019 22:57:50 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1C3F784F27; Mon, 22 Jul 2019 22:57:50 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 941BF1BF35E for ; Mon, 22 Jul 2019 22:57:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 90F2A86A14 for ; Mon, 22 Jul 2019 22:57:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FJJDjca0p1Ia for ; Mon, 22 Jul 2019 22:57:47 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs03.rockwellcollins.com (da1vs03.rockwellcollins.com [205.175.227.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id 840F7866B3 for ; Mon, 22 Jul 2019 22:57:47 +0000 (UTC) Received: from ofwda1n02.rockwellcollins.com (HELO crulimr01.rockwellcollins.com) ([205.175.227.14]) by da1vs03.rockwellcollins.com with ESMTP; 22 Jul 2019 17:57:46 -0500 X-Received: from CRm23123.rockwellcollins.com (crm23123.rockwellcollins.com [10.142.21.52]) by crulimr01.rockwellcollins.com (Postfix) with ESMTP id 751E0605FC; Mon, 22 Jul 2019 17:57:46 -0500 (CDT) From: Matt Weber To: buildroot@buildroot.org Date: Mon, 22 Jul 2019 17:57:45 -0500 Message-Id: <20190722225745.2743-1-matthew.weber@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH v2] package/mtd: bump to 2.1.1 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: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Removes 0001-mkfs.ubifs-fix-build-without-openssl.patch which has been merged upsteam as b5027be5f470830ac9543db3c52e076b13abd313. Release Notes: https://www.spinics.net/lists/linux-mtd/msg08093.html Signed-off-by: Matthew Weber --- Changes v1 -> v2 - Added hash file update missed in first patch --- ...mkfs.ubifs-fix-build-without-openssl.patch | 38 ------------------- package/mtd/mtd.hash | 4 +- package/mtd/mtd.mk | 2 +- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 package/mtd/0001-mkfs.ubifs-fix-build-without-openssl.patch diff --git a/package/mtd/0001-mkfs.ubifs-fix-build-without-openssl.patch b/package/mtd/0001-mkfs.ubifs-fix-build-without-openssl.patch deleted file mode 100644 index 8633830806..0000000000 --- a/package/mtd/0001-mkfs.ubifs-fix-build-without-openssl.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 451b6fd8f6b619ae75d283df02edd835c8e3c627 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 29 Mar 2019 13:29:41 +0300 -Subject: [PATCH] mkfs.ubifs: fix build without openssl - -Exclude openssl headers when WITH_CRYPTO is not defined. - -Fixes this build failure: - -In file included from ubifs-utils/mkfs.ubifs/mkfs.ubifs.c:25:0: -ubifs-utils/mkfs.ubifs/mkfs.ubifs.h:49:10: fatal error: openssl/rand.h: No such file or directory - #include - ^~~~~~~~~~~~~~~~ - -Signed-off-by: Baruch Siach ---- -Upstream status: http://lists.infradead.org/pipermail/linux-mtd/2019-March/088508.html - - ubifs-utils/mkfs.ubifs/mkfs.ubifs.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h -index aa032392155b..8f0186043079 100644 ---- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h -+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.h -@@ -46,7 +46,9 @@ - #include - #include - -+#ifdef WITH_CRYPTO - #include -+#endif - - #include - --- -2.20.1 - diff --git a/package/mtd/mtd.hash b/package/mtd/mtd.hash index e82b3522cb..2e23fbb819 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.0.2.tar.bz2.asc -sha256 b4b995b06d93aee4125e8e44c05a1cae6eea545ca5a6e8a377405ee8aa454bd2 mtd-utils-2.1.0.tar.bz2 +# 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 diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 94c8b8b1da..0de14dbcba 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -4,7 +4,7 @@ # ################################################################################ -MTD_VERSION = 2.1.0 +MTD_VERSION = 2.1.1 MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils MTD_LICENSE = GPL-2.0