meta-security: remove keyutils recipe

Remove keyutils 1.5.8 recipe since meta-oe has a newer 1.6 recipe.

Bug-AGL: SPEC-2932

Change-Id: I0a0d2507922c0d705eb064577c0a2a8fcc081d3f
Signed-off-by: Scott Murray <scott.murray@konsulko.com>

diff --git a/meta-security/recipes-security/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch b/meta-security/recipes-security/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch
deleted file mode 100644 (file)
index a049fd2..0000000
--- a/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-security/recipes-security/keyutils/keyutils/keyutils_fix_library_install.patch b/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_library_install.patch
deleted file mode 100644 (file)
index adf0643..0000000
--- a/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-security/recipes-security/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch b/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch
deleted file mode 100644 (file)
index 8dd2245..0000000
--- a/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-security/recipes-security/keyutils/keyutils/keyutils_fix_x86_cflags.patch b/meta-security/recipes-security/keyutils/keyutils/keyutils_fix_x86_cflags.patch
deleted file mode 100644 (file)
index 573c429..0000000
--- a/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
- 

diff --git a/meta-security/recipes-security/keyutils/keyutils_1.5.8.bb b/meta-security/recipes-security/keyutils/keyutils_1.5.8.bb
deleted file mode 100644 (file)
index 46b2b62..0000000
--- a/meta-security/recipes-security/keyutils/keyutils_1.5.8.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-SUMMARY = "Linux Key Management Utilities"
-DESCRIPTION = "Keyutils is a set of utilities for managing the key retention \
-facility in the kernel, which can be used by filesystems, block devices and \
-more to gain and retain the authorization and encryption keys required to \
-perform secure operations."
-SECTION = "base"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://LICENCE.GPL;md5=5f6e72824f5da505c1f4a7197f004b45"
-
-PR = "r1"
-
-SRCREV = "dd64114721edca5808872190e7e2e927ee2e994c"
-
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;protocol=git \
-          file://keyutils_fix_library_install.patch \
-          "
-SRC_URI_append_arm = " file://keyutils-arm-remove-m32-m64.patch"
-SRC_URI_append_x86 = " file://keyutils_fix_x86_cflags.patch"
-SRC_URI_append_x86-64 = " file://keyutils_fix_x86-64_cflags.patch"
-
-S = "${WORKDIR}/git"
-
-INSTALL_FLAGS = " \
-BINDIR=${bindir} \
-SBINDIR=${sbindir} \
-INCLUDEDIR=${includedir} \
-ETCDIR=${sysconfdir} \
-LIBDIR=${libdir} \
-USRLIBDIR=${libdir} \
-SHAREDIR=${datadir} \
-MAN1=${mandir}/man1 \
-MAN3=${mandir}/man3 \
-MAN5=${mandir}/man5 \
-MAN8=${mandir}/man8 \
-DESTDIR=${D}"
-
-do_install() {
-    cd ${S} && oe_runmake ${INSTALL_FLAGS} install
-
-    # Debugging script of unknown value, not packaged.
-    rm -f "${D}${datadir}/request-key-debug.sh"
-}
-
-BBCLASSEXTEND = "native"