summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-01-13 17:37:28 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-18 11:47:03 +0000
commit8c3276ecea38d4d67c22e6db49060b2d4b457278 (patch)
treea08abeadef1a30dff799b50755a33a4faf8ab33c /meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch
parentb248e55c0c39a4d45adc0690f2eefb332ab233f5 (diff)
downloadpoky-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/0003-misc-create_inode.c-create-special-file.patch')
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/0003-misc-create_inode.c-create-special-file.patch103
1 files changed, 0 insertions, 103 deletions
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 @@
1From ae7d33823bfc330e08b25c5fe4d25838ef7c77ce Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 23 Dec 2013 03:13:28 -0500
4Subject: [PATCH 03/11] misc/create_inode.c: create special file
5
6The do_mknod_internal() is used for creating special file which is
7block, character and fifo, most of the code are from debugfs/debugfs.c,
8the debugfs/debugfs.c will be modified to use this function.
9
10Upstream-Status: Backport
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13Reviewed-by: Darren Hart <dvhart@linux.intel.com>
14---
15 misc/create_inode.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++
16 1 file changed, 72 insertions(+)
17
18diff --git a/misc/create_inode.c b/misc/create_inode.c
19index b68b910..4da8aff 100644
20--- a/misc/create_inode.c
21+++ b/misc/create_inode.c
22@@ -11,6 +11,78 @@
23 /* Make a special file which is block, character and fifo */
24 errcode_t do_mknod_internal(ext2_ino_t cwd, const char *name, struct stat *st)
25 {
26+ ext2_ino_t ino;
27+ errcode_t retval;
28+ struct ext2_inode inode;
29+ unsigned long major, minor, mode;
30+ int filetype;
31+
32+ switch(st->st_mode & S_IFMT) {
33+ case S_IFCHR:
34+ mode = LINUX_S_IFCHR;
35+ filetype = EXT2_FT_CHRDEV;
36+ break;
37+ case S_IFBLK:
38+ mode = LINUX_S_IFBLK;
39+ filetype = EXT2_FT_BLKDEV;
40+ break;
41+ case S_IFIFO:
42+ mode = LINUX_S_IFIFO;
43+ filetype = EXT2_FT_FIFO;
44+ break;
45+ }
46+
47+ if (!(current_fs->flags & EXT2_FLAG_RW)) {
48+ com_err(__func__, 0, "Filesystem opened read/only");
49+ return -1;
50+ }
51+ retval = ext2fs_new_inode(current_fs, cwd, 010755, 0, &ino);
52+ if (retval) {
53+ com_err(__func__, retval, 0);
54+ return retval;
55+ }
56+
57+#ifdef DEBUGFS
58+ printf("Allocated inode: %u\n", ino);
59+#endif
60+ retval = ext2fs_link(current_fs, cwd, name, ino, filetype);
61+ if (retval == EXT2_ET_DIR_NO_SPACE) {
62+ retval = ext2fs_expand_dir(current_fs, cwd);
63+ if (retval) {
64+ com_err(__func__, retval, "while expanding directory");
65+ return retval;
66+ }
67+ retval = ext2fs_link(current_fs, cwd, name, ino, filetype);
68+ }
69+ if (retval) {
70+ com_err(name, retval, 0);
71+ return -1;
72+ }
73+ if (ext2fs_test_inode_bitmap2(current_fs->inode_map, ino))
74+ com_err(__func__, 0, "Warning: inode already set");
75+ ext2fs_inode_alloc_stats2(current_fs, ino, +1, 0);
76+ memset(&inode, 0, sizeof(inode));
77+ inode.i_mode = mode;
78+ inode.i_atime = inode.i_ctime = inode.i_mtime =
79+ current_fs->now ? current_fs->now : time(0);
80+
81+ major = major(st->st_rdev);
82+ minor = minor(st->st_rdev);
83+
84+ if ((major < 256) && (minor < 256)) {
85+ inode.i_block[0] = major * 256 + minor;
86+ inode.i_block[1] = 0;
87+ } else {
88+ inode.i_block[0] = 0;
89+ inode.i_block[1] = (minor & 0xff) | (major << 8) | ((minor & ~0xff) << 12);
90+ }
91+ inode.i_links_count = 1;
92+
93+ retval = ext2fs_write_new_inode(current_fs, ino, &inode);
94+ if (retval)
95+ com_err(__func__, retval, "while creating inode %u", ino);
96+
97+ return retval;
98 }
99
100 /* Make a symlink name -> target */
101--
1021.7.10.4
103