* [Buildroot] [PATCH 0/3] libcap, pax-utils: fixes, autotools and bump (branch yem/fixes)
@ 2016-03-06 23:04 Yann E. MORIN
2016-03-06 23:04 ` [Buildroot] [PATCH 1/3] package/libcap: install .pc file unconditionally Yann E. MORIN
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Yann E. MORIN @ 2016-03-06 23:04 UTC (permalink / raw)
To: buildroot
Hello All!
This small series fixes libcap to install its .pc file even when
building static-only.
It also changes pax-utils to use autotools.
Finally, it bumps libcap.
Regards,
Yann E. MORIN.
The following changes since commit b904c090bdf1ec54648d0cef7a0e66024e4816c8:
zsh: don't use host pcre-config (2016-03-06 21:38:04 +0100)
are available in the git repository at:
git://git.busybox.net/~ymorin/git/buildroot yem/fixes
for you to fetch changes up to 16d98d1d5774c485cce2d14dcc24ca8f698fc048:
package/libcap: bump version (2016-03-07 00:00:10 +0100)
----------------------------------------------------------------
Yann E. MORIN (3):
package/libcap: install .pc file unconditionally
package/pax-utils: switch to autotools
package/libcap: bump version
...-build-system-fixes-for-cross-compilation.patch | 53 +++++++++++++++++++++
package/libcap/0001-build-system.patch | 54 ----------------------
...t-install-into-install-shared-install-sta.patch | 48 +++++++++++++++++++
.../libcap/0002-split-static-shared-install.patch | 30 ------------
...nge-the-location-we-include-linux-xattr.h.patch | 46 ------------------
package/libcap/libcap.hash | 2 +-
package/libcap/libcap.mk | 8 ++--
package/pax-utils/pax-utils.mk | 35 ++++++--------
8 files changed, 121 insertions(+), 155 deletions(-)
create mode 100644 package/libcap/0001-build-system-fixes-for-cross-compilation.patch
delete mode 100644 package/libcap/0001-build-system.patch
create mode 100644 package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
delete mode 100644 package/libcap/0002-split-static-shared-install.patch
delete mode 100644 package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/3] package/libcap: install .pc file unconditionally
2016-03-06 23:04 [Buildroot] [PATCH 0/3] libcap, pax-utils: fixes, autotools and bump (branch yem/fixes) Yann E. MORIN
@ 2016-03-06 23:04 ` Yann E. MORIN
2016-03-06 23:07 ` Thomas Petazzoni
2016-03-06 23:04 ` [Buildroot] [PATCH 2/3] package/pax-utils: switch to autotools Yann E. MORIN
2016-03-06 23:04 ` [Buildroot] [PATCH 3/3] package/libcap: bump version Yann E. MORIN
2 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2016-03-06 23:04 UTC (permalink / raw)
To: buildroot
And re-format patches as git patches.
Fixes:
http://autobuild.buildroot.org/results/c13/c13fb87c2e4739106e256f34fff93696b0133bf6/
http://autobuild.buildroot.org/results/f82/f822801f9b811e1a0fb4627f6b528116375cacfe/
http://autobuild.buildroot.org/results/07c/07c0315a35089a8d3e8eb1a305dcd8bf1fb882ee/
and many more...
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
...build-system-fixes-for-cross-compilation.patch} | 47 +++++++++++++---------
...-install-into-install-shared-install-sta.patch} | 26 ++++++++++--
package/libcap/libcap.mk | 2 +-
3 files changed, 52 insertions(+), 23 deletions(-)
rename package/libcap/{0001-build-system.patch => 0001-build-system-fixes-for-cross-compilation.patch} (69%)
rename package/libcap/{0002-split-static-shared-install.patch => 0002-libcap-split-install-into-install-shared-install-sta.patch} (52%)
diff --git a/package/libcap/0001-build-system.patch b/package/libcap/0001-build-system-fixes-for-cross-compilation.patch
similarity index 69%
rename from package/libcap/0001-build-system.patch
rename to package/libcap/0001-build-system-fixes-for-cross-compilation.patch
index 8915a69..705bbc7 100644
--- a/package/libcap/0001-build-system.patch
+++ b/package/libcap/0001-build-system-fixes-for-cross-compilation.patch
@@ -1,26 +1,21 @@
+From 7f48413ef1688df0d7fc25e477f4e6c0c55edfac Mon Sep 17 00:00:00 2001
+From: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Date: Sun, 6 Mar 2016 22:52:02 +0100
+Subject: [PATCH] build-system: fixes for cross-compilation
+
Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB
Also install the shared lib +x
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-diff -Nura libcap-2.22.orig/libcap/Makefile libcap-2.22/libcap/Makefile
---- libcap-2.22.orig/libcap/Makefile 2010-08-08 19:26:04.000000000 -0300
-+++ libcap-2.22/libcap/Makefile 2011-12-14 11:33:51.761800334 -0300
-@@ -65,7 +65,7 @@
- install -m 0644 include/sys/capability.h $(INCDIR)/sys
- mkdir -p -m 0755 $(LIBDIR)
- install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
-- install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
-+ install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
- ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
- ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
- ifeq ($(FAKEROOT),)
-diff -Nura libcap-2.22.orig/Make.Rules libcap-2.22/Make.Rules
---- libcap-2.22.orig/Make.Rules 2011-07-24 23:18:23.000000000 -0300
-+++ libcap-2.22/Make.Rules 2011-12-14 11:33:28.707278685 -0300
-@@ -47,25 +47,25 @@
- KERNEL_HEADERS := $(topdir)/libcap/include
- IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
+diff --git a/Make.Rules b/Make.Rules
+index ec1c474..8a8fc50 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -48,25 +48,25 @@ MINOR=24
+ KERNEL_HEADERS := $(topdir)/libcap/include/uapi
+ IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
-CC := gcc
-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
@@ -52,3 +47,19 @@ diff -Nura libcap-2.22.orig/Make.Rules libcap-2.22/Make.Rules
INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
LIBATTR := yes
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 20ab00f..97fea3f 100644
+--- a/libcap/Makefile
++++ b/libcap/Makefile
+@@ -75,7 +75,7 @@ install: all
+ install -m 0644 include/sys/capability.h $(INCDIR)/sys
+ mkdir -p -m 0755 $(LIBDIR)
+ install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
+- install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
++ install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
+ ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
+ ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
+ ifeq ($(FAKEROOT),)
+--
+1.9.1
+
diff --git a/package/libcap/0002-split-static-shared-install.patch b/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
similarity index 52%
rename from package/libcap/0002-split-static-shared-install.patch
rename to package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
index 21e7f2a..a7a9d13 100644
--- a/package/libcap/0002-split-static-shared-install.patch
+++ b/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
@@ -1,15 +1,20 @@
-libcap: split install into install-shared/install-static
+From 8d7339169b9a5df2082731fe5468923be4be39af Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Sun, 6 Mar 2016 22:53:24 +0100
+Subject: [PATCH] libcap: split install into install-shared/install-static
In order to support static only builds, split the install target into
install-shared and install-static targets.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+[yann.morin.1998 at free.fr: install the .pc file in the common rule]
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-Index: b/libcap/Makefile
-===================================================================
+diff --git a/libcap/Makefile b/libcap/Makefile
+index 97fea3f..7ac45dd 100644
--- a/libcap/Makefile
+++ b/libcap/Makefile
-@@ -60,11 +60,17 @@
+@@ -70,19 +70,25 @@ $(MINLIBNAME): $(OBJS)
cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
@@ -19,6 +24,8 @@ Index: b/libcap/Makefile
+install-common:
mkdir -p -m 0755 $(INCDIR)/sys
install -m 0644 include/sys/capability.h $(INCDIR)/sys
++ mkdir -p -m 0755 $(PKGCONFIGDIR)
++ install -m 0644 libcap.pc $(PKGCONFIGDIR)/libcap.pc
mkdir -p -m 0755 $(LIBDIR)
+
+install-static: install-common
@@ -28,3 +35,14 @@ Index: b/libcap/Makefile
install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
+ ifeq ($(FAKEROOT),)
+ -/sbin/ldconfig
+ endif
+- mkdir -p -m 0755 $(PKGCONFIGDIR)
+- install -m 0644 libcap.pc $(PKGCONFIGDIR)/libcap.pc
+
+ clean:
+ $(LOCALCLEAN)
+--
+1.9.1
+
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 252c4bb..8625139 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -23,7 +23,7 @@ endif
HOST_LIBCAP_DEPENDENCIES = host-attr
ifeq ($(BR2_STATIC_LIBS),y)
-LIBCAP_MAKE_TARGET = libcap.a
+LIBCAP_MAKE_TARGET = libcap.a libcap.pc
LIBCAP_MAKE_INSTALL_TARGET = install-static
else
LIBCAP_MAKE_TARGET = all
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/3] package/pax-utils: switch to autotools
2016-03-06 23:04 [Buildroot] [PATCH 0/3] libcap, pax-utils: fixes, autotools and bump (branch yem/fixes) Yann E. MORIN
2016-03-06 23:04 ` [Buildroot] [PATCH 1/3] package/libcap: install .pc file unconditionally Yann E. MORIN
@ 2016-03-06 23:04 ` Yann E. MORIN
2016-03-06 23:04 ` [Buildroot] [PATCH 3/3] package/libcap: bump version Yann E. MORIN
2 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2016-03-06 23:04 UTC (permalink / raw)
To: buildroot
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
[yann.morin.1998 at free.fr: independently done a patch similar to the one
by Thomas]
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/pax-utils/pax-utils.mk | 35 +++++++++++++++--------------------
1 file changed, 15 insertions(+), 20 deletions(-)
diff --git a/package/pax-utils/pax-utils.mk b/package/pax-utils/pax-utils.mk
index fc2e0ca..747c2bb 100644
--- a/package/pax-utils/pax-utils.mk
+++ b/package/pax-utils/pax-utils.mk
@@ -10,9 +10,21 @@ PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz
PAX_UTILS_LICENSE = GPLv2
PAX_UTILS_LICENSE_FILES = COPYING
+PAX_UTILS_DEPENDENCIES = host-pkgconf
+PAX_UTILS_CONF_OPTS = --without-python
+
ifeq ($(BR2_PACKAGE_LIBCAP),y)
PAX_UTILS_DEPENDENCIES += libcap
-PAX_UTILS_USE_CAP = USE_CAP=yes
+PAX_UTILS_CONF_OPTS += --with-caps
+else
+PAX_UTILS_CONF_OPTS += --without-caps
+endif
+
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+PAX_UTILS_DEPENDENCIES += libseccomp
+PAX_UTILS_CONF_OPTS += --with-seccomp
+else
+PAX_UTILS_CONF_OPTS += --without-seccomp
endif
# libcap is only useful for pspax (a running system)
@@ -26,22 +38,5 @@ endef
endif
PAX_UTILS_POST_INSTALL_TARGET_HOOKS += PAX_UTILS_REMOVE_BASH_TOOLS
-define HOST_PAX_UTILS_BUILD_CMDS
- $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)
-endef
-
-define PAX_UTILS_BUILD_CMDS
- $(MAKE) $(TARGET_CONFIGURE_OPTS) $(PAX_UTILS_USE_CAP) -C $(@D)
-endef
-
-define HOST_PAX_UTILS_INSTALL_CMDS
- $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) DESTDIR="$(HOST_DIR)" install
-endef
-
-define PAX_UTILS_INSTALL_TARGET_CMDS
- $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
- DESTDIR="$(TARGET_DIR)" install
-endef
-
-$(eval $(generic-package))
-$(eval $(host-generic-package))
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/3] package/libcap: bump version
2016-03-06 23:04 [Buildroot] [PATCH 0/3] libcap, pax-utils: fixes, autotools and bump (branch yem/fixes) Yann E. MORIN
2016-03-06 23:04 ` [Buildroot] [PATCH 1/3] package/libcap: install .pc file unconditionally Yann E. MORIN
2016-03-06 23:04 ` [Buildroot] [PATCH 2/3] package/pax-utils: switch to autotools Yann E. MORIN
@ 2016-03-06 23:04 ` Yann E. MORIN
2 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2016-03-06 23:04 UTC (permalink / raw)
To: buildroot
Refresh our patches, and drop the backport from upstream.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
...-build-system-fixes-for-cross-compilation.patch | 26 ++++--------
...t-install-into-install-shared-install-sta.patch | 32 +++++++--------
...nge-the-location-we-include-linux-xattr.h.patch | 46 ----------------------
package/libcap/libcap.hash | 2 +-
package/libcap/libcap.mk | 6 +--
5 files changed, 27 insertions(+), 85 deletions(-)
delete mode 100644 package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch
diff --git a/package/libcap/0001-build-system-fixes-for-cross-compilation.patch b/package/libcap/0001-build-system-fixes-for-cross-compilation.patch
index 705bbc7..de24090 100644
--- a/package/libcap/0001-build-system-fixes-for-cross-compilation.patch
+++ b/package/libcap/0001-build-system-fixes-for-cross-compilation.patch
@@ -1,19 +1,19 @@
-From 7f48413ef1688df0d7fc25e477f4e6c0c55edfac Mon Sep 17 00:00:00 2001
+From d8d70559a279706c206761dfaf665d2197934123 Mon Sep 17 00:00:00 2001
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
Date: Sun, 6 Mar 2016 22:52:02 +0100
Subject: [PATCH] build-system: fixes for cross-compilation
Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB
-Also install the shared lib +x
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+[yann.morin.1998 at free.fr: dont chmod +x the shared lib]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff --git a/Make.Rules b/Make.Rules
-index ec1c474..8a8fc50 100644
+index 8347b26..8a07a3f 100644
--- a/Make.Rules
+++ b/Make.Rules
-@@ -48,25 +48,25 @@ MINOR=24
+@@ -48,26 +48,26 @@ MINOR=25
KERNEL_HEADERS := $(topdir)/libcap/include/uapi
IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
@@ -37,6 +37,7 @@ index ec1c474..8a8fc50 100644
LD=$(CC) -Wl,-x -shared
-LDFLAGS := #-g
+LDFLAGS ?= #-g
+ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
SYSTEM_HEADERS = /usr/include
INCS=$(topdir)/libcap/include/sys/capability.h
@@ -44,22 +45,9 @@ index ec1c474..8a8fc50 100644
CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
-PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
+PAM_CAP = no
- INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
+ INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)
DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)
- LIBATTR := yes
-diff --git a/libcap/Makefile b/libcap/Makefile
-index 20ab00f..97fea3f 100644
---- a/libcap/Makefile
-+++ b/libcap/Makefile
-@@ -75,7 +75,7 @@ install: all
- install -m 0644 include/sys/capability.h $(INCDIR)/sys
- mkdir -p -m 0755 $(LIBDIR)
- install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
-- install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
-+ install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
- ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
- ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
- ifeq ($(FAKEROOT),)
+
--
1.9.1
diff --git a/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch b/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
index a7a9d13..a8579b7 100644
--- a/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
+++ b/package/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch
@@ -1,4 +1,4 @@
-From 8d7339169b9a5df2082731fe5468923be4be39af Mon Sep 17 00:00:00 2001
+From af21635665ab568f3333ff9fe8b474f4950e5acb Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 6 Mar 2016 22:53:24 +0100
Subject: [PATCH] libcap: split install into install-shared/install-static
@@ -11,10 +11,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
diff --git a/libcap/Makefile b/libcap/Makefile
-index 97fea3f..7ac45dd 100644
+index d189777..44ddb27 100644
--- a/libcap/Makefile
+++ b/libcap/Makefile
-@@ -70,19 +70,25 @@ $(MINLIBNAME): $(OBJS)
+@@ -62,19 +62,25 @@ $(MINLIBNAME): $(OBJS)
cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
@@ -22,24 +22,24 @@ index 97fea3f..7ac45dd 100644
+install: install-shared install-static
+
+install-common:
- mkdir -p -m 0755 $(INCDIR)/sys
- install -m 0644 include/sys/capability.h $(INCDIR)/sys
-+ mkdir -p -m 0755 $(PKGCONFIGDIR)
-+ install -m 0644 libcap.pc $(PKGCONFIGDIR)/libcap.pc
- mkdir -p -m 0755 $(LIBDIR)
+ mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys
+ install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys
++ mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR)
++ install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc
+
-+install-static: install-common
- install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
++install-static: $(STALIBNAME) install-common
+ mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR)
+ install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME)
+
-+install-shared: install-common
- install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
- ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
- ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
++install-shared: $(MINLIBNAME) install-common
+ install -m 0644 $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MINLIBNAME)
+ ln -sf $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MAJLIBNAME)
+ ln -sf $(MAJLIBNAME) $(FAKEROOT)$(LIBDIR)/$(LIBNAME)
ifeq ($(FAKEROOT),)
-/sbin/ldconfig
endif
-- mkdir -p -m 0755 $(PKGCONFIGDIR)
-- install -m 0644 libcap.pc $(PKGCONFIGDIR)/libcap.pc
+- mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR)
+- install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc
clean:
$(LOCALCLEAN)
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
deleted file mode 100644
index 7858780..0000000
--- a/package/libcap/0003-Change-the-location-we-include-linux-xattr.h.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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
-
diff --git a/package/libcap/libcap.hash b/package/libcap/libcap.hash
index 75822e5..a1dcd62 100644
--- a/package/libcap/libcap.hash
+++ b/package/libcap/libcap.hash
@@ -1,2 +1,2 @@
# https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc
-sha256 cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65 libcap-2.24.tar.xz
+sha256 693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162 libcap-2.25.tar.xz
diff --git a/package/libcap/libcap.mk b/package/libcap/libcap.mk
index 8625139..cdbb1cb 100644
--- a/package/libcap/libcap.mk
+++ b/package/libcap/libcap.mk
@@ -4,13 +4,13 @@
#
################################################################################
-LIBCAP_VERSION = 2.24
+LIBCAP_VERSION = 2.25
LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2
LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz
LIBCAP_LICENSE = GPLv2 or BSD-3c
LIBCAP_LICENSE_FILES = License
-LIBCAP_DEPENDENCIES = host-libcap
+LIBCAP_DEPENDENCIES = host-libcap host-gperf
LIBCAP_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_ATTR),y)
@@ -20,7 +20,7 @@ else
LIBCAP_HAVE_LIBATTR = no
endif
-HOST_LIBCAP_DEPENDENCIES = host-attr
+HOST_LIBCAP_DEPENDENCIES = host-attr host-gperf
ifeq ($(BR2_STATIC_LIBS),y)
LIBCAP_MAKE_TARGET = libcap.a libcap.pc
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/3] package/libcap: install .pc file unconditionally
2016-03-06 23:04 ` [Buildroot] [PATCH 1/3] package/libcap: install .pc file unconditionally Yann E. MORIN
@ 2016-03-06 23:07 ` Thomas Petazzoni
0 siblings, 0 replies; 5+ messages in thread
From: Thomas Petazzoni @ 2016-03-06 23:07 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Mon, 7 Mar 2016 00:04:54 +0100, Yann E. MORIN wrote:
> And re-format patches as git patches.
>
> Fixes:
> http://autobuild.buildroot.org/results/c13/c13fb87c2e4739106e256f34fff93696b0133bf6/
> http://autobuild.buildroot.org/results/f82/f822801f9b811e1a0fb4627f6b528116375cacfe/
> http://autobuild.buildroot.org/results/07c/07c0315a35089a8d3e8eb1a305dcd8bf1fb882ee/
> and many more...
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
> ...build-system-fixes-for-cross-compilation.patch} | 47 +++++++++++++---------
> ...-install-into-install-shared-install-sta.patch} | 26 ++++++++++--
> package/libcap/libcap.mk | 2 +-
> 3 files changed, 52 insertions(+), 23 deletions(-)
> rename package/libcap/{0001-build-system.patch => 0001-build-system-fixes-for-cross-compilation.patch} (69%)
> rename package/libcap/{0002-split-static-shared-install.patch => 0002-libcap-split-install-into-install-shared-install-sta.patch} (52%)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-06 23:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-06 23:04 [Buildroot] [PATCH 0/3] libcap, pax-utils: fixes, autotools and bump (branch yem/fixes) Yann E. MORIN
2016-03-06 23:04 ` [Buildroot] [PATCH 1/3] package/libcap: install .pc file unconditionally Yann E. MORIN
2016-03-06 23:07 ` Thomas Petazzoni
2016-03-06 23:04 ` [Buildroot] [PATCH 2/3] package/pax-utils: switch to autotools Yann E. MORIN
2016-03-06 23:04 ` [Buildroot] [PATCH 3/3] package/libcap: bump version Yann E. MORIN
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.