From 532401f4d3f7411cbdd9ba9470c1ee4618a6d801 Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Fri, 15 Sep 2017 17:21:08 +0800
Subject: [PATCH] libp11: 0.4.0 -> 0.4.7

Upgrade libp11 from 0.4.0 to 0.4.7.

* the parallel make issue has been fix in upstream, so remove
  restriction of parallel make
* update FILES

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../libp11/{libp11_0.4.0.bb => libp11_0.4.7.bb}        | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-support/libp11/{libp11_0.4.0.bb => libp11_0.4.7.bb} (63%)

diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.0.bb b/meta-oe/recipes-support/libp11/libp11_0.4.7.bb
similarity index 63%
rename from meta-oe/recipes-support/libp11/libp11_0.4.0.bb
rename to meta-oe/recipes-support/libp11/libp11_0.4.7.bb
index d88006c366..949c33752b 100644
--- a/meta-oe/recipes-support/libp11/libp11_0.4.0.bb
+++ b/meta-oe/recipes-support/libp11/libp11_0.4.7.bb
@@ -9,16 +9,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
 DEPENDS = "libtool openssl"
 
 SRC_URI = "git://github.com/OpenSC/libp11.git"
-SRCREV = "22de793340ab73cafc92f8238afb51a06d8411c3"
+SRCREV = "64569a391897bd29c5060b19fa4613e619e59277"
 
 S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
 
-# Currently, Makefile dependencies are incorrectly defined which causes build errors
-# The number of jobs is high
-# See https://github.com/OpenSC/libp11/issues/94
-PARALLEL_MAKE = ""
 EXTRA_OECONF = "--disable-static"
 
 do_install_append () {
@@ -26,5 +22,5 @@ do_install_append () {
     rm -rf ${D}${docdir}/${BPN}
 }
 
-FILES_${PN} += "${libdir}/pkcs11${SOLIBS}"
-FILES_${PN}-dev += "${libdir}/pkcs11${SOLIBSDEV}"
+FILES_${PN} += "${libdir}/engines/pkcs11.so"
+FILES_${PN}-dev += "${libdir}/engines/libpkcs11${SOLIBSDEV}"