[OE-core] [PATCH 5/5] kmod: upgrade to 14

[Cristiana Voicu]

Made some changes on patches to apply correctly.

Signed-off-by: Cristiana Voicu <cristiana.voicu at intel.com>
---
 meta/recipes-kernel/kmod/kmod-native_git.bb        |    1 -
 meta/recipes-kernel/kmod/kmod.inc                  |    5 ++---
 ...-man-page-generation-because-we-don-t-hav.patch |   21 ++++++++++----------
 .../kmod/kmod/fix-undefined-O_CLOEXEC.patch        |    5 ++---
 meta/recipes-kernel/kmod/kmod_git.bb               |    3 +--
 5 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb
index 8cbcdf8..afa3ad0 100644
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ b/meta/recipes-kernel/kmod/kmod-native_git.bb
@@ -4,7 +4,6 @@
 require kmod.inc
 inherit native
 
-PR = "${INC_PR}.1"
 SRC_URI += "file://fix-undefined-O_CLOEXEC.patch"
 
 do_install_append (){
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index a780b6c..b07fc58 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -7,8 +7,7 @@ HOMEPAGE = "http://packages.profusion.mobi/kmod/"
 LICENSE = "GPL-2.0+ & LGPL-2.1+"
 LICENSE_libkmod = "LGPL-2.1+"
 SECTION = "base"
-PV = "9"
-INC_PR = "r0"
+PV = "14"
 
 DEPENDS += "pkgconfig-native"
 
@@ -24,7 +23,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
            file://ptest.patch \
           "
 
-SRCREV = "62081c0f68905b22f375156d4532fd37fa5c8d33"
+SRCREV = "3b38c7fcb58be4ddc34f90454c5f5dc3693d2d85"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch b/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch
index 5361b84..b5a8e08 100644
--- a/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch
+++ b/meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch
@@ -11,16 +11,17 @@ Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
  Makefile.am |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index 141c102..a8bdfd1 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = . libkmod/docs man
-+SUBDIRS = . libkmod/docs
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -1,9 +1,5 @@
+ SUBDIRS = . libkmod/docs
  
+-if BUILD_MANPAGES
+-SUBDIRS += man
+-endif
+-
  DISTCLEAN_LOCAL_HOOKS =
  EXTRA_DIST =
--- 
-1.7.8.4
-
+ CLEANFILES =
diff --git a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch
index 3177e9a..49728c2 100644
--- a/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch
+++ b/meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch
@@ -4,9 +4,8 @@ Index: git/libkmod/libkmod-private.h
 ===================================================================
 --- git.orig/libkmod/libkmod-private.h
 +++ git/libkmod/libkmod-private.h
-@@ -1,6 +1,10 @@
- #ifndef _LIBKMOD_PRIVATE_H_
- #define _LIBKMOD_PRIVATE_H_
+@@ -1,5 +1,9 @@
+ #pragma once
  
 +#ifndef O_CLOEXEC
 +# define O_CLOEXEC 0
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index f92ff72..28ce194 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -3,8 +3,7 @@
 
 require kmod.inc
 
-PR = "${INC_PR}.0"
-PV = "9+git${SRCPV}"
+PV = "14+git${SRCPV}"
 
 PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
 RPROVIDES_${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
-- 
1.7.9.5