kmod: upgrade to 19
0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch is dropped as it's in the new version. Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch is modified to match the new version. License chesum is changed but it is confirmed that the license information is not chagned. (From OE-Core rev: 234d61aa89deecf909938bfba39601f79bdcfaee) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c73a6ca2a8
commit
09c1c79611
|
@ -11,14 +11,14 @@ SECTION = "base"
|
|||
|
||||
DEPENDS += "pkgconfig-native"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
|
||||
file://libkmod/COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
|
||||
"
|
||||
inherit autotools gtk-doc ptest
|
||||
|
||||
SRCREV = "ae58de0fcb4a6528dd365e23d383bbe2eaf2d566"
|
||||
SRCREV = "fd56638aed3fe147015bfa10ed4a5f7491303cb4"
|
||||
# Lookout for PV bump too when SRCREV is changed
|
||||
PV = "18+git${SRCPV}"
|
||||
PV = "19+git${SRCPV}"
|
||||
|
||||
SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
|
||||
file://depmod-search.conf \
|
||||
|
@ -26,7 +26,6 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
|
|||
file://ptest.patch \
|
||||
file://avoid_parallel_tests.patch \
|
||||
file://fix-O_CLOEXEC.patch \
|
||||
file://0001-Add-missing-O_CLOEXEC-in-kmod_module_get_size.patch \
|
||||
"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
|
|
@ -1,27 +0,0 @@
|
|||
From 74c26943f1228870022d116a1fda25be3a55a38e Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
|
||||
Date: Wed, 18 Jun 2014 20:51:00 -0400
|
||||
Subject: [PATCH] Add missing O_CLOEXEC in kmod_module_get_size()
|
||||
|
||||
Upstream-Status: Backport
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
---
|
||||
libkmod/libkmod-module.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c
|
||||
index e3cc5a7..b81b451 100644
|
||||
--- a/libkmod/libkmod-module.c
|
||||
+++ b/libkmod/libkmod-module.c
|
||||
@@ -1783,7 +1783,7 @@ KMOD_EXPORT long kmod_module_get_size(const struct kmod_module *mod)
|
||||
* loaded.
|
||||
*/
|
||||
snprintf(line, sizeof(line), "/sys/module/%s", mod->name);
|
||||
- dfd = open(line, O_RDONLY);
|
||||
+ dfd = open(line, O_RDONLY|O_CLOEXEC);
|
||||
if (dfd < 0)
|
||||
return -errno;
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
From 0c4dbadc9db3cda1cfca64e44ea08c6e89919ea7 Mon Sep 17 00:00:00 2001
|
||||
From: Ting Liu <b28495@freescale.com>
|
||||
Date: Tue, 10 Sep 2013 13:44:18 +0800
|
||||
From 4b68940b1ed46c54a5a0bdf6bb9d4599bc64e6f4 Mon Sep 17 00:00:00 2001
|
||||
From: Chen Qi <Qi.Chen@windriver.com>
|
||||
Date: Wed, 24 Dec 2014 10:12:40 +0800
|
||||
Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
|
||||
|
||||
We can't use htobe* and be*toh functions because they are not
|
||||
|
@ -11,12 +11,13 @@ Change to directly calling bswap_* as defined in+byteswap.h.
|
|||
Upstream-Status: Inappropriate
|
||||
|
||||
Signed-off-by: Ting Liu <b28495@freescale.com>
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
---
|
||||
libkmod/libkmod-signature.c | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
libkmod/libkmod-signature.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
|
||||
index 6b80caa..3544a36 100644
|
||||
index 2b976a5..ffe58c2 100644
|
||||
--- a/libkmod/libkmod-signature.c
|
||||
+++ b/libkmod/libkmod-signature.c
|
||||
@@ -19,6 +19,7 @@
|
||||
|
@ -24,10 +25,10 @@ index 6b80caa..3544a36 100644
|
|||
|
||||
#include <endian.h>
|
||||
+#include <byteswap.h>
|
||||
#include <stdint.h>
|
||||
#include <inttypes.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -121,7 +122,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
|
||||
@@ -124,7 +125,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
|
||||
modsig->hash >= PKEY_HASH__LAST ||
|
||||
modsig->id_type >= PKEY_ID_TYPE__LAST)
|
||||
return false;
|
||||
|
@ -37,5 +38,5 @@ index 6b80caa..3544a36 100644
|
|||
return false;
|
||||
|
||||
--
|
||||
1.7.5.4
|
||||
1.9.1
|
||||
|
||||
|
|
Loading…
Reference in New Issue