NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libostree: needs headers >= 5.8

Browse Source 
libostree unconditionally uses loop_config since bump to version 2023.5
in commit c64a3e9767 and
d7f24100c9
which is only available with kernel >= 5.8 and
3448914e8c
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 <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit aa10975643)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fabrice Fontaine 2024-01-05 19:12:07 +01:00 committed by Peter Korsgaard
parent 4af4bb2314
commit 14c3a7d8cd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/libostree/Config.in
View File

@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBOSTREE
depends on BR2_USE_MMU # e2fsprogs, libglib2, libgpgme depends on BR2_USE_MMU # e2fsprogs, libglib2, libgpgme
# doesn't build with musl due to lack of TEMP_FAILURE_RETRY() # doesn't build with musl due to lack of TEMP_FAILURE_RETRY()
depends on !BR2_TOOLCHAIN_USES_MUSL 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_E2FSPROGS
select BR2_PACKAGE_LIBARCHIVE if BR2_s390x select BR2_PACKAGE_LIBARCHIVE if BR2_s390x
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
@ -19,9 +19,9 @@ config BR2_PACKAGE_LIBOSTREE
https://ostree.readthedocs.io/en/latest/ 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 \ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \
|| !BR2_USE_WCHAR || BR2_TOOLCHAIN_USES_MUSL || \ || !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_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS
depends on BR2_USE_MMU depends on BR2_USE_MMU