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.inc | |
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.inc')
-rw-r--r-- | meta/recipes-kernel/kmod/kmod.inc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index e68860f6b4..334453838e 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc | |||
@@ -20,6 +20,7 @@ PV = "26" | |||
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 \ | ||
23 | file://avoid_parallel_tests.patch \ | 24 | file://avoid_parallel_tests.patch \ |
24 | " | 25 | " |
25 | 26 | ||
@@ -28,14 +29,8 @@ S = "${WORKDIR}/git" | |||
28 | EXTRA_AUTORECONF += "--install --symlink" | 29 | EXTRA_AUTORECONF += "--install --symlink" |
29 | EXTRA_OECONF +=" --enable-tools --with-zlib" | 30 | EXTRA_OECONF +=" --enable-tools --with-zlib" |
30 | 31 | ||
31 | CACHED_CONFIGUREVARS += "ac_cv_path_DOLT_BASH='/usr/bin/env bash'" | ||
32 | |||
33 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" | 32 | PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" |
34 | PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" | 33 | PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" |
35 | PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" | 34 | PACKAGECONFIG[manpages] = "--enable-manpages, --disable-manpages, libxslt-native xmlto-native" |
36 | 35 | ||
37 | GTKDOC_DOCDIR = "${S}/libkmod/docs" | 36 | GTKDOC_DOCDIR = "${S}/libkmod/docs" |
38 | |||
39 | do_configure_append () { | ||
40 | sed -i 's#}libtool#}${TARGET_SYS}-libtool#' ${B}/doltlibtool | ||
41 | } | ||