yocto.lists.yoctoproject.org archive mirror
 help / color / mirror / Atom feed
From: Jason Andryuk <jandryuk@gmail.com>
To: yocto@lists.yoctoproject.org
Cc: Joe MacDonald <joe_macdonald@mentor.com>,
	Philip Tricca <flihp@twobit.us>, Yi Zhao <yi.zhao@windriver.com>,
	Jason Andryuk <jandryuk@gmail.com>
Subject: [meta-selinux][dunfell][PATCH 2/3] Remove e2fsprogs override
Date: Wed, 27 Oct 2021 10:03:56 -0400	[thread overview]
Message-ID: <20211027140357.66739-3-jandryuk@gmail.com> (raw)
In-Reply-To: <20211027140357.66739-1-jandryuk@gmail.com>

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 <jandryuk@gmail.com>
---
 .../e2fsprogs/e2fsprogs_%.bbappend            |  1 -
 .../e2fsprogs/e2fsprogs_selinux.inc           |  1 -
 ...t2fs-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 <flihp@twobit.us>
-
-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 */
-- 
2.31.1



  parent reply	other threads:[~2021-10-27 14:04 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-27 14:03 [meta-selinux][dunfell][PATCH 0/3] Fix dunfell build Jason Andryuk
2021-10-27 14:03 ` [meta-selinux][dunfell][PATCH 1/3] e2fsprogs: Remove misc_create_inode.c-label_rootfs.patch Jason Andryuk
2021-10-27 14:03 ` Jason Andryuk [this message]
2021-10-27 14:03 ` [meta-selinux][dunfell][PATCH 3/3] libselinux: Fix restorecon_set_sehandle.patch context Jason Andryuk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211027140357.66739-3-jandryuk@gmail.com \
    --to=jandryuk@gmail.com \
    --cc=flihp@twobit.us \
    --cc=joe_macdonald@mentor.com \
    --cc=yi.zhao@windriver.com \
    --cc=yocto@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).