mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

kmod: upgrade to 26

Browse Source 
Refresh patches to avoid warning.

(From OE-Core rev: 5dc170d74e932e1dbfc58d23b204bf1d9ebc6e42)

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chen Qi
2019-02-20 09:40:35 +08:00
committed by Richard Purdie
parent a79bc39033
commit c1e26de9c2
4 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-kernel/kmod/kmod.inc
+2 -2
View File
@@ -14,9 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
" "
inherit autotools gtk-doc pkgconfig manpages inherit autotools gtk-doc pkgconfig manpages
SRCREV = "aca4eca103d6699543f7ed663335c28c2e9908bb" SRCREV = "58133a96c894c043e48c74ddf0bfe8db90bac62f"
# Lookout for PV bump too when SRCREV is changed # Lookout for PV bump too when SRCREV is changed
PV = "25+git${SRCPV}" PV = "26+git${SRCPV}"
SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
file://depmod-search.conf \ file://depmod-search.conf \
meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
+9 -8
View File
@@ -1,4 +1,7 @@
Subject: Change to calling bswap_* instead of htobe* and be*toh From 38d6871d9c98e0080426ea375e390728485b2bc2 Mon Sep 17 00:00:00 2001
From: Ting Liu <b28495@freescale.com>
Date: Tue, 10 Sep 2013 06:00:20 +0000
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 We can't use htobe* and be*toh functions because they are not
available on older versions of glibc, For example, shipped on Centos 5.5. available on older versions of glibc, For example, shipped on Centos 5.5.
@@ -9,12 +12,13 @@ Upstream-Status: Inappropriate
Signed-off-by: Ting Liu <b28495@freescale.com> Signed-off-by: Ting Liu <b28495@freescale.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
--- ---
libkmod/libkmod-signature.c | 3 ++- libkmod/libkmod-signature.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
index 6fc06fc..912185a 100644 index 48d0145..dd2c6fa 100644
--- a/libkmod/libkmod-signature.c --- a/libkmod/libkmod-signature.c
+++ b/libkmod/libkmod-signature.c +++ b/libkmod/libkmod-signature.c
@@ -18,6 +18,7 @@ @@ -18,6 +18,7 @@
@@ -23,9 +27,9 @@ index 6fc06fc..912185a 100644
#include <endian.h> #include <endian.h>
+#include <byteswap.h> +#include <byteswap.h>
#include <inttypes.h> #include <inttypes.h>
#include <stdio.h> #ifdef ENABLE_OPENSSL
#include <stdlib.h> #include <openssl/cms.h>
@@ -127,7 +128,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat @@ -343,7 +344,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
modsig->hash >= PKEY_HASH__LAST || modsig->hash >= PKEY_HASH__LAST ||
modsig->id_type >= PKEY_ID_TYPE__LAST) modsig->id_type >= PKEY_ID_TYPE__LAST)
return false; return false;
@@ -34,6 +38,3 @@ index 6fc06fc..912185a 100644
if (sig_len == 0 || if (sig_len == 0 ||
size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len)) size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len))
return false; return false;
--
1.9.1
meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch
+9 -4
View File
@@ -1,3 +1,8 @@
From be6f82c54f694617c646ca1f8b5bcf93694e20ad Mon Sep 17 00:00:00 2001
From: Tudor Florea <tudor.florea@enea.com>
Date: Fri, 6 Sep 2013 21:11:57 +0000
Subject: [PATCH] kmod: avoid parallel-tests
Avoid parallel-tests as it remove Avoid parallel-tests as it remove
buildtest-TESTS and runtest-TESTS targets required by ptest. buildtest-TESTS and runtest-TESTS targets required by ptest.
In automake 1.13.4 parallel-tests is assumed by defauls. In automake 1.13.4 parallel-tests is assumed by defauls.
@@ -11,10 +16,10 @@ Upstream-Status: Inappropriate (disable feature incompatible with ptest)
configure.ac | 2 +- configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
Index: git/configure.ac diff --git a/configure.ac b/configure.ac
=================================================================== index ee72283..60980c0 100644
--- git.orig/configure.ac --- a/configure.ac
+++ git/configure.ac +++ b/configure.ac
@@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS @@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
AC_PREFIX_DEFAULT([/usr]) AC_PREFIX_DEFAULT([/usr])
meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
+7 -6
View File
@@ -1,4 +1,4 @@
From bd43367eee868059770188fd9e9db38520dc6fff Mon Sep 17 00:00:00 2001 From 5f55e6806cd8ae1a6c8ec1e6cb38ad292cfc1df9 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com> From: Robert Yang <liezhi.yang@windriver.com>
Date: Wed, 22 Jan 2014 01:06:40 -0500 Date: Wed, 22 Jan 2014 01:06:40 -0500
Subject: [PATCH] libkmod/libkmod-internal.h: check whether O_CLOEXEC is Subject: [PATCH] libkmod/libkmod-internal.h: check whether O_CLOEXEC is
@@ -14,14 +14,15 @@ This problem was reported by "Ting Liu <b28495@freescale.com>"
Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Upstream-Status: Pending Upstream-Status: Pending
--- ---
libkmod/libkmod-internal.h | 4 ++++ libkmod/libkmod-internal.h | 4 ++++
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
Index: git/libkmod/libkmod-internal.h diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
=================================================================== index a65ddd1..a4f4b77 100644
--- git.orig/libkmod/libkmod-internal.h --- a/libkmod/libkmod-internal.h
+++ git/libkmod/libkmod-internal.h +++ b/libkmod/libkmod-internal.h
@@ -10,6 +10,10 @@ @@ -10,6 +10,10 @@
#include "libkmod.h" #include "libkmod.h"