From 8c3276ecea38d4d67c22e6db49060b2d4b457278 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 13 Jan 2016 17:37:28 -0800 Subject: e2fsprogs: 1.42.9 -> 1.43 (master) Upgrade to 1.43 (master) to make "mke2fs -d" support xattr, so that the layer which requires xattr such as meta-selinux can populate images easily. * Remove the following patches since they are alredy in the source. 0001-e2fsprogs-fix-cross-compilation-problem.patch 0001-libext2fs-fix-potential-buffer-overflow-in-closefs.patch 0001-mke2fs-add-the-ability-to-copy-files-from-a-given-di.patch 0002-misc-create_inode.c-copy-files-recursively.patch 0003-misc-create_inode.c-create-special-file.patch 0004-misc-create_inode.c-create-symlink.patch 0005-misc-create_inode.c-copy-regular-file.patch 0006-misc-create_inode.c-create-directory.patch 0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch 0008-mke2fs.c-add-an-option-d-root-directory.patch 0009-misc-create_inode.c-handle-hardlinks.patch 0010-debugfs-use-the-functions-in-misc-create_inode.c.patch 0011-mke2fs.8.in-update-the-manual-for-the-d-option.patch 0012-Fix-musl-build-failures.patch CVE-2015-0247.patch copy-in-create-hardlinks-with-the-correct-directory-.patch fix-icache.patch misc-mke2fs.c-return-error-when-failed-to-populate-fs.patch * Remove cache_inode.patch since it is not needed any more * Updated mkdir.patch and ptest.patch * Add --enable-libblkid to EXTRA_OECONF since libblkid is not created by default. * Time of core-image-sato-sdk do_rootfs: - Before upgrade real 3m18.508s user 7m42.088s sys 1m1.984s - After upgrade real 3m21.552s user 7m38.496s sys 1m0.644s The are nearly the same * The "fsck -f" shows the image is OK, and also can boot. [YOCTO #8622] (From OE-Core rev: a1f235ad736d322bb50eb4a4293b6b2f4e5200aa) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- ...0006-misc-create_inode.c-create-directory.patch | 62 ---------------------- 1 file changed, 62 deletions(-) delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch deleted file mode 100644 index 5c7ca9c37e..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c8d1c43be24489036137f8fdebcfccc208f7cc8b Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Mon, 23 Dec 2013 03:34:14 -0500 -Subject: [PATCH 06/11] misc/create_inode.c: create directory - -The do_mkdir_internal() is used for making dir on the target fs, most of -the code are from debugfs/debugfs.c, the debugfs/debugfs.c will be -modified to use this function. - -Upstream-Status: Backport - -Signed-off-by: Robert Yang -Reviewed-by: Darren Hart ---- - misc/create_inode.c | 31 +++++++++++++++++++++++++++++++ - 1 file changed, 31 insertions(+) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 98f4a93..6a8c92a 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -135,6 +135,37 @@ try_again: - /* Make a directory in the fs */ - errcode_t do_mkdir_internal(ext2_ino_t cwd, const char *name, struct stat *st) - { -+ char *cp; -+ ext2_ino_t parent_ino, ino; -+ errcode_t retval; -+ struct ext2_inode inode; -+ -+ -+ cp = strrchr(name, '/'); -+ if (cp) { -+ *cp = 0; -+ if ((retval = ext2fs_namei(current_fs, root, cwd, name, &parent_ino))){ -+ com_err(name, retval, 0); -+ return retval; -+ } -+ name = cp+1; -+ } else -+ parent_ino = cwd; -+ -+try_again: -+ retval = ext2fs_mkdir(current_fs, parent_ino, 0, name); -+ if (retval == EXT2_ET_DIR_NO_SPACE) { -+ retval = ext2fs_expand_dir(current_fs, parent_ino); -+ if (retval) { -+ com_err(__func__, retval, "while expanding directory"); -+ return retval; -+ } -+ goto try_again; -+ } -+ if (retval) { -+ com_err("ext2fs_mkdir", retval, 0); -+ return retval; -+ } - } - - static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes) --- -1.7.10.4 - -- cgit v1.2.3-54-g00ecf