rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move all to deprecated folder.

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2016-11-16 21:57:57 +01:00
parent 01738a7684
commit 05de7d6c04
9777 changed files with 0 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
deprecated/firmware/buildroot/package/keyutils/0001-allow-building-of-the-shared-library-to-be-suppressed.patch Normal file
View File

@@ -0,0 +1,104 @@
keyutils: Allow building of the shared library to be suppressed
Upstream patch:
https://kernel.googlesource.com/pub/scm/linux/kernel/git/dhowells/keyutils/+/a4deb71ddc05e951c8be8d46615beed9d408a5c8
Signed-off-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
LIB: Allow building of the shared library to be suppressed
Allow building of the shared library to be suppressed by passing NO_SOLIB=1 to
the Makefile.
Reported-and-tested-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
Signed-off-by: David Howells <dhowells@redhat.com>
diff --git a/Makefile b/Makefile
index c904eaf..5dd2113 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@
SPECFILE := keyutils.spec
NO_GLIBC_KEYERR := 0
NO_ARLIB := 0
+NO_SOLIB := 0
ETCDIR := /etc
BINDIR := /bin
SBINDIR := /sbin
@@ -95,7 +96,7 @@
# Normal build rule
#
###############################################################################
-all: $(DEVELLIB) keyctl request-key key.dns_resolver
+all: keyctl request-key key.dns_resolver
###############################################################################
#
@@ -104,20 +105,23 @@
###############################################################################
#RPATH = -Wl,-rpath,$(LIBDIR)
-ifeq ($(NO_ARLIB),0)
-all: $(ARLIB)
-$(ARLIB): keyutils.o
- $(AR) rcs $@ $<
-endif
-
VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\""
VCPPFLAGS += -DPKGVERSION="\"keyutils-$(VERSION)\""
VCPPFLAGS += -DAPIVERSION="\"libkeyutils-$(APIVERSION)\""
+ifeq ($(NO_ARLIB),0)
+all: $(ARLIB)
+$(ARLIB): keyutils.o
+ $(AR) rcs $@ $<
+
keyutils.o: keyutils.c keyutils.h Makefile
$(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -UNO_GLIBC_KEYERR -o $@ -c $<
+LIB_DEPENDENCY := libkeyutils.a
+endif
+ifeq ($(NO_SOLIB),0)
+all: $(DEVELLIB)
$(DEVELLIB): $(SONAME)
ln -sf $< $@
@@ -131,6 +135,8 @@
keyutils.os: keyutils.c keyutils.h Makefile
$(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $<
+LIB_DEPENDENCY := $(DEVELLIB)
+endif
###############################################################################
#
@@ -140,13 +146,13 @@
%.o: %.c keyutils.h Makefile
$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
-keyctl: keyctl.o $(DEVELLIB)
+keyctl: keyctl.o $(LIB_DEPENDENCY)
$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
-request-key: request-key.o $(DEVELLIB)
+request-key: request-key.o $(LIB_DEPENDENCY)
$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils
-key.dns_resolver: key.dns_resolver.o $(DEVELLIB)
+key.dns_resolver: key.dns_resolver.o $(LIB_DEPENDENCY)
$(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv
###############################################################################
@@ -158,10 +164,12 @@
ifeq ($(NO_ARLIB),0)
$(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB)
endif
+ifeq ($(NO_SOLIB),0)
$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
mkdir -p $(DESTDIR)$(USRLIBDIR)
$(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
+endif
$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key
$(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh

20
deprecated/firmware/buildroot/package/keyutils/0002-fix-install-rule.patch Normal file
View File

@@ -0,0 +1,20 @@
Makefile: fix install rule
Do not link the .so with an absolute path, otherwise it may point to
the host library.
Based on the former patch by Yann E. MORIN.
Signed-off-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
--- keyutils-1.5.9/Makefile.orig 2014-09-22 16:13:41.593562765 +0100
+++ keyutils-1.5.9/Makefile 2014-09-22 16:14:05.377963952 +0100
@@ -168,7 +168,7 @@ ifeq ($(NO_SOLIB),0)
$(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
$(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
mkdir -p $(DESTDIR)$(USRLIBDIR)
- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB)
endif
$(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl
$(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key

15
deprecated/firmware/buildroot/package/keyutils/0003-cifs.patch Normal file
View File

@@ -0,0 +1,15 @@
Patch vampirised from Debian's packaging of keyutils-1.4
Author: Marcus Meissner <meissner@suse.de>
Description: Added 2 cifs helpers to request-key.conf (for CIFS DFS support)
diff -Naurp keyutils.orig/request-key.conf keyutils/request-key.conf
--- keyutils.orig/request-key.conf 2008-09-07 23:53:10.000000000 +0000
+++ keyutils/request-key.conf 2009-02-05 00:53:00.000000000 +0000
@@ -34,4 +34,6 @@
create user debug:* negate /bin/keyctl negate %k 30 %S
create user debug:loop:* * |/bin/cat
create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S
+create cifs.spnego * * /usr/sbin/cifs.upcall -c %k
+create dns_resolver * * /usr/sbin/cifs.upcall %k
negate * * * /bin/keyctl negate %k 30 %S

19
deprecated/firmware/buildroot/package/keyutils/0004-Makefile-for-buildroot.patch Normal file
View File

@@ -0,0 +1,19 @@
Makefile: Don't call "ln" directly
Signed-off-by: Vicente Olivert Riera <vincent.riera@imgtec.com>
--- keyutils-1.5.9/Makefile.orig 2014-09-22 16:05:14.117007430 +0100
+++ keyutils-1.5.9/Makefile 2014-09-22 16:06:26.053219336 +0100
@@ -123,10 +123,10 @@ endif
ifeq ($(NO_SOLIB),0)
all: $(DEVELLIB)
$(DEVELLIB): $(SONAME)
- ln -sf $< $@
+ $(LNS) $< $@
$(SONAME): $(LIBNAME)
- ln -sf $< $@
+ $(LNS) $< $@
LIBVERS := -shared -Wl,-soname,$(SONAME) -Wl,--version-script,version.lds

32
deprecated/firmware/buildroot/package/keyutils/0005-Add-missing-limits.h-include.patch Normal file
View File

@@ -0,0 +1,32 @@
From b2c6d3744dca029560d0d5e780f16561f8eeed53 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Sun, 12 Jul 2015 16:22:14 +0200
Subject: [PATCH] Add missing <limits.h> include
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
key.dns_resolver.c uses ‘UINT_MAX’ and ‘ULONG_MAX’, but forgets to
include <limits.h>, which causes build failure with certain C
libraries (notably the musl C library).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
key.dns_resolver.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/key.dns_resolver.c b/key.dns_resolver.c
index c2a9fe5..d41e219 100644
--- a/key.dns_resolver.c
+++ b/key.dns_resolver.c
@@ -56,6 +56,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <time.h>
+#include <limits.h>
static const char *DNS_PARSE_VERSION = "1.0";
static const char prog[] = "key.dns_resolver";
--
2.4.5

15
deprecated/firmware/buildroot/package/keyutils/Config.in Normal file
View File

@@ -0,0 +1,15 @@
config BR2_PACKAGE_KEYUTILS
bool "keyutils"
depends on !BR2_microblaze
depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS # dlopen
help
These tools are used to control the key management system
built into the Linux kernel.
http://people.redhat.com/~dhowells/keyutils/
comment "keyutils needs a toolchain w/ dynamic library"
depends on !BR2_microblaze
depends on BR2_USE_MMU
depends on BR2_STATIC_LIBS

3
deprecated/firmware/buildroot/package/keyutils/keyutils.hash Normal file
View File

@@ -0,0 +1,3 @@
# From http://people.redhat.com/~dhowells/keyutils/
md5 7f8ac985c45086b5fbcd12cecd23cf07 keyutils-1.5.9.tar.bz2
sha1 cf040adebe25eb466760f34752f4100fd5acb5e7 keyutils-1.5.9.tar.bz2

38
deprecated/firmware/buildroot/package/keyutils/keyutils.mk Normal file
View File

@@ -0,0 +1,38 @@
################################################################################
#
# keyutils
#
################################################################################
KEYUTILS_VERSION = 1.5.9
KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2
KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils
KEYUTILS_LICENSE = GPLv2+, LGPLv2.1+
KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL
KEYUTILS_INSTALL_STAGING = YES
KEYUTILS_MAKE_PARAMS = \
INSTALL=$(INSTALL) \
LIBDIR=/usr/lib \
USRLIBDIR=/usr/lib \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="$(TARGET_CPPFLAGS) -I." \
LNS="$(HOSTLN) -sf"
ifeq ($(BR2_SHARED_LIBS),y)
KEYUTILS_MAKE_PARAMS += NO_ARLIB=1
endif
define KEYUTILS_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D)
endef
define KEYUTILS_INSTALL_STAGING_CMDS
$(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(STAGING_DIR) install
endef
define KEYUTILS_INSTALL_TARGET_CMDS
$(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(TARGET_DIR) install
endef
$(eval $(generic-package))