diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-18 07:48:13 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-19 18:46:04 +0200 |
commit | 48f4e6242f2b181f424bb4c3ea162d96ddf9ac2a (patch) | |
tree | 2b32c7e3bbd964c469b1172aeb41da5be25cd204 | |
parent | 4c8640ea7c198a4db54b7c9434921a7e192f6fa3 (diff) | |
download | ptxdist-48f4e6242f2b181f424bb4c3ea162d96ddf9ac2a.tar.gz ptxdist-48f4e6242f2b181f424bb4c3ea162d96ddf9ac2a.tar.xz |
ecryptfs-utils: fix building with new attr
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r-- | patches/ecryptfs-utils_111/0001-use-sys-xattr.h-instead-of-attr-xattr.h.patch | 25 | ||||
-rw-r--r-- | patches/ecryptfs-utils_111/series | 4 | ||||
-rw-r--r-- | rules/ecryptfs-utils.in | 1 |
3 files changed, 29 insertions, 1 deletions
diff --git a/patches/ecryptfs-utils_111/0001-use-sys-xattr.h-instead-of-attr-xattr.h.patch b/patches/ecryptfs-utils_111/0001-use-sys-xattr.h-instead-of-attr-xattr.h.patch new file mode 100644 index 000000000..cdedda3b4 --- /dev/null +++ b/patches/ecryptfs-utils_111/0001-use-sys-xattr.h-instead-of-attr-xattr.h.patch @@ -0,0 +1,25 @@ +From: Michael Olbrich <m.olbrich@pengutronix.de> +Date: Wed, 18 Sep 2019 07:46:17 +0200 +Subject: [PATCH] use sys/xattr.h instead of attr/xattr.h + +attr/xattr.h is gone in the latest attr version and sys/xattr.h provides +the same functionality. + +Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> +--- + tests/kernel/lp-509180/test.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/kernel/lp-509180/test.c b/tests/kernel/lp-509180/test.c +index 60cd0170f7f9..171f7a50d446 100644 +--- a/tests/kernel/lp-509180/test.c ++++ b/tests/kernel/lp-509180/test.c +@@ -26,7 +26,7 @@ + #include <fcntl.h> + #include <sys/types.h> + #include <sys/stat.h> +-#include <attr/xattr.h> ++#include <sys/xattr.h> + + #define TEST_ERROR (2) + diff --git a/patches/ecryptfs-utils_111/series b/patches/ecryptfs-utils_111/series new file mode 100644 index 000000000..767b41ea6 --- /dev/null +++ b/patches/ecryptfs-utils_111/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-use-sys-xattr.h-instead-of-attr-xattr.h.patch +# 5324b1ff10f48f8440ff2abb0854a231 - git-ptx-patches magic diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in index e8bf0c3ce..5087f79d3 100644 --- a/rules/ecryptfs-utils.in +++ b/rules/ecryptfs-utils.in @@ -6,7 +6,6 @@ menuconfig ECRYPTFS_UTILS select KEYUTILS select NSS select HOST_INTLTOOL - select ATTR if ECRYPTFS_UTILS_TESTS select BASH if ECRYPTFS_UTILS_TESTS select COREUTILS if ECRYPTFS_UTILS_TESTS select COREUTILS_DF if ECRYPTFS_UTILS_TESTS |