diff options
author | Ross Burton <ross.burton@arm.com> | 2024-01-10 13:07:29 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-12 11:54:05 +0000 |
commit | c8c1c1e4e0e1d477452f64c58aa8cd0a94c2fa5c (patch) | |
tree | 28f1c58add341748c850a65980cea6d2daffa398 | |
parent | 2c8e3a3b83748cec6e7093dd649e79b69e911835 (diff) | |
download | poky-c8c1c1e4e0e1d477452f64c58aa8cd0a94c2fa5c.tar.gz |
kmod: fix configure with autopoint calling gtkdocize
GTKDOC_DOCDIR is obsolete now, so fix the build by passing the
documentation directory in the GTK_DOC_CHECK call.
(From OE-Core rev: c2f0e8ccd57c18fee36fc0adbbaf63e2302b8268)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/kmod/kmod/gtkdocdir.patch | 33 | ||||
-rw-r--r-- | meta/recipes-kernel/kmod/kmod_31.bb | 3 |
2 files changed, 34 insertions, 2 deletions
diff --git a/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch b/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch new file mode 100644 index 0000000000..a34ea466e8 --- /dev/null +++ b/meta/recipes-kernel/kmod/kmod/gtkdocdir.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From dd59095f70f774f6d1e767010e25b35ef6db4c4b Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@arm.com> | ||
3 | Date: Fri, 8 Dec 2023 22:35:45 +0000 | ||
4 | Subject: [PATCH] configure: set docdir in GTK_DOC_CHECK | ||
5 | |||
6 | By passing --docdir in the GTK_DOC_CHECK arguments (to match | ||
7 | autogen.sh) autoreconf will work out of the box. | ||
8 | |||
9 | Without this autoreconf fails due to the documentation not being in | ||
10 | ./docs, the default location. | ||
11 | |||
12 | Upstream-Status: Submitted [https://lore.kernel.org/linux-modules/20231208224511.1363066-1-ross.burton@arm.com/T/#u] | ||
13 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
14 | --- | ||
15 | configure.ac | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index de01e08..67696c4 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -255,7 +255,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [ | ||
23 | AM_CONDITIONAL([ENABLE_COVERAGE], [test "x$enable_coverage" = "xyes"]) | ||
24 | |||
25 | m4_ifdef([GTK_DOC_CHECK], [ | ||
26 | -GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat]) | ||
27 | +GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat --docdir libkmod/docs]) | ||
28 | ], [ | ||
29 | AM_CONDITIONAL([ENABLE_GTK_DOC], false)]) | ||
30 | |||
31 | -- | ||
32 | 2.34.1 | ||
33 | |||
diff --git a/meta/recipes-kernel/kmod/kmod_31.bb b/meta/recipes-kernel/kmod/kmod_31.bb index c11ce456f2..6ae83a7c66 100644 --- a/meta/recipes-kernel/kmod/kmod_31.bb +++ b/meta/recipes-kernel/kmod/kmod_31.bb | |||
@@ -21,6 +21,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master | |||
21 | file://depmod-search.conf \ | 21 | file://depmod-search.conf \ |
22 | file://avoid_parallel_tests.patch \ | 22 | file://avoid_parallel_tests.patch \ |
23 | file://0001-Use-portable-implementation-for-basename-API.patch \ | 23 | file://0001-Use-portable-implementation-for-basename-API.patch \ |
24 | file://gtkdocdir.patch \ | ||
24 | " | 25 | " |
25 | 26 | ||
26 | S = "${WORKDIR}/git" | 27 | S = "${WORKDIR}/git" |
@@ -36,8 +37,6 @@ PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz" | |||
36 | PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" | 37 | PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" |
37 | PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" | 38 | PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd" |
38 | 39 | ||
39 | GTKDOC_DOCDIR = "${S}/libkmod/docs" | ||
40 | |||
41 | PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 40 | PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
42 | RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 41 | RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |
43 | RCONFLICTS:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" | 42 | RCONFLICTS:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools" |