summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2020-10-18 17:31:20 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2020-10-18 17:31:20 (GMT)
commit7bb97289f3b92a6adba763ed3a0a2a28f3e9bac3 (patch)
tree7b45ae82b4047ce8ed99b1bfaebe101faf378cb6
parent552b37e78189eb1954deeaff2986297c87476d1a (diff)
parented779425dc04c5138c51b97a6085883e39474d6e (diff)
Merge branch 'master' of gogs.waldemar-brodkorb.de:oss/openadk
-rw-r--r--package/libcap/Makefile6
-rw-r--r--package/libcap/patches/patch-Make_Rules49
-rw-r--r--package/libcap/patches/patch-Makefile14
-rw-r--r--package/libcap/patches/patch-libcap_Makefile13
-rw-r--r--package/libcap/patches/patch-libcap__makenames_c11
-rw-r--r--package/libcap/patches/patch-progs_Makefile12
-rw-r--r--target/config/Config.in.runtime2
7 files changed, 9 insertions, 98 deletions
diff --git a/package/libcap/Makefile b/package/libcap/Makefile
index ffceb83..98002b9 100644
--- a/package/libcap/Makefile
+++ b/package/libcap/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libcap
-PKG_VERSION:= 2.25
-PKG_RELEASE:= 2
-PKG_HASH:= 693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162
+PKG_VERSION:= 2.44
+PKG_RELEASE:= 1
+PKG_HASH:= 92188359cd5be86e8e5bd3f6483ac6ce582264f912398937ef763def2205c8e1
PKG_DESCR:= capabilities library
PKG_SECTION:= libs/misc
PKG_URL:= http://www.friedhoff.org/posixfilecaps.html
diff --git a/package/libcap/patches/patch-Make_Rules b/package/libcap/patches/patch-Make_Rules
index fa587e6..a62f11e 100644
--- a/package/libcap/patches/patch-Make_Rules
+++ b/package/libcap/patches/patch-Make_Rules
@@ -1,50 +1,11 @@
---- libcap-2.25.orig/Make.Rules 2016-01-31 02:14:53.000000000 +0100
-+++ libcap-2.25/Make.Rules 2016-11-21 12:54:45.000000000 +0100
-@@ -13,21 +13,14 @@ FAKEROOT=$(DESTDIR)
+--- libcap-2.44.orig/Make.Rules 2020-10-05 03:42:13.000000000 +0200
++++ libcap-2.44/Make.Rules 2020-10-18 13:17:04.354503478 +0200
+@@ -18,7 +18,7 @@ FAKEROOT=$(DESTDIR)
# administrative operations that could be needed to recover a system.
ifndef lib
-lib=$(shell ldd /usr/bin/ld|egrep "ld-linux|ld.so"|cut -d/ -f2)
-+lib=lib
++lib=/usr/lib
endif
--ifdef prefix
--exec_prefix=$(prefix)
--lib_prefix=$(exec_prefix)
--inc_prefix=$(lib_prefix)
--man_prefix=$(prefix)/share
--else
- prefix=/usr
--exec_prefix=
-+exec_prefix=$(prefix)
- lib_prefix=$(exec_prefix)
- inc_prefix=$(prefix)
- man_prefix=$(prefix)/share
--endif
-
- # Target directories
-
-@@ -48,10 +41,10 @@ MINOR=25
- 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
--BUILD_CC := $(CC)
--BUILD_CFLAGS := $(CFLAGS) $(IPATH)
-+CC ?= gcc
-+CFLAGS ?= -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+BUILD_CC := $(CC_FOR_BUILD)
-+BUILD_CFLAGS := $(CFLAGS_FOR_BUILD) $(IPATH)
- AR := ar
- RANLIB := ranlib
- DEBUG = -g #-DDEBUG
-@@ -68,7 +61,7 @@ INCS=$(topdir)/libcap/include/sys/capabi
- LDFLAGS += -L$(topdir)/libcap
- CFLAGS += -Dlinux $(WARNINGS) $(DEBUG)
- PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi)
--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)
-
- # When installing setcap, set its inheritable bit to be able to place
+ ifdef prefix
diff --git a/package/libcap/patches/patch-Makefile b/package/libcap/patches/patch-Makefile
deleted file mode 100644
index 51603e6..0000000
--- a/package/libcap/patches/patch-Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- libcap-2.25.orig/Makefile 2014-05-31 22:11:05.000000000 +0200
-+++ libcap-2.25/Makefile 2016-09-23 10:32:34.156211429 +0200
-@@ -10,11 +10,7 @@ include Make.Rules
-
- all install clean: %: %-here
- $(MAKE) -C libcap $@
--ifneq ($(PAM_CAP),no)
-- $(MAKE) -C pam_cap $@
--endif
- $(MAKE) -C progs $@
-- $(MAKE) -C doc $@
-
- all-here:
-
diff --git a/package/libcap/patches/patch-libcap_Makefile b/package/libcap/patches/patch-libcap_Makefile
deleted file mode 100644
index bbe31f5..0000000
--- a/package/libcap/patches/patch-libcap_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- libcap-2.25.orig/libcap/Makefile 2016-01-31 01:01:41.000000000 +0100
-+++ libcap-2.25/libcap/Makefile 2016-09-23 15:09:26.623578683 +0200
-@@ -63,9 +63,8 @@ cap_text.o: cap_text.c $(USE_GPERF_OUTPU
- $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
-
- install: all
-- mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys
-+ mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys $(FAKEROOT)$(LIBDIR)
- install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys
-- mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR)
- install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME)
- install -m 0644 $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MINLIBNAME)
- ln -sf $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MAJLIBNAME)
diff --git a/package/libcap/patches/patch-libcap__makenames_c b/package/libcap/patches/patch-libcap__makenames_c
deleted file mode 100644
index 641bd65..0000000
--- a/package/libcap/patches/patch-libcap__makenames_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libcap-2.22.orig/libcap/_makenames.c 2008-12-04 08:03:12.000000000 +0100
-+++ libcap-2.22/libcap/_makenames.c 2013-10-28 10:54:58.000000000 +0100
-@@ -7,7 +7,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
--#include <sys/capability.h>
-+#include "include/sys/capability.h"
-
- /*
- * #include 'sed' generated array
diff --git a/package/libcap/patches/patch-progs_Makefile b/package/libcap/patches/patch-progs_Makefile
deleted file mode 100644
index c13d1dd..0000000
--- a/package/libcap/patches/patch-progs_Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- libcap-2.25.orig/progs/Makefile 2016-01-31 01:01:41.000000000 +0100
-+++ libcap-2.25/progs/Makefile 2016-09-23 10:37:55.480689559 +0200
-@@ -26,9 +26,6 @@ install: all
- for p in $(PROGS) ; do \
- install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \
- done
--ifeq ($(RAISE_SETFCAP),yes)
-- $(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap
--endif
-
- clean:
- $(LOCALCLEAN)
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index bc84e5c..0d1d015 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -533,7 +533,7 @@ endchoice
# workaround for USB ethernet f.e. Raspberry Pi 2/3
config ADK_RUNTIME_WAIT_FOR_ETHERNET
- bool
+ bool "Wait for ethernet to come up on boot"
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI2
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3
default y if ADK_TARGET_SYSTEM_RASPBERRY_PI3_64