diff mbox series

mtd-utils: upgrade 2.1.4 -> 2.1.5

Message ID 1665391113-8040-4-git-send-email-wangmy@fujitsu.com
State New
Headers show
Series mtd-utils: upgrade 2.1.4 -> 2.1.5 | expand

Commit Message

Mingyu Wang (Fujitsu) Oct. 10, 2022, 8:38 a.m. UTC 
0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch
removed since it's included in 2.1.5

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 ...used-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

Comments

Alexandre Belloni Oct. 10, 2022, 9:49 p.m. UTC | #1 
Hello,

This breaks oe-selftest:

https://autobuilder.yoctoproject.org/typhoon/#/builders/87/builds/4237/steps/14/logs/stdio

It would be greatly appreciated if you could ensure running oe-selftest
before submitting

On 10/10/2022 16:38:32+0800, wangmy wrote:
> 0001-tests-Remove-unused-linux-fs.h-header-from-includes.patch
> removed since it's included in 2.1.5
> 
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  ...used-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
> 
> 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 <raj.khem@gmail.com>
> -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 <raj.khem@gmail.com>
> ----
> - 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 <sys/vfs.h>
> - #include <sys/mount.h>
> - #include <sys/statvfs.h>
> --#include <linux/fs.h>
> - #include <linux/jffs2.h>
> - 
> - #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"
>  
> -- 
> 2.25.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#171561): https://lists.openembedded.org/g/openembedded-core/message/171561
> Mute This Topic: https://lists.openembedded.org/mt/94232218/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

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 <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
- 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 <sys/vfs.h>
- #include <sys/mount.h>
- #include <sys/statvfs.h>
--#include <linux/fs.h>
- #include <linux/jffs2.h>
- 
- #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"