summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-11-07 15:54:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-08 22:47:16 +0000
commit794fdb05c4657c549eab8497bf33b9b9925add41 (patch)
treefc1eb2b5514ef5a7a5be21be7c1556a5fcc80ada /meta
parent50dc127c9dfcbac1f4fb5ff6964572bee03cbcf0 (diff)
downloadpoky-794fdb05c4657c549eab8497bf33b9b9925add41.tar.gz
mtd-utils: upgrade 2.1.4 -> 2.1.5
(From OE-Core rev: a3289c988764e5b864873b4adc7656c101a5b9c0) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils/0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch31
-rw-r--r--meta/recipes-devtools/mtd/mtd-utils_git.bb8
2 files changed, 3 insertions, 36 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils/0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch b/meta/recipes-devtools/mtd/mtd-utils/0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch
deleted file mode 100644
index 73d4a8475f..0000000000
--- a/meta/recipes-devtools/mtd/mtd-utils/0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 6fb10bd18488ed84776675bc1b2982800a51d839 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 6 Aug 2022 20:14:38 -0700
4Subject: [mtd-utils][PATCH] tests: Remove unused linux/fs.h header from includes
5
6This header is not needed, moreover it includes linux/mount.h which is
7now in conflict[1] with glibc provided sys/mount.h from glibc 2.36 onwards
8
9[1] https://sourceware.org/glibc/wiki/Release/2.36
10
11Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-mtd/2022-August/094667.html]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 tests/fs-tests/lib/tests.c | 1 -
15 1 file changed, 1 deletion(-)
16
17diff --git a/tests/fs-tests/lib/tests.c b/tests/fs-tests/lib/tests.c
18index d1a2e0c..3db0426 100644
19--- a/tests/fs-tests/lib/tests.c
20+++ b/tests/fs-tests/lib/tests.c
21@@ -35,7 +35,6 @@
22 #include <sys/vfs.h>
23 #include <sys/mount.h>
24 #include <sys/statvfs.h>
25-#include <linux/fs.h>
26 #include <linux/jffs2.h>
27
28 #include "tests.h"
29--
302.37.1
31
diff --git a/meta/recipes-devtools/mtd/mtd-utils_git.bb b/meta/recipes-devtools/mtd/mtd-utils_git.bb
index 943666e529..2d76991d2f 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_git.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_git.bb
@@ -11,12 +11,10 @@ inherit autotools pkgconfig update-alternatives
11DEPENDS = "zlib e2fsprogs util-linux" 11DEPENDS = "zlib e2fsprogs util-linux"
12RDEPENDS:mtd-utils-tests += "bash" 12RDEPENDS:mtd-utils-tests += "bash"
13 13
14PV = "2.1.4" 14PV = "2.1.5"
15 15
16SRCREV = "c7f1bfa44a84d02061787e2f6093df5cc40b9f5c" 16SRCREV = "3f3b4cc6c3120107e7aaa21c6415772a255ac49c"
17SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \ 17SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master"
18 file://0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch \
19 "
20 18
21S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"
22 20