Commit 047fea1d authored by Vicente Olivert Riera's avatar Vicente Olivert Riera Committed by Thomas Petazzoni
Browse files

kmod: bump to version 19



- Bump to version 19
- Rename 0001 patch to follow the new name convention
- Adapt the 0001 patch to the new version
- Remove the already-upstreamed 0002 patch
- Update the hash value

[Thomas: adapt comment in the updated 0001 patch.]

Signed-off-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 0d9084ce
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -15,20 +15,23 @@ This problem was reported by "Ting Liu <b28495@freescale.com>"
 - move dummy definition from libkmod-internal.h to missing.h
 - update commit title]

[Vicente: Adapt this patch to version 19.]

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>

Upstream-status: rejected, suggests to add in buildroot instead [1]

[1] http://news.gmane.org/find-root.php?message_id=1412062906%2d27378%2d1%2dgit%2dsend%2demail%2dpatrickdepinguin%40gmail.com

---
 libkmod/missing.h |    4 ++++
 shared/missing.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libkmod/missing.h b/libkmod/missing.h
diff --git a/shared/missing.h b/shared/missing.h
index 4c0d136..e123e98 100644
--- a/libkmod/missing.h
+++ b/libkmod/missing.h
--- a/shared/missing.h
+++ b/shared/missing.h
@@ -19,6 +19,10 @@
 # define __NR_finit_module -1
 #endif
+0 −72
Original line number Diff line number Diff line
From bda1ed2aefee23b0eedbcd9f82e73c2547908438 Mon Sep 17 00:00:00 2001
From: Randy MacLeod <Randy.MacLeod@windriver.com>
Date: Mon, 29 Sep 2014 12:32:20 +0200
Subject: [PATCH] Add back-up implementation of be32toh()

Older systems may not have the be32toh function defined. Check for this
and fall back to checking the endianness and calling bswap_32 directly
if needed.  This works on both old and new systems.

[Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>:
address comments raised by Lucas De Marchi [1], update commit message]

Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>

Upstream-status: accepted [2]

[1] http://www.spinics.net/lists/linux-modules/msg01129.html
[2] https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=9b34db1ae63427269f918b2868b4cfcb50e6259b

---
 configure.ac                |    3 +++
 libkmod/libkmod-signature.c |    1 +
 libkmod/missing.h           |   10 ++++++++++
 3 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7781ce1..cd676bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,9 @@ AC_CHECK_MEMBERS([struct stat.st_mtim], [], [], [#include <sys/stat.h>])
 # musl 1.0 and bionic 4.4 don't have strndupa
 AC_CHECK_DECLS_ONCE([strndupa])
 
+# RHEL 5 and older do not have be32toh
+AC_CHECK_DECLS_ONCE([be32toh])
+
 # Check kernel headers
 AC_CHECK_HEADERS_ONCE([linux/module.h])
 
diff --git a/libkmod/libkmod-signature.c b/libkmod/libkmod-signature.c
index a3ac15e..28f993e 100644
--- a/libkmod/libkmod-signature.c
+++ b/libkmod/libkmod-signature.c
@@ -25,6 +25,7 @@
 #include <stdio.h>
 
 #include "libkmod-internal.h"
+#include "missing.h"
 
 /* These types and tables were copied from the 3.7 kernel sources.
  * As this is just description of the signature format, it should not be
diff --git a/libkmod/missing.h b/libkmod/missing.h
index 8d47af8..4c0d136 100644
--- a/libkmod/missing.h
+++ b/libkmod/missing.h
@@ -43,3 +43,13 @@ static inline int finit_module(int fd, const char *uargs, int flags)
 		memcpy(__new, __old, __len);				\
 	 })
 #endif
+
+#if !HAVE_DECL_BE32TOH
+#include <endian.h>
+#include <byteswap.h>
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define be32toh(x) bswap_32 (x)
+#else
+#define be32toh(x) (x)
+#endif
+#endif
-- 
1.7.1
+1 −1
Original line number Diff line number Diff line
# From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc
sha256	e16e57272b54acb219c465b334715cfdddb5d97ff5d8948d4830ca1a372a868e	kmod-18.tar.xz
sha256  3e7fee6eeff5435848b2dcc852bc8959066478d687d232284d67300c071e7b14  kmod-19.tar.xz
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
#
################################################################################

KMOD_VERSION = 18
KMOD_VERSION = 19
KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
KMOD_INSTALL_STAGING = YES