From 9b372f8e7de8c1a8c0ff945d45aae61a5a6de2b3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 5 Apr 2025 20:50:37 +0900 Subject: [PATCH 1/3] mkosi: update arch commit reference * 7948d79b63 upgpkg: 257.5-1: new upstream release * d9badad1d4 drop use of deprecated nscd meson option * af071243cf upgpkg: 257.4-1: new upstream release --- mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf b/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf index 6624458331..5b0c47eb2d 100644 --- a/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf +++ b/mkosi/mkosi.conf.d/arch/mkosi.conf.d/pkgenv.conf @@ -7,5 +7,5 @@ Distribution=arch Environment= GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git GIT_BRANCH=main - GIT_COMMIT=1b4994657df1c7495607f0c2f20db73550b94f34 + GIT_COMMIT=7948d79b633e1b6565b9264efd32b55247d66fcf PKG_SUBDIR=arch From c1d21129d0eef38f3a974dc1440d3b1027c76d62 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 5 Apr 2025 20:59:44 +0900 Subject: [PATCH 2/3] mkosi/opensuse: drop default-hierarchy from systemd.spec --- .../build/mkosi.conf.d/opensuse/mkosi.build.chroot | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot index bef5a0de29..1ada7640c2 100755 --- a/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot +++ b/mkosi/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.build.chroot @@ -69,7 +69,9 @@ fi # The opensuse spec tars up stuff in test/ and unpacks it in test/integration-tests, which we now use for our # own purposes, so let's get rid of that specific bit of logic in the opensuse spec until they've had a chance # to adapt. -sed "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" -e '1062,1075d' -e '/integration-tests\/README/d' >/tmp/systemd.spec +# +# TODO: remove manual default-hierarchy patch when the upstream spec is updated +sed "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" -e '1062,1075d' -e '/integration-tests\/README/d' -e '/default-hierarchy/ d' >/tmp/systemd.spec mount --bind /tmp/systemd.spec "pkg/$PKG_SUBDIR${GIT_SUBDIR:+/$GIT_SUBDIR}/systemd.spec" build() { From 3d2391a004b150c956a24c2de4ef5508986bda3a Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 1 Apr 2025 13:49:36 +0900 Subject: [PATCH 3/3] 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 75712036b0..9c66dd5344 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 00963a6e4a..cf6ae4162c 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',