Move all to deprecated folder.
This commit is contained in:
@@ -0,0 +1,54 @@
|
||||
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>
|
||||
|
||||
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)
|
||||
|
||||
-CC := gcc
|
||||
-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
-BUILD_CC := $(CC)
|
||||
-BUILD_CFLAGS := $(CFLAGS) $(IPATH)
|
||||
-AR := ar
|
||||
-RANLIB := ranlib
|
||||
+CC ?= gcc
|
||||
+CFLAGS ?= -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
+BUILD_CC ?= $(CC)
|
||||
+BUILD_CFLAGS ?= $(CFLAGS) $(IPATH)
|
||||
+AR ?= ar
|
||||
+RANLIB ?= ranlib
|
||||
DEBUG = -g #-DDEBUG
|
||||
WARNINGS=-Wall -Wwrite-strings \
|
||||
-Wpointer-arith -Wcast-qual -Wcast-align \
|
||||
-Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wnested-externs -Winline -Wshadow
|
||||
LD=$(CC) -Wl,-x -shared
|
||||
-LDFLAGS := #-g
|
||||
+LDFLAGS ?= #-g
|
||||
|
||||
SYSTEM_HEADERS = /usr/include
|
||||
INCS=$(topdir)/libcap/include/sys/capability.h
|
||||
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)
|
||||
+PAM_CAP = no
|
||||
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
|
||||
@@ -0,0 +1,30 @@
|
||||
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>
|
||||
|
||||
Index: b/libcap/Makefile
|
||||
===================================================================
|
||||
--- a/libcap/Makefile
|
||||
+++ b/libcap/Makefile
|
||||
@@ -60,11 +60,17 @@
|
||||
cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS)
|
||||
$(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@
|
||||
|
||||
-install: all
|
||||
+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 $(LIBDIR)
|
||||
+
|
||||
+install-static: install-common
|
||||
install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)
|
||||
+
|
||||
+install-shared: install-common
|
||||
install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)
|
||||
ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)
|
||||
ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)
|
||||
@@ -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
|
||||
|
||||
28
deprecated/firmware/buildroot/package/libcap/Config.in
Normal file
28
deprecated/firmware/buildroot/package/libcap/Config.in
Normal file
@@ -0,0 +1,28 @@
|
||||
config BR2_PACKAGE_LIBCAP
|
||||
bool "libcap"
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # XATTR_NAME_CAPS
|
||||
help
|
||||
This library implements the user-space interfaces to the
|
||||
POSIX 1003.1e capabilities available in Linux kernels. These
|
||||
capabilities are a partitioning of the all powerful root
|
||||
privilege into a set of distinct privileges.
|
||||
|
||||
http://sites.google.com/site/fullycapable/
|
||||
|
||||
if BR2_PACKAGE_LIBCAP
|
||||
|
||||
config BR2_PACKAGE_LIBCAP_TOOLS
|
||||
bool "install tools"
|
||||
depends on BR2_USE_MMU
|
||||
help
|
||||
Install setcap, getcap, getpcaps and capsh tools.
|
||||
|
||||
For these tools to run properly, you should enable, in your
|
||||
kernel configuration, extended file attributes/security labels
|
||||
support for the file system type used on target system (e.g.
|
||||
CONFIG_EXT2_FS_XATTR and CONFIG_EXT2_FS_SECURITY for ext2).
|
||||
|
||||
endif
|
||||
|
||||
comment "libcap needs a toolchain w/ headers >= 3.0"
|
||||
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
|
||||
2
deprecated/firmware/buildroot/package/libcap/libcap.hash
Normal file
2
deprecated/firmware/buildroot/package/libcap/libcap.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc
|
||||
sha256 cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65 libcap-2.24.tar.xz
|
||||
79
deprecated/firmware/buildroot/package/libcap/libcap.mk
Normal file
79
deprecated/firmware/buildroot/package/libcap/libcap.mk
Normal file
@@ -0,0 +1,79 @@
|
||||
################################################################################
|
||||
#
|
||||
# libcap
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCAP_VERSION = 2.24
|
||||
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_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ATTR),y)
|
||||
LIBCAP_DEPENDENCIES += attr
|
||||
LIBCAP_HAVE_LIBATTR = yes
|
||||
else
|
||||
LIBCAP_HAVE_LIBATTR = no
|
||||
endif
|
||||
|
||||
# we don't have host-attr
|
||||
HOST_LIBCAP_DEPENDENCIES =
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
LIBCAP_MAKE_TARGET = libcap.a
|
||||
LIBCAP_MAKE_INSTALL_TARGET = install-static
|
||||
else
|
||||
LIBCAP_MAKE_TARGET = all
|
||||
LIBCAP_MAKE_INSTALL_TARGET = install
|
||||
endif
|
||||
|
||||
LIBCAP_MAKE_FLAGS = \
|
||||
LIBATTR=$(LIBCAP_HAVE_LIBATTR) \
|
||||
BUILD_CC="$(HOSTCC)" \
|
||||
BUILD_CFLAGS="$(HOST_CFLAGS)"
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP_TOOLS),y)
|
||||
define LIBCAP_BUILD_TOOLS_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/progs \
|
||||
$(LIBCAP_MAKE_FLAGS)
|
||||
endef
|
||||
|
||||
define LIBCAP_INSTALL_TOOLS_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/progs \
|
||||
RAISE_SETFCAP=no prefix=/usr \
|
||||
DESTDIR=$(TARGET_DIR) $(LIBCAP_MAKE_FLAGS) install
|
||||
endef
|
||||
endif
|
||||
|
||||
define LIBCAP_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/libcap \
|
||||
$(LIBCAP_MAKE_FLAGS) $(LIBCAP_MAKE_TARGET)
|
||||
$(LIBCAP_BUILD_TOOLS_CMDS)
|
||||
endef
|
||||
|
||||
define LIBCAP_INSTALL_STAGING_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap $(LIBCAP_MAKE_FLAGS) \
|
||||
DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)
|
||||
endef
|
||||
|
||||
define LIBCAP_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap $(LIBCAP_MAKE_FLAGS) \
|
||||
DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET)
|
||||
$(LIBCAP_INSTALL_TOOLS_CMDS)
|
||||
endef
|
||||
|
||||
define HOST_LIBCAP_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) LIBATTR=no
|
||||
endef
|
||||
|
||||
define HOST_LIBCAP_INSTALL_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) -C $(@D) LIBATTR=no DESTDIR=$(HOST_DIR) \
|
||||
prefix=/usr lib=lib install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
$(eval $(host-generic-package))
|
||||
Reference in New Issue
Block a user