diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2014-11-02 09:50:40 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-11-02 21:46:41 +0100 |
| commit | 3fbe7b67e71ded1b6dfba600bba87bcca5491f8b (patch) | |
| tree | f095304c5620f9ed9c87c7676a871b097e513e58 | |
| parent | a0b5052e9dec110903e1887e17bca314df228bb4 (diff) | |
libcap: add upstream xattr patch
Add upstream patch for xattr include fix.
Also rename patches to git naming convention.
Fixes:
http://autobuild.buildroot.net/results/2ef/2efb25356bc87ba0e1be08214eaa28ac064ad6c3/
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
| -rw-r--r-- | package/libcap/0001-build-system.patch (renamed from package/libcap/libcap-01-build-system.patch) | 0 | ||||
| -rw-r--r-- | package/libcap/0002-split-static-shared-install.patch (renamed from package/libcap/libcap-02-split-static-shared-install.patch) | 0 | ||||
| -rw-r--r-- | package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch | 46 |
3 files changed, 46 insertions, 0 deletions
diff --git a/package/libcap/libcap-01-build-system.patch b/package/libcap/0001-build-system.patch index 8915a69ec..8915a69ec 100644 --- a/package/libcap/libcap-01-build-system.patch +++ b/package/libcap/0001-build-system.patch diff --git a/package/libcap/libcap-02-split-static-shared-install.patch b/package/libcap/0002-split-static-shared-install.patch index 21e7f2afc..21e7f2afc 100644 --- a/package/libcap/libcap-02-split-static-shared-install.patch +++ b/package/libcap/0002-split-static-shared-install.patch diff --git a/package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch b/package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch new file mode 100644 index 000000000..78587802a --- /dev/null +++ b/package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch @@ -0,0 +1,46 @@ +From 84fb6007dcc7f6b6da9f6dab77a487c22b6c7beb Mon Sep 17 00:00:00 2001 +From: Andrew G Morgan <morgan@kernel.org> +Date: Sun, 9 Mar 2014 16:33:15 -0700 +Subject: [PATCH] Change the location we include linux/xattr.h + +This header stuff seems a bit fragile, but Serge reports including +it in sys/capability.h was causing a lot of trouble building dependent +app packages. + +From the perspective of libcap, this API is only needed internally in +cap_file.c so we put an include there. + +Status: upstream. + +Signed-off-by: Andrew G Morgan <morgan@kernel.org> +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> +--- + +diff --git a/libcap/cap_file.c b/libcap/cap_file.c +index d3dc1d0..553c2d2 100644 +--- a/libcap/cap_file.c ++++ b/libcap/cap_file.c +@@ -10,6 +10,8 @@ + #include <sys/stat.h> + #include <unistd.h> + ++#include <linux/xattr.h> ++ + #define XATTR_SECURITY_PREFIX "security." + + #include "libcap.h" +diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h +index 64ac50e..dddc75b 100644 +--- a/libcap/include/sys/capability.h ++++ b/libcap/include/sys/capability.h +@@ -27,7 +27,6 @@ extern "C" { + #define __user + #endif + #include <linux/capability.h> +-#include <linux/xattr.h> + + /* + * POSIX capability types +-- +2.0.4 + |