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 --- ..._inode.c-set-owner-mode-time-for-the-inod.patch | 81 ---------------------- 1 file changed, 81 deletions(-) delete mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch deleted file mode 100644 index f296393b4f..0000000000 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 2b1f6e6b386703a5d7e60b7d8b72746f3d31a8bc Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Mon, 23 Dec 2013 03:39:56 -0500 -Subject: [PATCH 07/11] misc/create_inode.c: set owner/mode/time for the inode - -Set the uid, gid, mode and time for inode. - -Upstream-Status: Backport - -Signed-off-by: Robert Yang -Reviewed-by: Darren Hart ---- - misc/create_inode.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 45 insertions(+) - -diff --git a/misc/create_inode.c b/misc/create_inode.c -index 6a8c92a..aad7354 100644 ---- a/misc/create_inode.c -+++ b/misc/create_inode.c -@@ -18,6 +18,40 @@ - #define S_BLKSIZE 512 - #endif - -+/* Fill the uid, gid, mode and time for the inode */ -+static void fill_inode(struct ext2_inode *inode, struct stat *st) -+{ -+ if (st != NULL) { -+ inode->i_uid = st->st_uid; -+ inode->i_gid = st->st_gid; -+ inode->i_mode |= st->st_mode; -+ inode->i_atime = st->st_atime; -+ inode->i_mtime = st->st_mtime; -+ inode->i_ctime = st->st_ctime; -+ } -+} -+ -+/* Set the uid, gid, mode and time for the inode */ -+errcode_t set_inode_extra(ext2_ino_t cwd, ext2_ino_t ino, struct stat *st) -+{ -+ errcode_t retval; -+ struct ext2_inode inode; -+ -+ retval = ext2fs_read_inode(current_fs, ino, &inode); -+ if (retval) { -+ com_err(__func__, retval, "while reading inode %u", ino); -+ return retval; -+ } -+ -+ fill_inode(&inode, st); -+ -+ retval = ext2fs_write_inode(current_fs, ino, &inode); -+ if (retval) { -+ com_err(__func__, retval, "while writing inode %u", ino); -+ return retval; -+ } -+} -+ - /* 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) - { -@@ -435,6 +469,17 @@ errcode_t populate_fs(ext2_ino_t parent_ino, const char *source_dir) - com_err(__func__, 0, - _("ignoring entry \"%s\""), name); - } -+ -+ if ((retval = ext2fs_namei(current_fs, root, parent_ino, name, &ino))){ -+ com_err(name, retval, 0); -+ return retval; -+ } -+ -+ if ((retval = set_inode_extra(parent_ino, ino, &st))) { -+ com_err(__func__, retval, -+ _("while setting inode for \"%s\""), name); -+ return retval; -+ } - } - closedir(dh); - return retval; --- -1.7.10.4 - -- cgit v1.2.3-54-g00ecf