diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2021-02-05 10:27:50 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-06 09:02:51 +0000 |
commit | f51835e022731d1c0e8e18209e48f1a718048977 (patch) | |
tree | b6c4b77674f925fa881829808916664289c2c1ad /meta/recipes-devtools/e2fsprogs | |
parent | 6c1cb7e274050f1ccb817b8ee34d0f61f34c95e3 (diff) | |
download | openembedded-core-contrib-f51835e022731d1c0e8e18209e48f1a718048977.tar.gz |
e2fsprogs: upgrade 1.45.6 -> 1.45.7
0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch
removed since it is included in 1.45.7
Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch | 55 | ||||
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb (renamed from meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb) | 3 |
2 files changed, 1 insertions, 57 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch deleted file mode 100644 index 0e8cbad25a..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch +++ /dev/null @@ -1,55 +0,0 @@ -From dcb36fd007ddb32d8c5cfcf5e9ddb3d713d65396 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 21 Jul 2020 09:43:03 +0800 -Subject: [PATCH] fix up check for hardlinks always false if inode > 0xFFFFFFFF - -Since commit [382ed4a1 e2fsck: use proper types for variables][1] -applied, it used ext2_ino_t instead of ino_t for referencing inode -numbers, but the type of is_hardlink's `ino' should not be instead, -The ext2_ino_t is 32bit, if inode > 0xFFFFFFFF, its value will be -truncated. - -Add a debug printf to show the value of inode, when it check for hardlink -files, it will always return false if inode > 0xFFFFFFFF -|--- a/misc/create_inode.c -|+++ b/misc/create_inode.c -|@@ -605,6 +605,7 @@ static int is_hardlink(struct hdlinks_s *hdlinks, dev_t dev, ext2_ino_t ino) -| { -| int i; -| -|+ printf("%s %d, %lX, %lX\n", __FUNCTION__, __LINE__, hdlinks->hdl[i].src_ino, ino); -| for (i = 0; i < hdlinks->count; i++) { -| if (hdlinks->hdl[i].src_dev == dev && -| hdlinks->hdl[i].src_ino == ino) - -Here is debug message: -is_hardlink 608, 2913DB886, 913DB886 - -The length of ext2_ino_t is 32bit (typedef __u32 __bitwise ext2_ino_t;), -and ino_t is 64bit on 64bit system (such as x86-64), recover `ino' to ino_t. - -[1] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=382ed4a1c2b60acb9db7631e86dda207bde6076e - -Upstream-Status: Submitted [https://github.com/tytso/e2fsprogs/pull/48] - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - misc/create_inode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index e8d1df6b..837f3875 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -601,7 +601,7 @@ out: - return err; - } - --static int is_hardlink(struct hdlinks_s *hdlinks, dev_t dev, ext2_ino_t ino) -+static int is_hardlink(struct hdlinks_s *hdlinks, dev_t dev, ino_t ino) - { - int i; - --- -2.18.2 - diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb index e6a4bd1f8c..1a00807757 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.7.bb @@ -6,14 +6,13 @@ SRC_URI += "file://remove.ldconfig.call.patch \ file://mkdir_p.patch \ file://0001-configure.ac-correct-AM_GNU_GETTEXT.patch \ file://0001-intl-do-not-try-to-use-gettext-defines-that-no-longe.patch \ - file://0001-fix-up-check-for-hardlinks-always-false-if-inode-0xF.patch \ " SRC_URI_append_class-native = " file://e2fsprogs-fix-missing-check-for-permission-denied.patch \ file://quiet-debugfs.patch \ " -SRCREV = "506d96fe640f76ab04276e0a7c578aa108ce19f8" +SRCREV = "5403970e44241cec26f98aaa0124b9881b4bbf4f" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+\.\d+(\.\d+)*)$" EXTRA_OECONF += "--libdir=${base_libdir} --sbindir=${base_sbindir} \ |