jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

kmod: bump version

Browse Source 
syscall patch is now upstream and static linking is no longer supported.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2013-07-03 21:40:53 +02:00
parent 666caf601a
commit 3c3211ccde
2 changed files with 5 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
package/kmod/kmod-001-no-syscall--1.patch
View File

@ -1,31 +0,0 @@
From 5eac795b8b067842caec32f96d55a7554c3c67f9 Mon Sep 17 00:00:00 2001
From: Jan Luebbe <jlu@pengutronix.de>
Date: Thu, 02 May 2013 14:47:12 +0000
Subject: libkmod: Avoid calling syscall() with -1
At least in qemu 1.4.1 for vexpress/arm-cortexa9, this resulted in an
illegal instruction error. Solve that by returning an error when
__NR_finit_module is -1.
---
diff --git a/libkmod/missing.h b/libkmod/missing.h
index edb88b9..b45bbe2 100644
--- a/libkmod/missing.h
+++ b/libkmod/missing.h
@@ -20,8 +20,15 @@
#endif
#ifndef HAVE_FINIT_MODULE
+#include <errno.h>
+
static inline int finit_module(int fd, const char *uargs, int flags)
{
+ if (__NR_finit_module == -1) {
+ errno = ENOSYS;
+ return -1;
+ }
+
return syscall(__NR_finit_module, fd, uargs, flags);
}
#endif
--
cgit v0.9.2

6
package/kmod/kmod.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
KMOD_VERSION = 13 KMOD_VERSION = 14
KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/ KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/
KMOD_INSTALL_STAGING = YES KMOD_INSTALL_STAGING = YES
@ -14,6 +14,10 @@ KMOD_DEPENDENCIES = host-pkgconf
KMOD_LICENSE = LGPLv2.1+ KMOD_LICENSE = LGPLv2.1+
KMOD_LICENSE_FILES = libkmod/COPYING KMOD_LICENSE_FILES = libkmod/COPYING
# static linking not supported, see
# https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=b7016153ec8
KMOD_CONF_OPT = --disable-static --enable-shared
ifneq ($(BR2_HAVE_DOCUMENTATION),y) ifneq ($(BR2_HAVE_DOCUMENTATION),y)
KMOD_CONF_OPT += --disable-manpages KMOD_CONF_OPT += --disable-manpages
endif endif