From 18b4c1525cc586ebe31d528dbc0ad9901110b8f3 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 18 Aug 2026 02:10:26 +0900 Subject: [PATCH 1/2] mkosi: update debian commit reference to 9badaae1c4c08db447b4e409784688f32d3f04f3 * 9badaae1c4 Drop deprecated meson option * 8700e5c4e5 Install new files for upstream build * 7aaf05335d Update d/copyright * 68b634db29 Update changelog for 261.2-1 release * 07591e4f9a Open changelog for 261.2-1 release * 2bd7f0db1f d/libnss-systemd.nss: install after files and compat in nsswitch.conf * c2e3b3135c Drop OBS workarounds and use pkg.systemd.obs build profile * aff99fcc49 d/control: clarify systemd-imds Description * b5006dc64a d/systemd.links: drop procps.service alias (LP: #2153900) * b630d1569f Make systemd-networkd example consistent with systemd.network(5) --- mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf b/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf index b842c6e2d2..aa60579c4d 100644 --- a/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf +++ b/mkosi/mkosi.pkgenv/mkosi.conf.d/debian-ubuntu.conf @@ -9,5 +9,5 @@ Environment= GIT_URL=https://salsa.debian.org/systemd-team/systemd.git GIT_SUBDIR=debian GIT_BRANCH=debian/master - GIT_COMMIT=56402b2bde258999a8f01a8b04465fde9242d6a1 + GIT_COMMIT=9badaae1c4c08db447b4e409784688f32d3f04f3 PKG_SUBDIR=debian From 671ebb287eae0c494905bcd4d44e3e8a9751d530 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 17 Aug 2026 08:19:42 +0900 Subject: [PATCH 2/2] meson: drop deprecated options The meson option -Dlibiptc= was deprecated in v259. Other options were deprecated in v260. --- NEWS | 4 ++++ meson_options.txt | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/NEWS b/NEWS index c5686b929f..25e0fff99b 100644 --- a/NEWS +++ b/NEWS @@ -4,6 +4,10 @@ CHANGES WITH 262: Feature Removals and Incompatible Changes: + * Meson options '-Dlibiptc=' (deprecated in v259), '-Dlibidn=', + '-Drc-local=', '-Dsysvinit-path=', and '-Dsysvrcnd-path=' (deprecated + in v260) have been removed. + * Services of Type=notify-reload are now required to catch or block ReloadSignal= when they send READY=1. If they do neither at that point, the service fails to start with a protocol error. Previously, diff --git a/meson_options.txt b/meson_options.txt index bacb861fa9..007780664e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -46,13 +46,6 @@ option('standalone-binaries', type : 'string', option('build-static', type : 'boolean', value : false, description : 'build static versions of supported binaries') -option('sysvinit-path', type : 'string', value : '/etc/init.d', deprecated : true, - description : 'This option is deprecated and will be removed in a future release') -option('sysvrcnd-path', type : 'string', value : '/etc/rc.d', deprecated : true, - description : 'This option is deprecated and will be removed in a future release') -option('rc-local', type : 'string', value : '/etc/rc.local', deprecated : true, - description : 'This option is deprecated and will be removed in a future release') - option('initrd', type : 'boolean', description : 'install services for use when running systemd in initrd') option('compat-mutable-uid-boundaries', type : 'boolean', value : false, @@ -462,10 +455,6 @@ option('idn', type : 'boolean', description : 'use IDN when printing hostnames') option('libidn2', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' }, description : 'libidn2 support') -option('libidn', type : 'feature', deprecated : true, - description : 'This option is deprecated and will be removed in a future release') -option('libiptc', type : 'feature', deprecated : true, - description : 'This option is deprecated and will be removed in a future release') option('qrencode', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' }, description : 'libqrencode support') option('gcrypt', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },