summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2010-08-09 10:09:47 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2011-02-01 09:17:08 +0100
commitb89d518ee7a35613a5cffbf11afc54798ededf6d (patch)
tree6ec64e5f4d5084229645303092d6806842fa5876
parentf925bbc67628d38d2f3401786402fcfbcaa94554 (diff)
downloadptxdist-b89d518ee7a35613a5cffbf11afc54798ededf6d.tar.gz
ptxdist-b89d518ee7a35613a5cffbf11afc54798ededf6d.tar.xz
libcap: added new packet
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r--patches/libcap-2.20/0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch (renamed from patches/libcap-2.19/0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch)0
-rw-r--r--patches/libcap-2.20/series (renamed from patches/libcap-2.19/series)0
-rw-r--r--rules/host-libcap.make1
-rw-r--r--rules/libcap.make6
4 files changed, 4 insertions, 3 deletions
diff --git a/patches/libcap-2.19/0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch b/patches/libcap-2.20/0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch
index 418cd55b4..418cd55b4 100644
--- a/patches/libcap-2.19/0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch
+++ b/patches/libcap-2.20/0001-Make.Rules-don-t-overwrite-CFLAGS-and-LDFLAGS.patch
diff --git a/patches/libcap-2.19/series b/patches/libcap-2.20/series
index 9d04ff6ac..9d04ff6ac 100644
--- a/patches/libcap-2.19/series
+++ b/patches/libcap-2.20/series
diff --git a/rules/host-libcap.make b/rules/host-libcap.make
index 0c753b8e4..3e3b22f8d 100644
--- a/rules/host-libcap.make
+++ b/rules/host-libcap.make
@@ -18,6 +18,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBCAP) += host-libcap
# Prepare
# ----------------------------------------------------------------------------
+HOST_LIBCAP_CONF_TOOL := autoconf
HOST_LIBCAP_MAKE_OPT := prefix= PAM_CAP=no LIBATTR=no lib=lib
HOST_LIBCAP_INSTALL_OPT := $(HOST_LIBCAP_MAKE_OPT) install
diff --git a/rules/libcap.make b/rules/libcap.make
index 25549177e..9fd4cefae 100644
--- a/rules/libcap.make
+++ b/rules/libcap.make
@@ -16,7 +16,7 @@ PACKAGES-$(PTXCONF_LIBCAP) += libcap
#
# Paths and names
#
-LIBCAP_VERSION := 2.19
+LIBCAP_VERSION := 2.20
LIBCAP := libcap-$(LIBCAP_VERSION)
LIBCAP_SUFFIX := tar.bz2
LIBCAP_URL := http://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$(LIBCAP).$(LIBCAP_SUFFIX)
@@ -42,7 +42,7 @@ LIBCAP_INSTALL_OPT := $(LIBCAP_MAKE_OPT) install
$(STATEDIR)/libcap.targetinstall:
@$(call targetinfo)
- @$(call install_init, libcap)
+ @$(call install_init, libcap)
@$(call install_fixup, libcap,PRIORITY,optional)
@$(call install_fixup, libcap,SECTION,base)
@$(call install_fixup, libcap,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
@@ -50,7 +50,7 @@ $(STATEDIR)/libcap.targetinstall:
@$(call install_copy, libcap, 0, 0, 0755, -, /sbin/getpcaps)
@$(call install_copy, libcap, 0, 0, 0755, -, /sbin/capsh)
- @$(call install_lib, libcap, 0, 0, 0644, libcap)
+ @$(call install_lib, libcap, 0, 0, 0644, libcap)
@$(call install_finish, libcap)