123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051 |
- From 3ef4bac1dd253628dfdb8a823b51ae0d24fa0616 Mon Sep 17 00:00:00 2001
- From: Petr Vorel <pvorel@suse.cz>
- Date: Mon, 2 Jun 2025 19:08:30 +0200
- Subject: [PATCH] configure: Fix build on kernel 6.14 headers
- We decided in a2300dc0f5 to remove <linux/mount.h> in lapi/mount.h and
- use only <sys/mount.h>. But later in 5c5411ea8e we add autotools checks
- in configure.ac which use <linux/mount.h> for detection, but kept using
- lapi/mount.h. This worked until now, because no toolchain used new
- header enough. Recent Alpine update broke that.
- This fixes CI build on Alpine v3.22 (the default Alpine version in
- GitHub action), which uses 6.14.2 kernel headers, which already define
- struct mnt_id_req (configure.ac detect it but lapi/mount.h was not using
- a correct header):
- listmount.h: In function 'listmount':
- listmount.h:18:16: error: variable 'req' has initializer but incomplete type
- 18 | struct mnt_id_req req = {
- | ^~~~~~~~~~
- Link: https://lore.kernel.org/ltp/20250602170831.404641-1-pvorel@suse.cz/
- Fixes: 5c5411ea8e ("Add listmount/statmount fallback declarations")
- Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
- Acked-by: Jan Stancek <jstancek@redhat.com>
- Signed-off-by: Petr Vorel <pvorel@suse.cz>
- Upstream: https://github.com/linux-test-project/ltp/commit/3ef4bac1dd253628dfdb8a823b51ae0d24fa0616
- ---
- configure.ac | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
- diff --git a/configure.ac b/configure.ac
- index 9ff098b273..69c5be7362 100644
- --- a/configure.ac
- +++ b/configure.ac
- @@ -254,8 +254,10 @@ AC_CHECK_TYPES([struct mount_attr],,,[
-
- AC_CHECK_TYPES([struct cachestat_range],,,[#include <sys/mman.h>])
- AC_CHECK_TYPES([struct cachestat],,,[#include <sys/mman.h>])
- -AC_CHECK_TYPES([struct mnt_id_req],,,[#include <linux/mount.h>])
- -AC_CHECK_TYPES([struct statmount],,,[#include <linux/mount.h>])
- +
- +# Defined in <linux/mount.h>, but include/lapi/mount.h includes <sys/mount.h> */
- +AC_CHECK_TYPES([struct mnt_id_req],,,[#include <sys/mount.h>])
- +AC_CHECK_TYPES([struct statmount],,,[#include <sys/mount.h>])
-
- # Tools knobs
-
- --
- 2.50.0
|