summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/kmod
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-03-06 21:21:54 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-07 12:27:34 +0000
commit28cc7b4362c703d35916b22bb705bd9517e7c505 (patch)
tree5db2ad6803ea612d13be9fc349f776e4b0fbc932 /meta/recipes-kernel/kmod
parentc5882f92128c8e27ca6f227a9aac90aa0b4b1e52 (diff)
downloadpoky-28cc7b4362c703d35916b22bb705bd9517e7c505.tar.gz
kmod: Remove compatibility for ancient hosts
Lack of be32toh() is handled upstream since 2014. Linux 2.6.23 was released 2007, distributions with kernels older than that are far outside the host distributions still supported today. (From OE-Core rev: c4d77ddd13ad43b52f22a32dc7a3d34cc2692dce) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kmod')
-rw-r--r--meta/recipes-kernel/kmod/kmod-native_git.bb3
-rw-r--r--meta/recipes-kernel/kmod/kmod.inc1
-rw-r--r--meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch40
-rw-r--r--meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch36
4 files changed, 0 insertions, 80 deletions
diff --git a/meta/recipes-kernel/kmod/kmod-native_git.bb b/meta/recipes-kernel/kmod/kmod-native_git.bb
index f0e274ed79..f61134bbaf 100644
--- a/meta/recipes-kernel/kmod/kmod-native_git.bb
+++ b/meta/recipes-kernel/kmod/kmod-native_git.bb
@@ -7,9 +7,6 @@ DEPENDS += "zlib-native"
7 7
8inherit native 8inherit native
9 9
10SRC_URI += "file://Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch \
11 "
12
13do_install_append (){ 10do_install_append (){
14 for tool in depmod insmod lsmod modinfo modprobe rmmod 11 for tool in depmod insmod lsmod modinfo modprobe rmmod
15 do 12 do
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc
index 6d0e031c6f..e68860f6b4 100644
--- a/meta/recipes-kernel/kmod/kmod.inc
+++ b/meta/recipes-kernel/kmod/kmod.inc
@@ -21,7 +21,6 @@ PV = "26"
21SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ 21SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \
22 file://depmod-search.conf \ 22 file://depmod-search.conf \
23 file://avoid_parallel_tests.patch \ 23 file://avoid_parallel_tests.patch \
24 file://fix-O_CLOEXEC.patch \
25 " 24 "
26 25
27S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"
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
deleted file mode 100644
index 0ec20fad99..0000000000
--- a/meta/recipes-kernel/kmod/kmod/Change-to-calling-bswap_-instead-of-htobe-and-be-toh.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 38d6871d9c98e0080426ea375e390728485b2bc2 Mon Sep 17 00:00:00 2001
2From: Ting Liu <b28495@freescale.com>
3Date: Tue, 10 Sep 2013 06:00:20 +0000
4Subject: [PATCH] Change to calling bswap_* instead of htobe* and be*toh
5
6We can't use htobe* and be*toh functions because they are not
7available on older versions of glibc, For example, shipped on Centos 5.5.
8
9Change to directly calling bswap_* as defined in+byteswap.h.
10
11Upstream-Status: Inappropriate
12
13Signed-off-by: Ting Liu <b28495@freescale.com>
14Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
15
16---
17 libkmod/libkmod-signature.c | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-)
19
20diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
21index 48d0145..dd2c6fa 100644
22--- a/libkmod/libkmod-signature.c
23+++ b/libkmod/libkmod-signature.c
24@@ -18,6 +18,7 @@
25 */
26
27 #include <endian.h>
28+#include <byteswap.h>
29 #include <inttypes.h>
30 #ifdef ENABLE_OPENSSL
31 #include <openssl/cms.h>
32@@ -343,7 +344,7 @@ bool kmod_module_signature_info(const struct kmod_file *file, struct kmod_signat
33 modsig->hash >= PKEY_HASH__LAST ||
34 modsig->id_type >= PKEY_ID_TYPE__LAST)
35 return false;
36- sig_len = be32toh(get_unaligned(&modsig->sig_len));
37+ sig_len = bswap_32(get_unaligned(&modsig->sig_len));
38 if (sig_len == 0 ||
39 size < (int64_t)(modsig->signer_len + modsig->key_id_len + sig_len))
40 return false;
diff --git a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch b/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
deleted file mode 100644
index 07e4a1f538..0000000000
--- a/meta/recipes-kernel/kmod/kmod/fix-O_CLOEXEC.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 5f55e6806cd8ae1a6c8ec1e6cb38ad292cfc1df9 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 22 Jan 2014 01:06:40 -0500
4Subject: [PATCH] libkmod/libkmod-internal.h: check whether O_CLOEXEC is
5 defined or not
6
7O_CLOEXEC is introduced from Linux 2.6.23, so old kernel doesn't have
8it, we need check before use.
9
10This patch is much more like a workaround, since it may need fcntl() use
11FD_CLOEXEC to replace.
12
13This problem was reported by "Ting Liu <b28495@freescale.com>"
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15
16Upstream-Status: Pending
17
18---
19 libkmod/libkmod-internal.h | 4 ++++
20 1 file changed, 4 insertions(+)
21
22diff --git a/libkmod/libkmod-internal.h b/libkmod/libkmod-internal.h
23index a65ddd1..a4f4b77 100644
24--- a/libkmod/libkmod-internal.h
25+++ b/libkmod/libkmod-internal.h
26@@ -10,6 +10,10 @@
27
28 #include "libkmod.h"
29
30+#ifndef O_CLOEXEC
31+#define O_CLOEXEC 0
32+#endif
33+
34 static _always_inline_ _printf_format_(2, 3) void
35 kmod_log_null(struct kmod_ctx *ctx, const char *format, ...) {}
36