summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2021-02-07 11:19:56 +0800
committerJoe MacDonald <joe@deserted.net>2021-02-18 18:33:00 -0500
commit435879ef35d68cf932b22614d8734756358d7b26 (patch)
tree83237c9d1556c385b00cec5d5ac2856d4e143518 /recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
parentdc700d01f921d338833dc5990b9d39d4e167e4b3 (diff)
downloadmeta-selinux-435879ef35d68cf932b22614d8734756358d7b26.tar.gz
e2fsprogs: remove bbappend
Remove bbappend since the misc_create_inode.c-label_rootfs.patch has been merged upstream[1]. [1] https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=7616fd6a599e44c5700c2c3a2e08979c6c5c747e Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Joe MacDonald <joe@deserted.net>
Diffstat (limited to 'recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch')
-rw-r--r--recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch b/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
deleted file mode 100644
index 046e521..0000000
--- a/recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1From: Philip Tricca <flihp@twobit.us>
2To: tytso@mit.edu
3Cc: liezhi.yang@windriver.com
4Date: Sat, 20 Feb 2016 18:58:58 +0000
5Subject: [PATCH] misc/create_inode.c: Copy xattrs from root directory when populating fs.
6
7When copying a file system using the -d option the xattrs from the root
8directory need to be copied before the populate_fs recusion starts.
9
10Signed-off-by: Philip Tricca <flihp@twobit.us>
11Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
12
13---
14 misc/create_inode.c | 8 ++++++++
15 1 file changed, 8 insertions(+)
16
17diff --git a/misc/create_inode.c b/misc/create_inode.c
18index a7b6d348..cfd15922 100644
19--- a/misc/create_inode.c
20+++ b/misc/create_inode.c
21@@ -979,6 +979,13 @@ errcode_t populate_fs2(ext2_filsys fs, ext2_ino_t parent_ino,
22 return retval;
23 }
24
25+ retval = set_inode_xattr(fs, root, source_dir);
26+ if (retval) {
27+ com_err(__func__, retval,
28+ _("while setting xattrs for \"%s\""), source_dir);
29+ goto out;
30+ }
31+
32 file_info.path_len = 0;
33 file_info.path_max_len = 255;
34 file_info.path = calloc(file_info.path_max_len, 1);
35@@ -987,6 +994,7 @@ errcode_t populate_fs2(ext2_filsys fs, ext2_ino_t parent_ino,
36 &file_info, fs_callbacks);
37
38 free(file_info.path);
39+out:
40 free(hdlinks.hdl);
41 return retval;
42 }
43--
442.11.1
45