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/0006-misc-create_inode.c-create-directory.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/0006-misc-create_inode.c-create-directory.patch')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/0006-misc-create_inode.c-create-directory.patch | 62 |
1 files changed, 0 insertions, 62 deletions
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 @@ | |||
1 | From c8d1c43be24489036137f8fdebcfccc208f7cc8b Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 23 Dec 2013 03:34:14 -0500 | ||
4 | Subject: [PATCH 06/11] misc/create_inode.c: create directory | ||
5 | |||
6 | The do_mkdir_internal() is used for making dir on the target fs, most of | ||
7 | the code are from debugfs/debugfs.c, the debugfs/debugfs.c will be | ||
8 | modified to use this function. | ||
9 | |||
10 | Upstream-Status: Backport | ||
11 | |||
12 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
13 | Reviewed-by: Darren Hart <dvhart@linux.intel.com> | ||
14 | --- | ||
15 | misc/create_inode.c | 31 +++++++++++++++++++++++++++++++ | ||
16 | 1 file changed, 31 insertions(+) | ||
17 | |||
18 | diff --git a/misc/create_inode.c b/misc/create_inode.c | ||
19 | index 98f4a93..6a8c92a 100644 | ||
20 | --- a/misc/create_inode.c | ||
21 | +++ b/misc/create_inode.c | ||
22 | @@ -135,6 +135,37 @@ try_again: | ||
23 | /* Make a directory in the fs */ | ||
24 | errcode_t do_mkdir_internal(ext2_ino_t cwd, const char *name, struct stat *st) | ||
25 | { | ||
26 | + char *cp; | ||
27 | + ext2_ino_t parent_ino, ino; | ||
28 | + errcode_t retval; | ||
29 | + struct ext2_inode inode; | ||
30 | + | ||
31 | + | ||
32 | + cp = strrchr(name, '/'); | ||
33 | + if (cp) { | ||
34 | + *cp = 0; | ||
35 | + if ((retval = ext2fs_namei(current_fs, root, cwd, name, &parent_ino))){ | ||
36 | + com_err(name, retval, 0); | ||
37 | + return retval; | ||
38 | + } | ||
39 | + name = cp+1; | ||
40 | + } else | ||
41 | + parent_ino = cwd; | ||
42 | + | ||
43 | +try_again: | ||
44 | + retval = ext2fs_mkdir(current_fs, parent_ino, 0, name); | ||
45 | + if (retval == EXT2_ET_DIR_NO_SPACE) { | ||
46 | + retval = ext2fs_expand_dir(current_fs, parent_ino); | ||
47 | + if (retval) { | ||
48 | + com_err(__func__, retval, "while expanding directory"); | ||
49 | + return retval; | ||
50 | + } | ||
51 | + goto try_again; | ||
52 | + } | ||
53 | + if (retval) { | ||
54 | + com_err("ext2fs_mkdir", retval, 0); | ||
55 | + return retval; | ||
56 | + } | ||
57 | } | ||
58 | |||
59 | static errcode_t copy_file(int fd, ext2_ino_t newfile, int bufsize, int make_holes) | ||
60 | -- | ||
61 | 1.7.10.4 | ||
62 | |||