diff options
8 files changed, 72 insertions, 173 deletions
diff --git a/meta-ivi/recipes-support-ivi/keyutils/keyutils/0001-keyutils-Use-libdir-from-the-Yocto-environment.patch b/meta-ivi/recipes-support-ivi/keyutils/keyutils/0001-keyutils-Use-libdir-from-the-Yocto-environment.patch new file mode 100644 index 0000000..dde008b --- /dev/null +++ b/meta-ivi/recipes-support-ivi/keyutils/keyutils/0001-keyutils-Use-libdir-from-the-Yocto-environment.patch @@ -0,0 +1,69 @@ +From d8cfd44a27d0d87c6ff63014c765884b1f18646f Mon Sep 17 00:00:00 2001 +From: Clement Dransart <clement.dransart@awtce.be> +Date: Thu, 9 Jun 2016 11:08:00 +0200 +Subject: [meta-ivi][PATCH] keyutils: Use libdir from the Yocto environment + +Signed-off-by: Clement Dransart <clement.dransart@awtce.be> +--- + Makefile | 30 ++++-------------------------- + 1 file changed, 4 insertions(+), 26 deletions(-) + +diff --git a/Makefile b/Makefile +index c904eaf..22b74ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -51,32 +51,11 @@ LIBNAME := libkeyutils.so.$(APIVERSION) + + ############################################################################### + # +-# Guess at the appropriate lib directory and word size ++# Use libdir from the Yocto environment + # + ############################################################################### +-ifeq ($(origin LIBDIR),undefined) +-LIBDIR := $(shell ldd /usr/bin/make | grep '\(/libc\)' | sed -e 's!.*\(/.*\)/libc[.].*!\1!') +-endif +-ifeq ($(origin USRLIBDIR),undefined) +-USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) +-endif +-BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit +- +-LNS := ln -sf +- +-ifeq ($(origin CFLAGS),undefined) +-ifeq ($(BUILDFOR),32-bit) +-CFLAGS += -m32 +-LIBDIR := /lib +-USRLIBDIR := /usr/lib +-else +-ifeq ($(BUILDFOR),64-bit) +-CFLAGS += -m64 +-LIBDIR := /lib64 +-USRLIBDIR := /usr/lib64 +-endif +-endif +-endif ++LIBDIR := $(libdir) ++USRLIBDIR := $(libdir) + + ############################################################################### + # +@@ -161,7 +140,7 @@ endif + $(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 +@@ -271,6 +250,5 @@ show_vars: + @echo APIVERSION=$(APIVERSION) + @echo LIBDIR=$(LIBDIR) + @echo USRLIBDIR=$(USRLIBDIR) +- @echo BUILDFOR=$(BUILDFOR) + @echo SONAME=$(SONAME) + @echo LIBNAME=$(LIBNAME) +-- +1.9.1 + diff --git a/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch b/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils-arm-remove-m32-m64.patch deleted file mode 100644 index a049fd2..0000000 --- a/meta-ivi/recipes-support-ivi/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-ivi/recipes-support-ivi/keyutils/keyutils/keyutils-fix-powerpc-cflags.patch b/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils-fix-powerpc-cflags.patch deleted file mode 100644 index a3f4905..0000000 --- a/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils-fix-powerpc-cflags.patch +++ /dev/null @@ -1,36 +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 - -rebased the patch for powerpc arch, -it is required to resolve the patch application failure -with keyutils 1.5.9. - -upstream-status: pending - -Signed-off-by: Shrikant Bobade <shrikant_bobade@mentor.com> - - -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,1 +58,1 @@ - 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 --- -1.8.4.2 diff --git a/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils-fix-the-cflags-for-all-of-targets.patch b/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils-fix-the-cflags-for-all-of-targets.patch deleted file mode 100644 index 77cf528..0000000 --- a/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils-fix-the-cflags-for-all-of-targets.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8a1331d4abf9a96ee65e5fb31a00c7a2e0eed7c8 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui at cn.fujitsu.com> -Date: Mon, 17 Aug 2015 13:53:28 +0900 -Subject: [PATCH] fix the cflags for all of targets. - -Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com> ---- - Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Makefile b/Makefile -index e2d7e2d..82e1a0f 100644 ---- a/Makefile -+++ b/Makefile -@@ -64,7 +64,6 @@ BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')- - - LNS := ln -sf - --ifeq ($(origin CFLAGS),undefined) - ifeq ($(BUILDFOR),32-bit) - CFLAGS += -m32 - LIBDIR := /usr/lib -@@ -76,7 +75,6 @@ LIBDIR := /usr/lib - USRLIBDIR := /usr/lib - endif - endif --endif - - ############################################################################### - # --- -1.8.4.2 diff --git a/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils_fix_library_install.patch b/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils_fix_library_install.patch deleted file mode 100644 index adf0643..0000000 --- a/meta-ivi/recipes-support-ivi/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-ivi/recipes-support-ivi/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch b/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch deleted file mode 100644 index b0c2d92..0000000 --- a/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils_fix_x86-64_cflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -From d3b6b98984a28e782cb22dc6c7bd0ea9a0e74f15 Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui at cn.fujitsu.com> -Date: Mon, 17 Aug 2015 15:53:02 +0900 -Subject: [PATCH] keyutils fix x86-64 cflags - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 82e1a0f..23aa466 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,7 +60,7 @@ endif - ifeq ($(origin USRLIBDIR),undefined) - USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) - endif --BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit -+BUILDFOR := 64-bit - - LNS := ln -sf - --- -1.8.4.2 diff --git a/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils_fix_x86_cflags.patch b/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils_fix_x86_cflags.patch deleted file mode 100644 index f5d5f70..0000000 --- a/meta-ivi/recipes-support-ivi/keyutils/keyutils/keyutils_fix_x86_cflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3263917382af02e61f12f3774c32d3324a57059f Mon Sep 17 00:00:00 2001 -From: Lei Maohui <leimaohui at cn.fujitsu.com> -Date: Mon, 17 Aug 2015 11:48:22 +0900 -Subject: [PATCH] keyutils fix x86 cflags - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index e2d7e2d..f05bada 100644 ---- a/Makefile -+++ b/Makefile -@@ -60,7 +60,7 @@ endif - ifeq ($(origin USRLIBDIR),undefined) - USRLIBDIR := $(patsubst /lib/%,/usr/lib/%,$(LIBDIR)) - endif --BUILDFOR := $(shell file /usr/bin/make | sed -e 's!.*ELF \(32\|64\)-bit.*!\1!')-bit -+BUILDFOR := 32-bit - - LNS := ln -sf - --- -1.8.4.2 diff --git a/meta-ivi/recipes-support-ivi/keyutils/keyutils_1.5.9.bb b/meta-ivi/recipes-support-ivi/keyutils/keyutils_1.5.9.bb index 9d8d5be..0c2013a 100644 --- a/meta-ivi/recipes-support-ivi/keyutils/keyutils_1.5.9.bb +++ b/meta-ivi/recipes-support-ivi/keyutils/keyutils_1.5.9.bb @@ -12,19 +12,14 @@ PR = "r1" SRCREV = "9209a0c8fd63afc59f644e078b40cec531409c30" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git;protocol=git \ - file://keyutils_fix_library_install.patch \ - file://keyutils-fix-the-cflags-for-all-of-targets.patch \ + file://0001-keyutils-Use-libdir-from-the-Yocto-environment.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" -SRC_URI_append_powerpc = "file://keyutils-fix-powerpc-cflags.patch" S = "${WORKDIR}/git" -inherit autotools +inherit autotools-brokensep -INSTALL_FLAGS = "BINDIR=/usr/bin SBINDIR=/usr/sbin DESTDIR=${D}" +INSTALL_FLAGS = "BINDIR=/usr/bin SBINDIR=/usr/sbin DESTDIR=${D} LIB_DIR=${libdir}" do_install() { cd ${S} && oe_runmake ${INSTALL_FLAGS} install |