diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-08-18 18:00:32 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-21 15:29:02 +0100 |
commit | 10d40f5971fd64810d0256bfbe175b717398ef03 (patch) | |
tree | 577f9a22e3cb533cdb3d25241e068e3902bcea7e /meta/recipes-kernel/kmod/kmod | |
parent | fe6d059212647338809998ddadbf4c876f600066 (diff) | |
download | poky-10d40f5971fd64810d0256bfbe175b717398ef03.tar.gz |
kmod: Replace dolt hacks with backport of upstream dolt removal
(From OE-Core rev: 66492f40c23778a5644bc4e7f4acf7e4ef16bf36)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/kmod/kmod')
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/0001-build-Stop-using-dolt.patch | 28 | ||||
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch | 5 |
2 files changed, 31 insertions, 2 deletions
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 new file mode 100644 index 0000000000..c915ad5e8a --- /dev/null +++ b/meta/recipes-kernel/kmod/kmod/0001-build-Stop-using-dolt.patch | |||
@@ -0,0 +1,28 @@ | |||
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 | |||
diff --git a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch index 990c338fa9..04a8204815 100644 --- a/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch +++ b/meta/recipes-kernel/kmod/kmod/avoid_parallel_tests.patch | |||
@@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac | |||
20 | index ee72283..60980c0 100644 | 20 | index ee72283..60980c0 100644 |
21 | --- a/configure.ac | 21 | --- a/configure.ac |
22 | +++ b/configure.ac | 22 | +++ b/configure.ac |
23 | @@ -14,7 +14,7 @@ AC_USE_SYSTEM_EXTENSIONS | 23 | @@ -14,8 +14,8 @@ AC_USE_SYSTEM_EXTENSIONS |
24 | AC_SYS_LARGEFILE | 24 | AC_SYS_LARGEFILE |
25 | AC_PREFIX_DEFAULT([/usr]) | 25 | AC_PREFIX_DEFAULT([/usr]) |
26 | AM_MAINTAINER_MODE([enable]) | 26 | AM_MAINTAINER_MODE([enable]) |
@@ -28,4 +28,5 @@ index ee72283..60980c0 100644 | |||
28 | +AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) | 28 | +AM_INIT_AUTOMAKE([check-news foreign 1.11 silent-rules tar-pax no-dist-gzip dist-xz subdir-objects color-tests serial-tests]) |
29 | AM_SILENT_RULES([yes]) | 29 | AM_SILENT_RULES([yes]) |
30 | LT_INIT([disable-static pic-only]) | 30 | LT_INIT([disable-static pic-only]) |
31 | DOLT | 31 | |
32 | AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by kmod])]) | ||