From 4f0e04e97b16ab0af241b5a3c912a649d6d656f589c4a2b63d1c884a719b26f8 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 22 May 2024 08:58:36 +0000 Subject: [PATCH 1/3] - systemd.spec: introduce %{meson_extra_configure_options} to allow passing extra meson configure options. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1524 --- systemd.changes | 6 ++++++ systemd.spec | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index 6ac3885..c53a0ba 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 22 08:56:40 UTC 2024 - Franck Bui + +- systemd.spec: introduce %{meson_extra_configure_options} to allow passing + extra meson configure options. + ------------------------------------------------------------------- Thu May 16 10:01:20 UTC 2024 - Radoslav Kolev diff --git a/systemd.spec b/systemd.spec index 7c73a51..fa545cb 100644 --- a/systemd.spec +++ b/systemd.spec @@ -881,7 +881,9 @@ for the C APIs. -Dvmspawn=%{enabled_with experimental} \ \ -Dtests=%{when testsuite unsafe} \ - -Dinstall-tests=%{when testsuite} + -Dinstall-tests=%{when testsuite} \ + \ + %{?meson_extra_configure_options} %meson_build From edd20e7ed2057cb47836ab5c7ba4aa269f0a8d9b6e3baf8b10b27b4d6e76c838 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 31 May 2024 11:33:41 +0000 Subject: [PATCH 2/3] - Import commit b9c17562f612ab2cd8cfee1960714c58d0a6c593 b9c17562f6 99-systemd.rules: rework SYSTEMD_READY logic for device mapper c5003fc15e pcrlock: add make_pcrlock_record_from_stream OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1525 --- systemd-v255.6+suse.30.g3ea0e1dff3.tar.xz | 3 --- systemd-v255.6+suse.32.gb9c17562f6.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 systemd-v255.6+suse.30.g3ea0e1dff3.tar.xz create mode 100644 systemd-v255.6+suse.32.gb9c17562f6.tar.xz diff --git a/systemd-v255.6+suse.30.g3ea0e1dff3.tar.xz b/systemd-v255.6+suse.30.g3ea0e1dff3.tar.xz deleted file mode 100644 index 245a22f..0000000 --- a/systemd-v255.6+suse.30.g3ea0e1dff3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be22e57b7012fb5b7f54c2daf980a3f8a8ed0890759b529c1baa0a2d3bb6ff2c -size 10843156 diff --git a/systemd-v255.6+suse.32.gb9c17562f6.tar.xz b/systemd-v255.6+suse.32.gb9c17562f6.tar.xz new file mode 100644 index 0000000..d34d62a --- /dev/null +++ b/systemd-v255.6+suse.32.gb9c17562f6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4cd6c23362a3315fa24f69e79d19a92b4ba861a62396e400d59e29500cd1038 +size 10850328 diff --git a/systemd.changes b/systemd.changes index c53a0ba..99f476b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 31 11:17:50 UTC 2024 - Franck Bui + +- Import commit b9c17562f612ab2cd8cfee1960714c58d0a6c593 + + b9c17562f6 99-systemd.rules: rework SYSTEMD_READY logic for device mapper + c5003fc15e pcrlock: add make_pcrlock_record_from_stream + ------------------------------------------------------------------- Wed May 22 08:56:40 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index fa545cb..320c4f5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -28,7 +28,7 @@ %else %define systemd_version 255.6 %define systemd_release 0 -%define archive_version +suse.30.g3ea0e1dff3 +%define archive_version +suse.32.gb9c17562f6 %endif %define systemd_major %{sub %systemd_version 1 3} From 6230e4e0f049b85831398073b384514e1c221f07de515afc12a9d132e724ded0 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 31 May 2024 12:16:46 +0000 Subject: [PATCH 3/3] - Import commit 603cd1d4d81147d4f2eccd5e352064a4215119b4 (merge of v255.7) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/b9c17562f612ab2cd8cfee1960714c58d0a6c593...603cd1d4d81147d4f2eccd5e352064a4215119b4 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1526 --- systemd-v255.6+suse.32.gb9c17562f6.tar.xz | 3 --- systemd-v255.7+suse.33.g603cd1d4d8.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 systemd-v255.6+suse.32.gb9c17562f6.tar.xz create mode 100644 systemd-v255.7+suse.33.g603cd1d4d8.tar.xz diff --git a/systemd-v255.6+suse.32.gb9c17562f6.tar.xz b/systemd-v255.6+suse.32.gb9c17562f6.tar.xz deleted file mode 100644 index d34d62a..0000000 --- a/systemd-v255.6+suse.32.gb9c17562f6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4cd6c23362a3315fa24f69e79d19a92b4ba861a62396e400d59e29500cd1038 -size 10850328 diff --git a/systemd-v255.7+suse.33.g603cd1d4d8.tar.xz b/systemd-v255.7+suse.33.g603cd1d4d8.tar.xz new file mode 100644 index 0000000..056a8b2 --- /dev/null +++ b/systemd-v255.7+suse.33.g603cd1d4d8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59f09021d3db1bef3f3ee27aeff4ed734c1226d3a9538eca7cc9de291fa483e9 +size 10852252 diff --git a/systemd.changes b/systemd.changes index 99f476b..03e3351 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 31 11:37:10 UTC 2024 - Franck Bui + +- Import commit 603cd1d4d81147d4f2eccd5e352064a4215119b4 (merge of v255.7) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/b9c17562f612ab2cd8cfee1960714c58d0a6c593...603cd1d4d81147d4f2eccd5e352064a4215119b4 + ------------------------------------------------------------------- Fri May 31 11:17:50 UTC 2024 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 320c4f5..d2d7478 100644 --- a/systemd.spec +++ b/systemd.spec @@ -26,9 +26,9 @@ %define systemd_release %{?release_override}%{!?release_override:0} %define archive_version %{nil} %else -%define systemd_version 255.6 +%define systemd_version 255.7 %define systemd_release 0 -%define archive_version +suse.32.gb9c17562f6 +%define archive_version +suse.33.g603cd1d4d8 %endif %define systemd_major %{sub %systemd_version 1 3}