meson: remove more deprecated meson options (#36915)

This removes two more already deprecated meson options.

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:
 

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',

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

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() {