[Buildroot] [PATCH 2/2] package/systemd: bump linux-headers dependency to 4.14

[Yann E. MORIN]

Romain, All,

On 2023-08-02 18:46 +0200, Romain Naour spake thusly:
> The recent update to systemd v254 requires a toolchain w/ linux headers
> >= 4.14 to provide LOOP_SET_BLOCK_SIZE [1] (added in systemd v253 [2]).
> 
> Note:
> Buildroot already warn the user if a toolchain w/ linux headers < 4.15
> is used while enabling systemd as init system [3]. It was matter of
> time before problem occurs.
> 
> [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=89e4fdecb51cf5535867026274bc97de9480ade5
> [2] https://github.com/systemd/systemd/commit/1163ddb386ef46f63942171e6eab0ca64eb818e4
> [3] 9a095643b4dd34eb7acb69662aa64fa945f4b542
> 
> Signed-off-by: Romain Naour <romain.naour at gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/systemd/Config.in | 7 +++----
>  system/Config.in          | 6 +++---
>  2 files changed, 6 insertions(+), 7 deletions(-)
> 
> diff --git a/package/systemd/Config.in b/package/systemd/Config.in
> index 174ee77b29..a3e424cb4c 100644
> --- a/package/systemd/Config.in
> +++ b/package/systemd/Config.in
> @@ -22,7 +22,7 @@ menuconfig BR2_PACKAGE_SYSTEMD
>  	depends on !BR2_STATIC_LIBS # kmod
>  	depends on BR2_TOOLCHAIN_USES_GLIBC
>  	depends on BR2_TOOLCHAIN_HAS_SSP
> -	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
> +	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 # LOOP_SET_BLOCK_SIZE
>  	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
>  	depends on BR2_HOST_GCC_AT_LEAST_5 # host-systemd
>  	select BR2_PACKAGE_HAS_UDEV
> @@ -237,7 +237,6 @@ config BR2_PACKAGE_SYSTEMD_HOMED
>  	depends on BR2_USE_MMU # cryptsetup -> lvm2
>  	depends on !BR2_STATIC_LIBS # cryptsetup -> lvm2
>  	depends on BR2_TOOLCHAIN_HAS_SYNC_4 # cryptsetup -> json-c
> -	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12 # fscrypt_key
>  	select BR2_PACKAGE_CRYPTSETUP
>  	select BR2_PACKAGE_OPENSSL
>  	select BR2_PACKAGE_OPENSSL_FORCE_LIBOPENSSL
> @@ -248,11 +247,11 @@ config BR2_PACKAGE_SYSTEMD_HOMED
>  
>  	  https://www.freedesktop.org/software/systemd/man/systemd-homed.service.html
>  
> -comment "homed support needs a toolchain w/ threads, dynamic library, kernel headers >= 4.12"
> +comment "homed support needs a toolchain w/ threads, dynamic library"
>  	depends on BR2_USE_MMU
>  	depends on BR2_TOOLCHAIN_HAS_SYNC_4
>  	depends on !BR2_TOOLCHAIN_HAS_THREADS || \
> -		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12
> +		BR2_STATIC_LIBS
>  
>  config BR2_PACKAGE_SYSTEMD_HOSTNAMED
>  	bool "enable hostname daemon"
> diff --git a/system/Config.in b/system/Config.in
> index 1ca7690ea3..24798dc068 100644
> --- a/system/Config.in
> +++ b/system/Config.in
> @@ -124,19 +124,19 @@ config BR2_INIT_SYSTEMD
>  	depends on BR2_TOOLCHAIN_USES_GLIBC
>  	depends on BR2_TOOLCHAIN_HAS_SSP
>  	depends on BR2_TOOLCHAIN_HAS_THREADS
> -	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15
> +	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14
>  	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
>  	depends on BR2_HOST_GCC_AT_LEAST_5
>  	select BR2_ROOTFS_MERGED_USR
>  	select BR2_PACKAGE_SYSTEMD
>  	select BR2_PACKAGE_SKELETON_INIT_SYSTEMD if BR2_ROOTFS_SKELETON_DEFAULT
>  
> -comment "systemd needs a glibc toolchain w/ SSP, headers >= 3.15, host and target gcc >= 5"
> +comment "systemd needs a glibc toolchain w/ SSP, headers >= 4.14, host and target gcc >= 5"
>  	depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
>  	depends on BR2_USE_MMU
>  	depends on !BR2_TOOLCHAIN_USES_GLIBC || \
>  		!BR2_TOOLCHAIN_HAS_SSP || \
> -		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15 || \
> +		!BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14 || \
>  		!BR2_TOOLCHAIN_GCC_AT_LEAST_5 || \
>  		!BR2_HOST_GCC_AT_LEAST_5
>  
> -- 
> 2.41.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot at buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'