diff options
Diffstat (limited to 'meta-agl/meta-security/recipes-security/keyutils/keyutils')
4 files changed, 0 insertions, 75 deletions
diff --git a/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch b/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch deleted file mode 100644 index a049fd23..00000000 --- a/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: keyutils-1.5.5/Makefile -=================================================================== ---- keyutils-1.5.5.orig/Makefile 2011-12-20 11:05:10.000000000 +0200 -+++ keyutils-1.5.5/Makefile 2011-12-20 11:06:27.000000000 +0200 -@@ -58,12 +58,12 @@ - LNS := ln -sf - - ifeq ($(BUILDFOR),32-bit) --CFLAGS += -m32 -+#CFLAGS += -m32 - LIBDIR := /usr/lib - USRLIBDIR := /usr/lib - else - ifeq ($(BUILDFOR),64-bit) --CFLAGS += -m64 -+#CFLAGS += -m64 - LIBDIR := /usr/lib - USRLIBDIR := /usr/lib - endif diff --git a/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_library_install.patch b/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_library_install.patch deleted file mode 100644 index adf06430..00000000 --- a/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_library_install.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: keyutils-1.5.5/Makefile -=================================================================== ---- keyutils-1.5.5.orig/Makefile 2011-11-30 17:27:43.000000000 +0200 -+++ keyutils-1.5.5/Makefile 2011-12-21 16:05:53.000000000 +0200 -@@ -59,13 +59,13 @@ - - ifeq ($(BUILDFOR),32-bit) - CFLAGS += -m32 --LIBDIR := /lib -+LIBDIR := /usr/lib - USRLIBDIR := /usr/lib - else - ifeq ($(BUILDFOR),64-bit) - CFLAGS += -m64 --LIBDIR := /lib64 --USRLIBDIR := /usr/lib64 -+LIBDIR := /usr/lib -+USRLIBDIR := /usr/lib - endif - endif - -@@ -152,7 +152,7 @@ - $(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) - $(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 diff --git a/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch b/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch deleted file mode 100644 index 8dd22450..00000000 --- a/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/Makefile -=================================================================== ---- git.orig/Makefile 2012-11-16 15:40:05.258723425 +0200 -+++ git/Makefile 2012-11-16 15:41:08.978725491 +0200 -@@ -53,7 +53,7 @@ - ############################################################################### - LIBDIR := $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!') - USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) --BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit -+BUILDFOR := 64-bit - - LNS := ln -sf - diff --git a/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86_cflags.patch b/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86_cflags.patch deleted file mode 100644 index 573c429b..00000000 --- a/meta-agl/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86_cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: git/Makefile -=================================================================== ---- git.orig/Makefile 2012-11-16 15:40:05.258723425 +0200 -+++ git/Makefile 2012-11-16 15:41:08.978725491 +0200 -@@ -53,7 +53,7 @@ - ############################################################################### - LIBDIR := $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!') - USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) --BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit -+BUILDFOR := 32-bit - - LNS := ln -sf - |