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 --- ...3-misc-create_inode.c-create-special-file.patch | 103 --------------------- 1 file changed, 103 deletions(-) delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch deleted file mode 100644 index 3847b6e5ce..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch +++ /dev/null @@ -1,103 +0,0 @@ -From ae7d33823bfc330e08b25c5fe4d25838ef7c77ce Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Mon, 23 Dec 2013 03:13:28 -0500 -Subject: [PATCH 03/11] misc/create_inode.c: create special file - -The do_mknod_internal() is used for creating special file which is -block, character and fifo, 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 | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 72 insertions(+) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index b68b910..4da8aff 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -11,6 +11,78 @@ - /* Make a special file which is block, character and fifo */ - errcode_t do_mknod_internal(ext2_ino_t cwd, const char *name, struct stat *st) - { -+ ext2_ino_t ino; -+ errcode_t retval; -+ struct ext2_inode inode; -+ unsigned long major, minor, mode; -+ int filetype; -+ -+ switch(st->st_mode & S_IFMT) { -+ case S_IFCHR: -+ mode = LINUX_S_IFCHR; -+ filetype = EXT2_FT_CHRDEV; -+ break; -+ case S_IFBLK: -+ mode = LINUX_S_IFBLK; -+ filetype = EXT2_FT_BLKDEV; -+ break; -+ case S_IFIFO: -+ mode = LINUX_S_IFIFO; -+ filetype = EXT2_FT_FIFO; -+ break; -+ } -+ -+ if (!(current_fs->flags & EXT2_FLAG_RW)) { -+ com_err(__func__, 0, "Filesystem opened read/only"); -+ return -1; -+ } -+ retval = ext2fs_new_inode(current_fs, cwd, 010755, 0, &ino); -+ if (retval) { -+ com_err(__func__, retval, 0); -+ return retval; -+ } -+ -+#ifdef DEBUGFS -+ printf("Allocated inode: %u\n", ino); -+#endif -+ retval = ext2fs_link(current_fs, cwd, name, ino, filetype); -+ if (retval == EXT2_ET_DIR_NO_SPACE) { -+ retval = ext2fs_expand_dir(current_fs, cwd); -+ if (retval) { -+ com_err(__func__, retval, "while expanding directory"); -+ return retval; -+ } -+ retval = ext2fs_link(current_fs, cwd, name, ino, filetype); -+ } -+ if (retval) { -+ com_err(name, retval, 0); -+ return -1; -+ } -+ if (ext2fs_test_inode_bitmap2(current_fs->inode_map, ino)) -+ com_err(__func__, 0, "Warning: inode already set"); -+ ext2fs_inode_alloc_stats2(current_fs, ino, +1, 0); -+ memset(&inode, 0, sizeof(inode)); -+ inode.i_mode = mode; -+ inode.i_atime = inode.i_ctime = inode.i_mtime = -+ current_fs->now ? current_fs->now : time(0); -+ -+ major = major(st->st_rdev); -+ minor = minor(st->st_rdev); -+ -+ if ((major < 256) && (minor < 256)) { -+ inode.i_block[0] = major * 256 + minor; -+ inode.i_block[1] = 0; -+ } else { -+ inode.i_block[0] = 0; -+ inode.i_block[1] = (minor & 0xff) | (major << 8) | ((minor & ~0xff) << 12); -+ } -+ inode.i_links_count = 1; -+ -+ retval = ext2fs_write_new_inode(current_fs, ino, &inode); -+ if (retval) -+ com_err(__func__, retval, "while creating inode %u", ino); -+ -+ return retval; - } - - /* Make a symlink name -> target */ --- -1.7.10.4 - -- cgit v1.2.3-54-g00ecf