Skip to contentSkip to conversation

Package upgrades

PATCH In review Cristiana Voicu 3 participants 12 messages Aug 8, 2013 – Aug 13, 2013

lore
Share & tools
lore

Cristiana Voicu

author
#0 lore raw

cover Package upgrades

Hi,

Tests done:
* build tested on AB running following nightlies: x86, x86_64, ppc, mips, arm;
* checked with rpm if the packages were installed; basic functionality for kmod,
systemtap, atk, mkfontscale and ed

Thanks,
Cristiana

The following changes since commit f63e7f4323368c0d6fe7a1d44393a7e15652d4f2:

subversion: Add patch to use neon 0.30 (2013-08-07 07:43:47 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib cvoicu/work2
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=cvoicu/work2

Cristiana Voicu (5):
ed: upgrade to 1.9
mkfontscale: upgrade to 1.1.1
atk: upgrade to 2.9.3
systemtap: upgrade to 2.3
kmod: upgrade to 14

 meta/recipes-extended/ed/{ed_1.8.bb => ed_1.9.bb}  |    7 +++----
 .../{mkfontscale_1.1.0.bb => mkfontscale_1.1.1.bb} |    6 ++----
 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 +--
 meta/recipes-kernel/systemtap/systemtap_git.bb     |    2 --
 meta/recipes-kernel/systemtap/systemtap_git.inc    |    4 ++--
 .../atk/{atk_2.8.0.bb => atk_2.9.3.bb}             |    4 ++--
 10 files changed, 25 insertions(+), 33 deletions(-)
 rename meta/recipes-extended/ed/{ed_1.8.bb => ed_1.9.bb} (68%)
 rename meta/recipes-graphics/xorg-app/{mkfontscale_1.1.0.bb => mkfontscale_1.1.1.bb} (78%)
 rename meta/recipes-support/atk/{atk_2.8.0.bb => atk_2.9.3.bb} (79%)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/5 ed: upgrade to 1.9

LIC_FILES_CHKSUM changed because some lines were in addition in main.c file. Those lines are related to exit status.

Signed-off-by Cristiana Voicu <[email protected]>
---
 meta/recipes-extended/ed/{ed_1.8.bb => ed_1.9.bb} |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/ed/{ed_1.8.bb => ed_1.9.bb} (68%)
meta/recipes-extended/ed/ed_1.9.bb renamed from meta/recipes-extended/ed/ed_1.8.bb +3 -4
similarity index 68%
rename from meta/recipes-extended/ed/ed_1.8.bb
rename to meta/recipes-extended/ed/ed_1.9.bb
index c6b5075..bd00c52 100644
@@ -5,18 +5,17 @@ BUGTRACKER = ""
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
                     file://ed.h;endline=20;md5=375a20cc2545ac1115eeb7b323c60ae3 \
-                    file://main.c;endline=24;md5=1b31246da5e3864d7b30094ff76bf7ed"
+                    file://main.c;endline=17;md5=14dbb325c1f2d4daf50e0aa5c5038e96"
 
 SECTION = "base"
-PR = "r0"
 
 # LSB states that ed should be in /bin/
 bindir = "${base_bindir}"
 
 SRC_URI = "${GNU_MIRROR}/ed/ed-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "2268d2344b3c52d23730acb2e3c942fe"
-SRC_URI[sha256sum] = "64c138d33b1ea4b9daa88e045da0619e2a43cb99a9d378417d20163f410a7273"
+SRC_URI[md5sum] = "565b6d1d5a9a8816b9b304fc4ed9405d"
+SRC_URI[sha256sum] = "d5b372cfadf073001823772272fceac2cfa87552c5cd5a8efc1c8aae61f45a88"
 
 do_configure() {
 	${S}/configure
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/5 mkfontscale: upgrade to 1.1.1

Signed-off-by Cristiana Voicu <[email protected]>
---
 .../{mkfontscale_1.1.0.bb => mkfontscale_1.1.1.bb} |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/xorg-app/{mkfontscale_1.1.0.bb => mkfontscale_1.1.1.bb} (78%)
meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb renamed from meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb +2 -4
similarity index 78%
rename from meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb
rename to meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb
index d98057b..3d248d1 100644
@@ -10,11 +10,9 @@ is used by the mkfontdir program."
 
 DEPENDS += " zlib libfontenc freetype virtual/libx11"
 
-PR = "${INC_PR}.0"
-
 BBCLASSEXTEND = "native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f"
 
-SRC_URI[md5sum] = "414fcb053418fb1418e3a39f4a37e0f7"
-SRC_URI[sha256sum] = "ce55f862679b8ec127d7f7315ac04a8d64a0d90a0309a70dc56c1ba3f9806994"
+SRC_URI[md5sum] = "03de3f15db678e277f5ef9c013aca1ad"
+SRC_URI[sha256sum] = "244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731"
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 3/5 atk: upgrade to 2.9.3

In reply to Cristiana Voicu
Signed-off-by Cristiana Voicu <[email protected]>
---
 .../atk/{atk_2.8.0.bb => atk_2.9.3.bb}             |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/atk/{atk_2.8.0.bb => atk_2.9.3.bb} (79%)
meta/recipes-support/atk/atk_2.9.3.bb renamed from meta/recipes-support/atk/atk_2.8.0.bb +2 -2
similarity index 79%
rename from meta/recipes-support/atk/atk_2.8.0.bb
rename to meta/recipes-support/atk/atk_2.9.3.bb
index 9a36ae4..e7cc67c 100644
@@ -14,8 +14,8 @@ inherit gnomebase gtk-doc
 
 GNOME_COMPRESS_TYPE = "xz"
 
-SRC_URI[archive.md5sum] = "c652bd25530825d604dae1c1ebd2da02"
-SRC_URI[archive.sha256sum] = "b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4"
+SRC_URI[archive.md5sum] = "467447fa3d733394481c214d619690df"
+SRC_URI[archive.sha256sum] = "5fdb79c729cfad45042c3e0f55d01f57fdde3b8379b6cb5bbeb8b37478d4456d"
 
 BBCLASSEXTEND = "native"
Signature · 1 line
1.7.9.5
#4 lore raw

Re: [PATCH 3/5] atk: upgrade to 2.9.3

Quoted 3 lines · Cristiana Voicu
Signed-off-by Cristiana Voicu <[email protected]>
---
 .../atk/{atk_2.8.0.bb => atk_2.9.3.bb}             |    4 ++--

ATK is GNOME, so 2.[odd] are development releases. Drop this upgrade from the series and see if there's a 2.8.x to upgrade to.

(also, the regex can be fixed, see Emelia's patch to stop alerts for development GStreamer releases)

Ross

author
#5 lore raw

PATCH 4/5 systemtap: upgrade to 2.3

In reply to Cristiana Voicu
Signed-off-by Cristiana Voicu <[email protected]>
---
 meta/recipes-kernel/systemtap/systemtap_git.bb  |    2 --
 meta/recipes-kernel/systemtap/systemtap_git.inc |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
meta/recipes-kernel/systemtap/systemtap_git.bb +0 -2
index 9bba5a9..a0db074 100644
@@ -10,8 +10,6 @@ RDEPENDS_${PN} += "python bash"
 RDEPENDS_${PN}_class-native += "python-native"
 RDEPENDS_${PN}_class-nativesdk += "python-native"
 
-PR = "r1"
-
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
             --without-nss --without-avahi \
             --disable-server --disable-grapher "
meta/recipes-kernel/systemtap/systemtap_git.inc +2 -2
index 7be6c2b..0632746 100644
@@ -1,8 +1,8 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "addec813fed4c712d6ea752f6e4f23e602b87fad"
-PV = "2.1+git${SRCPV}"
+SRCREV = "e58138572ebddac9498b93c76770eeca7d45e3b1"
+PV = "2.3+git${SRCPV}"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \
            file://docproc-build-fix.patch \
Signature · 1 line
1.7.9.5
#6 lore raw

Re: [PATCH 4/5] systemtap: upgrade to 2.3

Quoted 6 lines · Cristiana Voicu
Signed-off-by Cristiana Voicu <[email protected]>
---
  meta/recipes-kernel/systemtap/systemtap_git.bb  |    2 --
  meta/recipes-kernel/systemtap/systemtap_git.inc |    4 ++--
  2 files changed, 2 insertions(+), 4 deletions(-)

The autobuilder caught this interesting little configuration issue when the host has Java installed:

Quoted 6 lines
| checking for javac... yes
| checking for jar... yes
| java found, will try to configure Byteman support
| checking for /usr/lib/jvm/java... configure: error: cannot check for file existence when cross compiling
| Configure failed. The contents of all config.log files follows to aid debugging
| ERROR: oe_runconf failed

You will need to disable the javac and jar checking either by patching the configure.ac or by adding some cached ac_cv... values to EXTRA_OECONF (preferred).

Sau!

Quoted 29 lines
meta/recipes-kernel/systemtap/systemtap_git.bb +0 -2
index 9bba5a9..a0db074 100644
@@ -10,8 +10,6 @@ RDEPENDS_${PN} += "python bash"
  RDEPENDS_${PN}_class-native += "python-native"
  RDEPENDS_${PN}_class-nativesdk += "python-native"
 
-PR = "r1"
-
  EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
              --without-nss --without-avahi \
              --disable-server --disable-grapher "
meta/recipes-kernel/systemtap/systemtap_git.inc +2 -2
index 7be6c2b..0632746 100644
@@ -1,8 +1,8 @@
  LICENSE = "GPLv2"
  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "addec813fed4c712d6ea752f6e4f23e602b87fad"
-PV = "2.1+git${SRCPV}"
+SRCREV = "e58138572ebddac9498b93c76770eeca7d45e3b1"
+PV = "2.3+git${SRCPV}"
 
  SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \
             file://docproc-build-fix.patch \
author
#7 lore raw

[PATCH_V2] systemtap: upgrade to 2.3

In reply to Cristiana Voicu

Disabled javac and jar.

Signed-off-by Cristiana Voicu <[email protected]>
---
 meta/recipes-kernel/systemtap/systemtap_git.bb  |    6 +++---
 meta/recipes-kernel/systemtap/systemtap_git.inc |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-kernel/systemtap/systemtap_git.bb +3 -3
index 9bba5a9..2a42086 100644
@@ -10,11 +10,11 @@ RDEPENDS_${PN} += "python bash"
 RDEPENDS_${PN}_class-native += "python-native"
 RDEPENDS_${PN}_class-nativesdk += "python-native"
 
-PR = "r1"
-
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
             --without-nss --without-avahi \
-            --disable-server --disable-grapher "
+            --disable-server --disable-grapher \
+            ac_cv_prog_have_javac=no \
+            ac_cv_prog_have_jar=no "
 
 STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs"
meta/recipes-kernel/systemtap/systemtap_git.inc +2 -2
index 7be6c2b..0632746 100644
@@ -1,8 +1,8 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "addec813fed4c712d6ea752f6e4f23e602b87fad"
-PV = "2.1+git${SRCPV}"
+SRCREV = "e58138572ebddac9498b93c76770eeca7d45e3b1"
+PV = "2.3+git${SRCPV}"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \
            file://docproc-build-fix.patch \
Signature · 1 line
1.7.9.5
author
#8 lore raw

Re: [PATCH_V2] systemtap: upgrade to 2.3

Just saw that there is a little change for systemtap on master and this patch will fail. I will send a new version.
Cristiana

-----Original Message-----
From: Voicu, Cristiana
Sent: Tuesday, August 13, 2013 10:11 AM
To: [email protected]
Cc: Voicu, Cristiana
Subject: [PATCH_V2] systemtap: upgrade to 2.3

Disabled javac and jar.

Signed-off-by Cristiana Voicu <[email protected]>
---
 meta/recipes-kernel/systemtap/systemtap_git.bb  |    6 +++---
 meta/recipes-kernel/systemtap/systemtap_git.inc |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-kernel/systemtap/systemtap_git.bb +3 -3
index 9bba5a9..2a42086 100644
@@ -10,11 +10,11 @@ RDEPENDS_${PN} += "python bash"
 RDEPENDS_${PN}_class-native += "python-native"
 RDEPENDS_${PN}_class-nativesdk += "python-native"
 
-PR = "r1"
-
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
             --without-nss --without-avahi \
-            --disable-server --disable-grapher "
+            --disable-server --disable-grapher \
+            ac_cv_prog_have_javac=no \
+            ac_cv_prog_have_jar=no "
 
 STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs"
meta/recipes-kernel/systemtap/systemtap_git.inc +2 -2
index 7be6c2b..0632746 100644
@@ -1,8 +1,8 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "addec813fed4c712d6ea752f6e4f23e602b87fad"
-PV = "2.1+git${SRCPV}"
+SRCREV = "e58138572ebddac9498b93c76770eeca7d45e3b1"
+PV = "2.3+git${SRCPV}"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \
            file://docproc-build-fix.patch \
Signature · 1 line
1.7.9.5
author
#9 lore raw

[PATCH_V3] systemtap: upgrade to 2.3

In reply to Cristiana Voicu

Disabled javac and jar.

Signed-off-by Cristiana Voicu <[email protected]>
---
 meta/recipes-kernel/systemtap/systemtap_git.bb  |    6 +++---
 meta/recipes-kernel/systemtap/systemtap_git.inc |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
meta/recipes-kernel/systemtap/systemtap_git.bb +3 -3
index 4f60f6b..bcc826a 100644
@@ -10,11 +10,11 @@ RDEPENDS_${PN} += "python bash"
 RDEPENDS_${PN}_class-native += "python-native"
 RDEPENDS_${PN}_class-nativesdk += "python-native"
 
-PR = "r1"
-
 EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
             --without-nss --without-avahi --without-dyninst \
-            --disable-server --disable-grapher "
+            --disable-server --disable-grapher \
+            ac_cv_prog_have_javac=no \
+            ac_cv_prog_have_jar=no "
 
 STAP_DOCS ?= "--disable-docs --disable-publican --disable-refdocs"
meta/recipes-kernel/systemtap/systemtap_git.inc +2 -2
index 7be6c2b..0632746 100644
@@ -1,8 +1,8 @@
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
-SRCREV = "addec813fed4c712d6ea752f6e4f23e602b87fad"
-PV = "2.1+git${SRCPV}"
+SRCREV = "e58138572ebddac9498b93c76770eeca7d45e3b1"
+PV = "2.3+git${SRCPV}"
 
 SRC_URI = "git://sourceware.org/git/systemtap.git;protocol=git \
            file://docproc-build-fix.patch \
Signature · 1 line
1.7.9.5
author
#10 lore raw

PATCH 5/5 kmod: upgrade to 14

In reply to Cristiana Voicu

Made some changes on patches to apply correctly.

Signed-off-by Cristiana Voicu <[email protected]>
---
 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(-)
meta/recipes-kernel/kmod/kmod-native_git.bb +0 -1
index 8cbcdf8..afa3ad0 100644
@@ -4,7 +4,6 @@
 require kmod.inc
 inherit native
 
-PR = "${INC_PR}.1"
 SRC_URI += "file://fix-undefined-O_CLOEXEC.patch"
 
 do_install_append (){
meta/recipes-kernel/kmod/kmod.inc +2 -3
index a780b6c..b07fc58 100644
@@ -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"
meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch +11 -10
index 5361b84..b5a8e08 100644
@@ -11,16 +11,17 @@ Signed-off-by: Martin Jansa <[email protected]>
  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 =
meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch +2 -3
index 3177e9a..49728c2 100644
@@ -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
meta/recipes-kernel/kmod/kmod_git.bb +1 -2
index f92ff72..28ce194 100644
@@ -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"
Signature · 1 line
1.7.9.5
#11 lore raw

Re: [PATCH 5/5] kmod: upgrade to 14

Quoted 2 lines · Cristiana Voicu

Made some changes on patches to apply correctly.

Seems to be an issue with building the kmod-native_git Autobuilder failed to build this, one example:

http://autobuilder.yoctoproject.org:8011/builders/build-appliance/builds/245/steps/Building%20Images_1/logs/stdio

I have removed it for now.

Thanks
Sau!

Quoted 107 lines
Signed-off-by Cristiana Voicu <[email protected]>
---
  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(-)
meta/recipes-kernel/kmod/kmod-native_git.bb +0 -1
index 8cbcdf8..afa3ad0 100644
@@ -4,7 +4,6 @@
  require kmod.inc
  inherit native
 
-PR = "${INC_PR}.1"
  SRC_URI += "file://fix-undefined-O_CLOEXEC.patch"
 
  do_install_append (){
meta/recipes-kernel/kmod/kmod.inc +2 -3
index a780b6c..b07fc58 100644
@@ -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"
meta/recipes-kernel/kmod/kmod/0001-man-disable-man-page-generation-because-we-don-t-hav.patch +11 -10
index 5361b84..b5a8e08 100644
@@ -11,16 +11,17 @@ Signed-off-by: Martin Jansa <[email protected]>
   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 =
meta/recipes-kernel/kmod/kmod/fix-undefined-O_CLOEXEC.patch +2 -3
index 3177e9a..49728c2 100644
@@ -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
meta/recipes-kernel/kmod/kmod_git.bb +1 -2
index f92ff72..28ce194 100644
@@ -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"