From d5ea35444d83859a04792c8b2b65d761a87eae09 Mon Sep 17 00:00:00 2001 From: Jason Andryuk Date: Wed, 27 Oct 2021 10:03:56 -0400 Subject: Remove e2fsprogs override commit b2b3ea27e3e3 "e2fsprogs: Superseded by upstream." removed lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch from SRC_URI. It was no longer applied, but the file was not deleted. Do that now. e2fsprogs_%.bbappend/e2fsprogs_selinux.inc now do nothing, so remove them as well. Signed-off-by: Jason Andryuk Signed-off-by: Joe MacDonald --- recipes-devtools/e2fsprogs/e2fsprogs_%.bbappend | 1 - recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc | 1 - .../lib-ext2fs-ext2_ext_attr.h-add-xattr-index.patch | 20 -------------------- 3 files changed, 22 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 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 81fe7b7..0000000 --- a/recipes-devtools/e2fsprogs/e2fsprogs_selinux.inc +++ /dev/null @@ -1 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 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 - -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 */ -- cgit v1.2.3-54-g00ecf