diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2016-01-13 17:37:28 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-18 11:47:03 +0000 |
commit | 8c3276ecea38d4d67c22e6db49060b2d4b457278 (patch) | |
tree | a08abeadef1a30dff799b50755a33a4faf8ab33c /meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch | |
parent | b248e55c0c39a4d45adc0690f2eefb332ab233f5 (diff) | |
download | poky-8c3276ecea38d4d67c22e6db49060b2d4b457278.tar.gz |
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 <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/0007-misc-create_inode.c-set-owner-mode-time-for-the-inod.patch | 81 |
1 files changed, 0 insertions, 81 deletions
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 @@ | |||
1 | From 2b1f6e6b386703a5d7e60b7d8b72746f3d31a8bc Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 23 Dec 2013 03:39:56 -0500 | ||
4 | Subject: [PATCH 07/11] misc/create_inode.c: set owner/mode/time for the inode | ||
5 | |||
6 | Set the uid, gid, mode and time for inode. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
11 | Reviewed-by: Darren Hart <dvhart@linux.intel.com> | ||
12 | --- | ||
13 | misc/create_inode.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ | ||
14 | 1 file changed, 45 insertions(+) | ||
15 | |||
16 | diff --git a/misc/create_inode.c b/misc/create_inode.c | ||
17 | index 6a8c92a..aad7354 100644 | ||
18 | --- a/misc/create_inode.c | ||
19 | +++ b/misc/create_inode.c | ||
20 | @@ -18,6 +18,40 @@ | ||
21 | #define S_BLKSIZE 512 | ||
22 | #endif | ||
23 | |||
24 | +/* Fill the uid, gid, mode and time for the inode */ | ||
25 | +static void fill_inode(struct ext2_inode *inode, struct stat *st) | ||
26 | +{ | ||
27 | + if (st != NULL) { | ||
28 | + inode->i_uid = st->st_uid; | ||
29 | + inode->i_gid = st->st_gid; | ||
30 | + inode->i_mode |= st->st_mode; | ||
31 | + inode->i_atime = st->st_atime; | ||
32 | + inode->i_mtime = st->st_mtime; | ||
33 | + inode->i_ctime = st->st_ctime; | ||
34 | + } | ||
35 | +} | ||
36 | + | ||
37 | +/* Set the uid, gid, mode and time for the inode */ | ||
38 | +errcode_t set_inode_extra(ext2_ino_t cwd, ext2_ino_t ino, struct stat *st) | ||
39 | +{ | ||
40 | + errcode_t retval; | ||
41 | + struct ext2_inode inode; | ||
42 | + | ||
43 | + retval = ext2fs_read_inode(current_fs, ino, &inode); | ||
44 | + if (retval) { | ||
45 | + com_err(__func__, retval, "while reading inode %u", ino); | ||
46 | + return retval; | ||
47 | + } | ||
48 | + | ||
49 | + fill_inode(&inode, st); | ||
50 | + | ||
51 | + retval = ext2fs_write_inode(current_fs, ino, &inode); | ||
52 | + if (retval) { | ||
53 | + com_err(__func__, retval, "while writing inode %u", ino); | ||
54 | + return retval; | ||
55 | + } | ||
56 | +} | ||
57 | + | ||
58 | /* Make a special file which is block, character and fifo */ | ||
59 | errcode_t do_mknod_internal(ext2_ino_t cwd, const char *name, struct stat *st) | ||
60 | { | ||
61 | @@ -435,6 +469,17 @@ errcode_t populate_fs(ext2_ino_t parent_ino, const char *source_dir) | ||
62 | com_err(__func__, 0, | ||
63 | _("ignoring entry \"%s\""), name); | ||
64 | } | ||
65 | + | ||
66 | + if ((retval = ext2fs_namei(current_fs, root, parent_ino, name, &ino))){ | ||
67 | + com_err(name, retval, 0); | ||
68 | + return retval; | ||
69 | + } | ||
70 | + | ||
71 | + if ((retval = set_inode_extra(parent_ino, ino, &st))) { | ||
72 | + com_err(__func__, retval, | ||
73 | + _("while setting inode for \"%s\""), name); | ||
74 | + return retval; | ||
75 | + } | ||
76 | } | ||
77 | closedir(dh); | ||
78 | return retval; | ||
79 | -- | ||
80 | 1.7.10.4 | ||
81 | |||