From 794fdb05c4657c549eab8497bf33b9b9925add41 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 7 Nov 2022 15:54:46 +0100 Subject: mtd-utils: upgrade 2.1.4 -> 2.1.5 (From OE-Core rev: a3289c988764e5b864873b4adc7656c101a5b9c0) Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...ve-unused-linux-fs.h-header-from-includes.patch | 31 ---------------------- meta/recipes-devtools/mtd/mtd-utils_git.bb | 8 +++--- 2 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 meta/recipes-devtools/mtd/mtd-utils/0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch (limited to 'meta/recipes-devtools/mtd') 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 @@ -From 6fb10bd18488ed84776675bc1b2982800a51d839 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 6 Aug 2022 20:14:38 -0700 -Subject: [mtd-utils][PATCH] tests: Remove unused linux/fs.h header from includes - -This header is not needed, moreover it includes linux/mount.h which is -now in conflict[1] with glibc provided sys/mount.h from glibc 2.36 onwards - -[1] https://sourceware.org/glibc/wiki/Release/2.36 - -Upstream-Status: Submitted [https://lists.infradead.org/pipermail/linux-mtd/2022-August/094667.html] -Signed-off-by: Khem Raj ---- - tests/fs-tests/lib/tests.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tests/fs-tests/lib/tests.c b/tests/fs-tests/lib/tests.c -index d1a2e0c..3db0426 100644 ---- a/tests/fs-tests/lib/tests.c -+++ b/tests/fs-tests/lib/tests.c -@@ -35,7 +35,6 @@ - #include - #include - #include --#include - #include - - #include "tests.h" --- -2.37.1 - 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 DEPENDS = "zlib e2fsprogs util-linux" RDEPENDS:mtd-utils-tests += "bash" -PV = "2.1.4" +PV = "2.1.5" -SRCREV = "c7f1bfa44a84d02061787e2f6093df5cc40b9f5c" -SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \ - file://0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch \ - " +SRCREV = "3f3b4cc6c3120107e7aaa21c6415772a255ac49c" +SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master" S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf