diff --git a/.checkpackageignore b/.checkpackageignore index db6e8b883a..b2d5320045 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -461,7 +461,6 @@ package/iucode-tool/S00iucode-tool lib_sysv.Variables package/kexec-lite/0001-clean-restart.patch lib_patch.Upstream package/keyutils/0001-fix-install-rule.patch lib_patch.Upstream package/keyutils/0002-cifs.patch lib_patch.Sob lib_patch.Upstream -package/kmod/0001-fix-O_CLOEXEC.patch lib_patch.Upstream package/kodi/S50kodi Shellcheck lib_sysv.Variables package/lbase64/0001-retro-compatible-with-Lua-5.1.patch lib_patch.Upstream package/lcdproc/0001-LCDd.conf.patch lib_patch.Upstream diff --git a/package/kmod/0001-fix-O_CLOEXEC.patch b/package/kmod/0001-fix-O_CLOEXEC.patch deleted file mode 100644 index 145ac34207..0000000000 --- a/package/kmod/0001-fix-O_CLOEXEC.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b39a62f6682463bcd47480348fac3dcd209a19a5 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Wed, 22 Jan 2014 01:06:40 -0500 -Subject: [PATCH] Add dummy definition of O_CLOEXEC - -O_CLOEXEC is introduced from Linux 2.6.23, so old kernel doesn't have -it, we need check before use. - -This patch is much more like a workaround, since it may need fcntl() use -FD_CLOEXEC to replace. - -This problem was reported by "Ting Liu " - -[Thomas De Schampheleire -Signed-off-by: Vicente Olivert Riera - -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 - ---- - shared/missing.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/shared/missing.h b/shared/missing.h -index 4c0d136..e123e98 100644 ---- a/shared/missing.h -+++ b/shared/missing.h -@@ -19,6 +19,10 @@ - # define __NR_finit_module -1 - #endif - -+#ifndef O_CLOEXEC -+#define O_CLOEXEC 0 -+#endif -+ - #ifndef HAVE_FINIT_MODULE - #include - --- -1.7.1 - diff --git a/package/kmod/kmod.hash b/package/kmod/kmod.hash index 46a2d538ad..032f96adfe 100644 --- a/package/kmod/kmod.hash +++ b/package/kmod/kmod.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 dc768b3155172091f56dc69430b5481f2d76ecd9ccb54ead8c2540dbcf5ea9bc kmod-33.tar.xz +sha256 5a5d5073070cc7e0c7a7a3c6ec2a0e1780850c8b47b3e3892226b93ffcb9cb54 kmod-34.2.tar.xz # Locally calculated sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index cbf89bca9d..db9b3cdf21 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -4,7 +4,7 @@ # ################################################################################ -KMOD_VERSION = 33 +KMOD_VERSION = 34.2 KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod KMOD_INSTALL_STAGING = YES