From fc50c57773073371b9863e611e7a459146f170ef Mon Sep 17 00:00:00 2001
From: =?utf8?q?K=C3=A9vin=20THIERRY?= <kevin.thierry@open.eurogiciel.org>
Date: Fri, 22 Aug 2014 15:54:26 +0200
Subject: [PATCH] meta-tizen: keyutils: update recipe
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: I83afcc714c6750d70fd9527942fb86832e4ee0b7
(From meta-tizen rev: 9a59201d4ce634709854222e55cfc03412a920d2)

Signed-off-by: Kévin THIERRY <kevin.thierry@open.eurogiciel.org>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---
 .../recipes-tizen/keyutils/keyutils-extraconf.inc  |  8 ++-----
 meta-tizen/recipes-tizen/keyutils/keyutils.inc     | 26 +++++++++++++---------
 meta-tizen/recipes-tizen/keyutils/keyutils_git.bb  |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/meta-tizen/recipes-tizen/keyutils/keyutils-extraconf.inc b/meta-tizen/recipes-tizen/keyutils/keyutils-extraconf.inc
index c97ff75..3e9f649 100644
--- a/meta-tizen/recipes-tizen/keyutils/keyutils-extraconf.inc
+++ b/meta-tizen/recipes-tizen/keyutils/keyutils-extraconf.inc
@@ -1,7 +1,3 @@
-do_install_prepend() {
-    RPM_BUILD_ROOT=${D}
-}
-
 do_install_append() {
-    ln -snf ../../lib/libkeyutils.so.1 ${D}/usr/lib/libkeyutils.so
-}
\ No newline at end of file
+    ln -snf libkeyutils.so.1 ${D}/usr/lib/libkeyutils.so
+}
diff --git a/meta-tizen/recipes-tizen/keyutils/keyutils.inc b/meta-tizen/recipes-tizen/keyutils/keyutils.inc
index f02803b..7c8e569 100644
--- a/meta-tizen/recipes-tizen/keyutils/keyutils.inc
+++ b/meta-tizen/recipes-tizen/keyutils/keyutils.inc
@@ -1,7 +1,7 @@
 DESCRIPTION = "Linux Key Management Utilities"
 HOMEPAGE = "http://people.redhat.com/~dhowells/keyutils/"
 SECTION = "System/Kernel"
-LICENSE = "GPL-2.0+  LGPL-2.1+"
+LICENSE = "GPL-2.0+ and LGPL-2.1+"
 
 SRC_URI = ""
 
@@ -53,14 +53,14 @@ do_compile() {
  unset DISPLAY
  LD_AS_NEEDED=1; export LD_AS_NEEDED ;
  
- make -j16 NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" CC="${CC}"
+ oe_runmake -j16 NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS" CC="${CC}"
  
  
  
 }
 
 do_install() {
- echo export RPM_BUILD_ROOT=${D}
+ export RPM_BUILD_ROOT=${D}
  cd ${S}
  LANG=C
  export LANG
@@ -68,7 +68,13 @@ do_install() {
  rm -rf ${D}
  mkdir -p ${D}
  
- make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/lib USRLIBDIR=/usr/lib
+ oe_runmake install \
+         NO_ARLIB=1 \
+         DESTDIR=${D} \
+         LIBDIR=${prefix}/lib \
+         USRLIBDIR=${prefix}/lib \
+         BINDIR=${prefix}/bin \
+         SBINDIR=${prefix}/sbin
  
  
 }
@@ -91,21 +97,19 @@ PACKAGES += " libkeyutils "
 PACKAGES += " keyutils-dev "
 
 keyutils_files = ""
-keyutils_files += "GPL-2.0+ ; LGPL-2.1+ LICENCE.GPL"
-keyutils_files += "/sbin/*"
-keyutils_files += "/bin/*"
-keyutils_files += "/usr/share/keyutils"
+keyutils_files += "${prefix}/sbin/*"
+keyutils_files += "${prefix}/bin/*"
+keyutils_files += "${prefix}/share/keyutils"
 keyutils_files += "${mandir}/*/*"
 keyutils_files += "/etc/*"
 MANIFESTFILES_${PN} = "keyutils.manifest"
 
 libkeyutils_files = ""
-libkeyutils_files += "GPL-2.0+ ; LGPL-2.1+ LICENCE.LGPL"
-libkeyutils_files += "/lib/libkeyutils.so.*"
+libkeyutils_files += "${prefix}/lib/libkeyutils.so.*"
 MANIFESTFILES_lib${PN} = "keyutils.manifest"
 
 keyutils-dev_files = ""
-keyutils-dev_files += "/usr/lib/libkeyutils.so"
+keyutils-dev_files += "${prefix}/lib/libkeyutils.so"
 keyutils-dev_files += "${prefix}/include/*"
 MANIFESTFILES_${PN}-dev = "keyutils.manifest"
 
diff --git a/meta-tizen/recipes-tizen/keyutils/keyutils_git.bb b/meta-tizen/recipes-tizen/keyutils/keyutils_git.bb
index 005f33f..0878981 100644
--- a/meta-tizen/recipes-tizen/keyutils/keyutils_git.bb
+++ b/meta-tizen/recipes-tizen/keyutils/keyutils_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/keyutils;tag=0a66e7614aa2dead8af0e490b1bec71d8b895749;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/keyutils;tag=5ecf742b33f27aee297ab68f74704b2ee52bceb6;nobranch=1"
 
 BBCLASSEXTEND += " native "
 
-- 
2.7.4