diff options
| author | Robert Schwebel <r.schwebel@pengutronix.de> | 2014-01-13 19:38:28 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2014-01-17 10:58:27 +0100 |
| commit | 8bc26cc9c341cfa4297777dab2290883320957f7 (patch) | |
| tree | b4888a74cbf90125e131ecd94de5ab3c362476b4 | |
| parent | 346ab36cb5fbaaa3cadcdbea3e90890347585317 (diff) | |
| download | ptxdist-8bc26cc9c341cfa4297777dab2290883320957f7.tar.gz ptxdist-8bc26cc9c341cfa4297777dab2290883320957f7.tar.xz | |
libkmod: version bump 13 -> 16
The patch applied to kmod-13 is upstream meanwhile, so we remove it.
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch | 40 | ||||
| -rw-r--r-- | patches/kmod-13/series | 4 | ||||
| -rw-r--r-- | rules/libkmod.make | 4 |
3 files changed, 2 insertions, 46 deletions
diff --git a/patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch b/patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch deleted file mode 100644 index a385d6320..000000000 --- a/patches/kmod-13/0001-missing-Don-t-call-syscall-with-syscallno-1.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Lucas De Marchi <lucas.de.marchi@gmail.com> -Date: Thu, 2 May 2013 13:22:57 -0300 -Subject: [PATCH] missing: Don't call syscall() with syscallno == -1 - -Reported-by: Jean-Francis Roy <jeanfrancis@funtoo.org> -Reported-by: Jan Luebbe <jlu@pengutronix.de> ---- - libkmod/missing.h | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/libkmod/missing.h b/libkmod/missing.h -index edb88b9..b31af84 100644 ---- a/libkmod/missing.h -+++ b/libkmod/missing.h -@@ -1,5 +1,6 @@ - #pragma once - -+#include <errno.h> - #include <unistd.h> - #include <sys/syscall.h> - -@@ -15,13 +16,14 @@ - # define MODULE_INIT_IGNORE_VERMAGIC 2 - #endif - --#ifndef __NR_finit_module --# define __NR_finit_module -1 --#endif -- - #ifndef HAVE_FINIT_MODULE - static inline int finit_module(int fd, const char *uargs, int flags) - { -+#ifndef __NR_finit_module -+ errno = ENOSYS; -+ return -1; -+#else - return syscall(__NR_finit_module, fd, uargs, flags); -+#endif - } - #endif diff --git a/patches/kmod-13/series b/patches/kmod-13/series deleted file mode 100644 index 3fc301f89..000000000 --- a/patches/kmod-13/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-missing-Don-t-call-syscall-with-syscallno-1.patch -# 0b7413dd7632441bc24225859a7d1866 - git-ptx-patches magic diff --git a/rules/libkmod.make b/rules/libkmod.make index 4595b6849..761c5df4e 100644 --- a/rules/libkmod.make +++ b/rules/libkmod.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBKMOD) += libkmod # # Paths and names # -LIBKMOD_VERSION := 13 -LIBKMOD_MD5 := d5aba43b9370cd52f3cb35e82a1aa595 +LIBKMOD_VERSION := 16 +LIBKMOD_MD5 := 3006a0287211212501cdfe1211b29f09 LIBKMOD := kmod-$(LIBKMOD_VERSION) LIBKMOD_SUFFIX := tar.xz LIBKMOD_URL := $(call ptx/mirror, KERNEL, utils/kernel/kmod/$(LIBKMOD).$(LIBKMOD_SUFFIX)) |