[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6859/8267] cryptodev: 1.8 -> 1.9

[Emmanuele Bassi <ebassi src gnome org>]

commit bfd831a8695e6b4e2095deb286014172a6bf5051
Author: Robert Yang <liezhi yang windriver com>
Date:   Wed Jul 12 03:15:27 2017 -0700

    cryptodev: 1.8 -> 1.9
    
    * Remove backported patch:
      - 0001-Adjust-to-another-change-in-the-user-page-API.patch
      - 06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch
      - cb186f682679383e8b5806240927903730ce85d9.patch
      - kernel-4-10-changes.patch
    
    * Update patch:
      - 0001-Disable-installing-header-file-provided-by-another-p.patch
    
    * Update FILES_${PN} since there are files in bindir:
      /usr/bin/hmac_comp
      /usr/bin/cipher_comp
      /usr/bin/async_hmac
      /usr/bin/cipher-aead-srtp
      /usr/bin/hash_comp
      /usr/bin/async_speed
      /usr/bin/async_cipher
      /usr/bin/sha_speed
      /usr/bin/hashcrypt_speed
      /usr/bin/hmac
      /usr/bin/cipher-gcm
      /usr/bin/cipher
      /usr/bin/fullspeed
      /usr/bin/speed
      /usr/bin/cipher-aead
    
    (From OE-Core rev: 27202954ce7abda22f7e81c2d72a80f0fa7006d8)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 ...yptodev-linux_1.8.bb => cryptodev-linux_1.9.bb} |    0
 ...todev-module_1.8.bb => cryptodev-module_1.9.bb} |    0
 ...yptodev-tests_1.8.bb => cryptodev-tests_1.9.bb} |    2 +-
 meta/recipes-kernel/cryptodev/cryptodev.inc        |   10 +-
 ...st-to-another-change-in-the-user-page-API.patch |   40 ---
 ...talling-header-file-provided-by-another-p.patch |   18 +-
 .../06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch |   54 ----
 .../cb186f682679383e8b5806240927903730ce85d9.patch |  279 --------------------
 .../cryptodev/files/kernel-4-10-changes.patch      |   57 ----
 9 files changed, 11 insertions(+), 449 deletions(-)
---
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb 
b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.9.bb
similarity index 100%
rename from meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-linux_1.9.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb 
b/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
similarity index 100%
rename from meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb
diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb 
b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb
similarity index 88%
rename from meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb
rename to meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb
index c400524..9cb5dcb 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb
+++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb
@@ -18,4 +18,4 @@ do_install() {
        oe_runmake install_tests
 }
 
-FILES_${PN} = "${bindir}/tests_cryptodev/*"
+FILES_${PN} = "${bindir}/*"
diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc
index 4ae0a2b..50366e7 100644
--- a/meta/recipes-kernel/cryptodev/cryptodev.inc
+++ b/meta/recipes-kernel/cryptodev/cryptodev.inc
@@ -3,14 +3,10 @@ HOMEPAGE = "http://cryptodev-linux.org/";
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRC_URI = "http://nwl.cc/pub/cryptodev-linux/cryptodev-linux-${PV}.tar.gz \
-           file://06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch \
-           file://cb186f682679383e8b5806240927903730ce85d9.patch \
-           file://0001-Adjust-to-another-change-in-the-user-page-API.patch \
-           file://kernel-4-10-changes.patch"
+SRC_URI = "http://nwl.cc/pub/cryptodev-linux/cryptodev-linux-${PV}.tar.gz";
 
-SRC_URI[md5sum] = "02644cc4cd02301e0b503a332eb2f0b5"
-SRC_URI[sha256sum] = "67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376"
+SRC_URI[md5sum] = "cb4e0ed9e5937716c7c8a7be84895b6d"
+SRC_URI[sha256sum] = "9f4c0b49b30e267d776f79455d09c70cc9c12c86eee400a0d0a0cd1d8e467950"
 
 S = "${WORKDIR}/cryptodev-linux-${PV}"
 
diff --git 
a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch 
b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
index a580fc6..885b582 100644
--- a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
+++ b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch
@@ -7,22 +7,18 @@ Signed-off-by: Denys Dmytriyenko <denys ti com>
 
 Upstream-Status: Inappropriate [ OE specific ]
 ---
- Makefile | 2 --
- 1 file changed, 2 deletions(-)
+ Makefile | 1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index d66ef26..8e97c6a 100644
+index 5a080e0..bf02396 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -23,8 +23,6 @@ install: modules_install
+@@ -33,7 +33,6 @@ install: modules_install
  
  modules_install:
-       make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install
--      @echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..."
--      @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h
+       $(MAKE) $(KERNEL_MAKE_OPTS) modules_install
+-      install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h
  
  clean:
-       make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean
--- 
-1.9.1
-
+       $(MAKE) $(KERNEL_MAKE_OPTS) clean