diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2019-02-20 09:40:35 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-20 11:30:35 +0000 |
commit | c1e26de9c276d2cbfb7818e23972b133db20540d (patch) | |
tree | e0aa3e41a5caeb7f4bda482d5a46b227ab7d14f1 /meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch | |
parent | a79bc39033c07e5cb0aa5ca95afe8f035c403f33 (diff) | |
download | poky-c1e26de9c276d2cbfb7818e23972b133db20540d.tar.gz |
kmod: upgrade to 26
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>
Diffstat (limited to 'meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch')
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch index b722183b68..0ec20fad99 100644 --- a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch +++ b/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch | |||
@@ -1,4 +1,7 @@ | |||
1 | Subject: Change to calling bswap_* instead of htobe* and be*toh | 1 | From 38d6871d9c98e0080426ea375e390728485b2bc2 Mon Sep 17 00:00:00 2001 |
2 | From: Ting Liu <b28495@freescale.com> | ||
3 | Date: Tue, 10 Sep 2013 06:00:20 +0000 | ||
4 | Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh | ||
2 | 5 | ||
3 | We can't use htobe* and be*toh functions because they are not | 6 | We can't use htobe* and be*toh functions because they are not |
4 | available on older versions of glibc, For example, shipped on Centos 5.5. | 7 | available on older versions of glibc, For example, shipped on Centos 5.5. |
@@ -9,12 +12,13 @@ Upstream-Status: Inappropriate | |||
9 | 12 | ||
10 | Signed-off-by: Ting Liu <b28495@freescale.com> | 13 | Signed-off-by: Ting Liu <b28495@freescale.com> |
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
15 | |||
12 | --- | 16 | --- |
13 | libkmod/libkmod-signature.c | 3 ++- | 17 | libkmod/libkmod-signature.c | 3 ++- |
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 18 | 1 file changed, 2 insertions(+), 1 deletion(-) |
15 | 19 | ||
16 | diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c | 20 | diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c |
17 | index 6fc06fc..912185a 100644 | 21 | index 48d0145..dd2c6fa 100644 |
18 | --- a/libkmod/libkmod-signature.c | 22 | --- a/libkmod/libkmod-signature.c |
19 | +++ b/libkmod/libkmod-signature.c | 23 | +++ b/libkmod/libkmod-signature.c |
20 | @@ -18,6 +18,7 @@ | 24 | @@ -18,6 +18,7 @@ |
@@ -23,9 +27,9 @@ index 6fc06fc..912185a 100644 | |||
23 | #include <endian.h> | 27 | #include <endian.h> |
24 | +#include <byteswap.h> | 28 | +#include <byteswap.h> |
25 | #include <inttypes.h> | 29 | #include <inttypes.h> |
26 | #include <stdio.h> | 30 | #ifdef ENABLE_OPENSSL |
27 | #include <stdlib.h> | 31 | #include <openssl/cms.h> |
28 | @@ -127,7 +128,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat | 32 | @@ -343,7 +344,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat |
29 | modsig->hash >= PKEY_HASH__LAST || | 33 | modsig->hash >= PKEY_HASH__LAST || |
30 | modsig->id_type >= PKEY_ID_TYPE__LAST) | 34 | modsig->id_type >= PKEY_ID_TYPE__LAST) |
31 | return false; | 35 | return false; |
@@ -34,6 +38,3 @@ index 6fc06fc..912185a 100644 | |||
34 | if (sig_len == 0 || | 38 | if (sig_len == 0 || |
35 | size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len)) | 39 | size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len)) |
36 | return false; | 40 | return false; |
37 | -- | ||
38 | 1.9.1 | ||
39 | |||