Since oe-core commit [f51835e022 e2fsprogs: upgrade 1.45.6 -> 1.45.7] applied, the backport misc_create_inode.c-label_rootfs.patch is not required
The lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch is not used by the recipe, so also remove it. Signed-off-by: Hongxu Jia <[email protected]> --- .../e2fsprogs/e2fsprogs_%.bbappend | 1 - .../e2fsprogs/e2fsprogs_selinux.inc | 3 -- ...t2fs-ext2_ext_attr.h-add-xattr-index.patch | 20 --------- .../misc_create_inode.c-label_rootfs.patch | 45 ------------------- 4 files changed, 69 deletions(-) delete mode 100644 recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend delete mode 100644 recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc delete mode 100644 recipes-devtools/e2fsprogs/files/lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch delete mode 100644 recipes-devtools/e2fsprogs/files/misc_create_inode.c-label_rootfs.patch diff --git a/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend b/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend deleted file mode 100644 index 7719d3b..0000000 --- a/recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', '${BPN}_selinux.inc', '', d)} diff --git a/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc b/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc deleted file mode 100644 index 9cbb7fe..0000000 --- a/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://misc_create_inode.c-label_rootfs.patch" diff --git a/recipes-devtools/e2fsprogs/files/lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch b/recipes-devtools/e2fsprogs/files/lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch deleted file mode 100644 index b87c414..0000000 --- a/recipes-devtools/e2fsprogs/files/lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch +++ /dev/null @@ -1,20 +0,0 @@ -Add xattr name index for xattrs with the 'security' prefix. These are defined -in the ext(2|3|4)/xattr.h in the kernel. We use the EXT2 prefix for consistency -with e2fslibs naming. - -Signed-off-by: Philip Tricca <[email protected]> - -Index: e2fsprogs-1.42.9/lib/ext2fs/ext2_ext_attr.h -=================================================================== ---- e2fsprogs-1.42.9.orig/lib/ext2fs/ext2_ext_attr.h -+++ e2fsprogs-1.42.9/lib/ext2fs/ext2_ext_attr.h -@@ -15,6 +15,9 @@ - /* Maximum number of references to one attribute block */ - #define EXT2_EXT_ATTR_REFCOUNT_MAX 1024 - -+/* Name indexes */ -+#define EXT2_XATTR_INDEX_SECURITY 6 -+ - struct ext2_ext_attr_header { - __u32 h_magic; /* magic number for identification */ - __u32 h_refcount; /* reference count */ 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 <[email protected]> -To: [email protected] -Cc: [email protected] -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 <[email protected]> -Signed-off-by: Jeremy Puhlman <[email protected]> - ---- - 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.29.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#52256): https://lists.yoctoproject.org/g/yocto/message/52256 Mute This Topic: https://lists.yoctoproject.org/mt/80471889/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
