keyutils: fix build failure with ppc

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>

2 files changed, 1 insertions, 29 deletions

diff --git a/meta-integrity/recipes-support/keyutils/keyutils/keyutils-fix-powerpc-cflags.patch b/meta-integrity/recipes-support/keyutils/keyutils/keyutils-fix-powerpc-cflags.patch
deleted file mode 100644
index 11be1e1..0000000
--- a/meta-integrity/recipes-support/keyutils/keyutils/keyutils-fix-powerpc-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1cc17e3c8b1f73db43011775292396338f932a20 Mon Sep 17 00:00:00 2001
-From: Lei Maohui <leimaohui at cn.fujitsu.com>
-Date: Mon, 17 Aug 2015 15:30:40 +0900
-Subject: [PATCH] keyutils fix powerpc cflags
-
----
- Makefile | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 82e1a0f..0746c82 100644
---- a/Makefile
-+++ b/Makefile
-@@ -65,12 +65,10 @@ BUILDFOR    := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-
- LNS              := ln -sf
- 
- ifeq ($(BUILDFOR),32-bit)
--CFLAGS         += -m32
- LIBDIR            := /usr/lib
- USRLIBDIR                 := /usr/lib
- else
- ifeq ($(BUILDFOR),64-bit)
--CFLAGS         += -m64
- LIBDIR            := /usr/lib
- USRLIBDIR                 := /usr/lib
- endif
--- 
-1.8.4.2
diff --git a/meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb b/meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb
index 64e0365..1c33f2b 100644
--- a/meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb
+++ b/meta-integrity/recipes-support/keyutils/keyutils_1.5.9.bb
@@ -21,7 +21,7 @@ SRC_URI_append_mips = " file://keyutils-remove-m32-m64.patch"
 SRC_URI_append_mips64 = " file://keyutils-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"
-SRC_URI_append_powerpc = "file://keyutils-fix-powerpc-cflags.patch"
+SRC_URI_append_powerpc = "file://keyutils-remove-m32-m64.patch"
 
 S = "${WORKDIR}/git"