From aa10975643f6d779ad21ab6ac9595762a93a70f9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 5 Jan 2024 19:12:07 +0100 Subject: [PATCH] package/libostree: needs headers >= 5.8 libostree unconditionally uses loop_config since bump to version 2023.5 in commit c64a3e9767757f6bab0ecf2df35871508003f39e and https://github.com/containers/composefs/commit/d7f24100c932cd0da9c315de7c7d44fe7a5005cd which is only available with kernel >= 5.8 and https://github.com/torvalds/linux/commit/3448914e8cc550ba792d4ccc74471d1ca4293aae resulting in the following build failure: composefs/libcomposefs/lcfs-mount.c: In function 'setup_loopback': composefs/libcomposefs/lcfs-mount.c:273:16: error: variable 'loopconfig' has initializer but incomplete type 273 | struct loop_config loopconfig = { 0 }; | ^~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/25d9d4f256861628ddd8e8ce659a39655d27b457 - http://autobuild.buildroot.org/results/5c7e1e47c6eb43f7832ef7820ec2b5ac0f3c3696 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libostree/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libostree/Config.in b/package/libostree/Config.in index 9c59413eb1..49eed6517e 100644 --- a/package/libostree/Config.in +++ b/package/libostree/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBOSTREE depends on BR2_USE_MMU # e2fsprogs, libglib2, libgpgme # doesn't build with musl due to lack of TEMP_FAILURE_RETRY() depends on !BR2_TOOLCHAIN_USES_MUSL - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 # linux/fsverity.h + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 # loop_config select BR2_PACKAGE_E2FSPROGS select BR2_PACKAGE_LIBARCHIVE if BR2_s390x select BR2_PACKAGE_LIBGLIB2 @@ -19,9 +19,9 @@ config BR2_PACKAGE_LIBOSTREE https://ostree.readthedocs.io/en/latest/ -comment "libostree needs a uClibc or glibc toolchain w/ threads, dynamic library, wchar, headers >= 5.4" +comment "libostree needs a uClibc or glibc toolchain w/ threads, dynamic library, wchar, headers >= 5.8" depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ || !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4 + !BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_8 depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS depends on BR2_USE_MMU