[meta-selinux][dunfell][PATCH 1/3] e2fsprogs: Remove misc_create_inode.c-label_rootfs.patch


Jason Andryuk
 

An equivalent patch was merged into 1.45.7: commit 7616fd6a599e
"create_inode: set xattrs to the root directory as well". The existing
one still applies and actualy breaks building because of duplicate
lables. Remove it.

Signed-off-by: Jason Andryuk <jandryuk@...>
---
.../e2fsprogs/e2fsprogs_selinux.inc | 2 -
.../misc_create_inode.c-label_rootfs.patch | 45 -------------------
2 files changed, 47 deletions(-)
delete mode 100644 recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch

diff --git a/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc b/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
index 9cbb7fe..81fe7b7 100644
--- a/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
+++ b/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc
@@ -1,3 +1 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://misc_create_inode.c-label_rootfs.patch"
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 @@
-From: Philip Tricca <flihp@...>
-To: tytso@...
-Cc: liezhi.yang@...
-Date: Sat, 20 Feb 2016 18:58:58 +0000
-Subject: [PATCH] misc/create_inode.c: Copy xattrs from root directory when populating fs.
-
-When copying a file system using the -d option the xattrs from the root
-directory need to be copied before the populate_fs recusion starts.
-
-Signed-off-by: Philip Tricca <flihp@...>
-Signed-off-by: Jeremy Puhlman <jpuhlman@...>
-
----
- misc/create_inode.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/misc/create_inode.c b/misc/create_inode.c
-index a7b6d348..cfd15922 100644
---- a/misc/create_inode.c
-+++ b/misc/create_inode.c
-@@ -979,6 +979,13 @@ errcode_t populate_fs2(ext2_filsys fs, ext2_ino_t parent_ino,
- return retval;
- }
-
-+ retval = set_inode_xattr(fs, root, source_dir);
-+ if (retval) {
-+ com_err(__func__, retval,
-+ _("while setting xattrs for \"%s\""), source_dir);
-+ goto out;
-+ }
-+
- file_info.path_len = 0;
- file_info.path_max_len = 255;
- file_info.path = calloc(file_info.path_max_len, 1);
-@@ -987,6 +994,7 @@ errcode_t populate_fs2(ext2_filsys fs, ext2_ino_t parent_ino,
- &file_info, fs_callbacks);
-
- free(file_info.path);
-+out:
- free(hdlinks.hdl);
- return retval;
- }
---
-2.11.1
-
--
2.31.1

Join yocto@lists.yoctoproject.org to automatically receive all group messages.