From 3d2391a004b150c956a24c2de4ef5508986bda3a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 1 Apr 2025 13:49:36 +0900 Subject: [PATCH] meson: remove more deprecated meson options - default-hierarchy meson option was deprecated by 31323f21bb0ae7c712f43500c42997c91a6d20bf (v256). - nscd meson option was deprecated by 28f1f1a5e652508d6e61ace8918e8b831e4b62b4 (v257). Let's completely remove them now. --- NEWS | 5 +++-- meson_options.txt | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 75712036b0f..9c66dd53447 100644 --- a/NEWS +++ b/NEWS @@ -63,8 +63,9 @@ CHANGES WITH 258 in spe: * Support for the SystemdOptions EFI variable has been removed. - * The 'split-usr', 'rootlibdir', and 'rootprefix' meson options, which - were deprecated in v255, have been removed. + * The meson options 'split-usr', 'rootlibdir', 'rootprefix' (deprecated + in v255), 'default-hierarchy' (v256), and 'nscd' (v257) have been + removed. Announcements of Future Feature Removals: diff --git a/meson_options.txt b/meson_options.txt index 00963a6e4ad..cf6ae4162cd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -51,8 +51,6 @@ option('initrd', type : 'boolean', description : 'install services for use when running systemd in initrd') option('compat-mutable-uid-boundaries', type : 'boolean', value : false, description : 'look at uid boundaries in /etc/login.defs for compatibility') -option('nscd', type : 'boolean', - description : 'This option is deprecated and will be removed in a future release') option('quotaon-path', type : 'string', description : 'path to quotaon') option('quotacheck-path', type : 'string', description : 'path to quotacheck') @@ -236,9 +234,6 @@ option('configfiledir', type : 'string', value : '', option('fallback-hostname', type : 'string', value : 'localhost', description : 'the hostname used if none configured') -option('default-hierarchy', type : 'combo', - choices : ['legacy', 'hybrid', 'unified'], deprecated : true, - description : 'This option is deprecated and will be removed in a future release') option('extra-net-naming-schemes', type : 'string', description : 'comma-separated list of extra net.naming_scheme= definitions') option('default-net-naming-scheme', type : 'string', value : 'latest', -- 2.47.3