diff options
-rw-r--r-- | meta/recipes-kernel/kmod/kmod.inc | 7 | ||||
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/0001-build-Stop-using-dolt.patch | 28 |
2 files changed, 3 insertions, 32 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index 334453838e..b7c5cbef12 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc | |||
@@ -14,15 +14,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ | |||
14 | " | 14 | " |
15 | inherit autotools gtk-doc pkgconfig manpages | 15 | inherit autotools gtk-doc pkgconfig manpages |
16 | 16 | ||
17 | SRCREV = "58133a96c894c043e48c74ddf0bfe8db90bac62f" | 17 | SRCREV = "819a125ca756003dce2d11624035b7fb605a8e99" |
18 | # Lookout for PV bump too when SRCREV is changed | 18 | # Lookout for PV bump too when SRCREV is changed |
19 | PV = "26" | 19 | PV = "27" |
20 | 20 | ||
21 | SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ | 21 | SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ |
22 | file://depmod-search.conf \ | 22 | file://depmod-search.conf \ |
23 | file://0001-build-Stop-using-dolt.patch \ | ||
24 | file://avoid_parallel_tests.patch \ | 23 | file://avoid_parallel_tests.patch \ |
25 | " | 24 | " |
26 | 25 | ||
27 | S = "${WORKDIR}/git" | 26 | S = "${WORKDIR}/git" |
28 | 27 | ||
diff --git a/meta/recipes-kernel/kmod/kmod/0001-build-Stop-using-dolt.patch b/meta/recipes-kernel/kmod/kmod/0001-build-Stop-using-dolt.patch deleted file mode 100644 index c915ad5e8a..0000000000 --- a/meta/recipes-kernel/kmod/kmod/0001-build-Stop-using-dolt.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From f8b8d7b330433511d19a936ddfc7b7d1af5490b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian Bunk <bunk@kernel.org> | ||
3 | Date: Wed, 20 Feb 2019 14:22:04 +0200 | ||
4 | Subject: build: Stop using dolt | ||
5 | |||
6 | This does regress "make -12" from 0.7s to 0.9s on my | ||
7 | Coffee Lake machine, but even on slower hardware this | ||
8 | will not amount to a noticable slowdown. | ||
9 | |||
10 | On the other hand using dolt can create problems for | ||
11 | people doing cross-compilation, e.g. Yocto has two | ||
12 | hacks just for dolt in kmod: | ||
13 | https://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/recipes-kernel/kmod/kmod.inc?id=a17abae00785c76cfffe5381a22fb2c86b982e82 | ||
14 | |||
15 | Signed-off-by: Adrian Bunk <bunk@kernel.org> | ||
16 | Upstream-Status: Backport | ||
17 | |||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -17,7 +17,6 @@ AM_MAINTAINER_MODE([enable]) | ||
21 | AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests parallel-tests]) | ||
22 | AM_SILENT_RULES([yes]) | ||
23 | LT_INIT([disable-static pic-only]) | ||
24 | -DOLT | ||
25 | |||
26 | AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by kmod])]) | ||
27 | AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by kmod])]) | ||
28 | |||