mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

kmod: fix configure with autopoint calling gtkdocize

Browse Source 
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>
This commit is contained in:
Ross Burton
2024-01-10 13:07:29 +00:00
committed by Richard Purdie
parent 2c8e3a3b83
commit c8c1c1e4e0
2 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-kernel/kmod/kmod/gtkdocdir.patch Normal file
View File

@@ -0,0 +1,33 @@
From dd59095f70f774f6d1e767010e25b35ef6db4c4b Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Fri, 8 Dec 2023 22:35:45 +0000
Subject: [PATCH] configure: set docdir in GTK_DOC_CHECK
By passing --docdir in the GTK_DOC_CHECK arguments (to match
autogen.sh) autoreconf will work out of the box.
Without this autoreconf fails due to the documentation not being in
./docs, the default location.
Upstream-Status: Submitted [https://lore.kernel.org/linux-modules/20231208224511.1363066-1-ross.burton@arm.com/T/#u]
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index de01e08..67696c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,7 +255,7 @@ AS_IF([test "x$enable_coverage" = "xyes"], [
AM_CONDITIONAL([ENABLE_COVERAGE], [test "x$enable_coverage" = "xyes"])
m4_ifdef([GTK_DOC_CHECK], [
-GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat])
+GTK_DOC_CHECK([1.14],[--flavour no-tmpl-flat --docdir libkmod/docs])
], [
AM_CONDITIONAL([ENABLE_GTK_DOC], false)])
--
2.34.1

3
meta/recipes-kernel/kmod/kmod_31.bb
View File

@@ -21,6 +21,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git;branch=master
file://depmod-search.conf \
file://avoid_parallel_tests.patch \
file://0001-Use-portable-implementation-for-basename-API.patch \
file://gtkdocdir.patch \
"
S = "${WORKDIR}/git"
@@ -36,8 +37,6 @@ PACKAGECONFIG[xz] = "--with-xz,--without-xz,xz"
PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd"
GTKDOC_DOCDIR = "${S}/libkmod/docs"
PROVIDES += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
RPROVIDES:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"
RCONFLICTS:${PN} += "module-init-tools-insmod-static module-init-tools-depmod module-init-tools"