forked from pool/systemd
- Import commit e43a1b018899266b764ab81afb9c30fb417675c6
1c229f8fc1 cryptsetup: fall back to traditional unlocking if any TPM2 operation fails
8881f21539 cryptsetup: fix typo
5882148902 journald: make use of CLAMP() in cache_space_refresh()
6ee0601f73 journald: make sure journal_file_open() doesn't leave a corrupted file around after failing (bsc#1198114)
fe928f3d49 fs-util: make sure openat_report_new() initializes return param also on shortcut
3881af1806 fs-util: fix typos in comments
96060b73ba journal-file: port journal_file_open() to openat_report_new()
611d9955bb fs-util: add openat_report_new() wrapper around openat()
f16edb41d4 network: ignore all errors in loading .network files (bsc#1197968)
5422730a7b meson: build kernel-install man page when necessary
45c627cfc2 build: include status of TPM2 in the feature string show by --version
- Drop 0001-meson-build-kernel-install-man-page-when-necessary.patch
It's been merged in the SUSE git repo.
This includes the following bug fixes:
- upstream commit 34357545590d4791d1acbbeb07ae8f7636e187cb (bsc#1198093)
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1274
This commit is contained in:
Franck Bui
Git OBS Bridge
parent
23f39dbffd
commit
e20e054528
@ -1,90 +0,0 @@
|
||||
From fecffebc9a0f4e2309e9d8d561c0b0c4b6678b0b Mon Sep 17 00:00:00 2001
|
||||
From: Franck Bui <fbui@suse.com>
|
||||
Date: Thu, 31 Mar 2022 11:17:10 +0200
|
||||
Subject: [PATCH 1/1] meson: build kernel-install man page when necessary
|
||||
|
||||
---
|
||||
man/rules/meson.build | 2 +-
|
||||
meson.build | 5 ++++-
|
||||
shell-completion/bash/meson.build | 2 +-
|
||||
shell-completion/zsh/meson.build | 2 +-
|
||||
src/kernel-install/meson.build | 2 --
|
||||
5 files changed, 7 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/man/rules/meson.build b/man/rules/meson.build
|
||||
index aaa69d3038..f10abdaf0d 100644
|
||||
--- a/man/rules/meson.build
|
||||
+++ b/man/rules/meson.build
|
||||
@@ -30,7 +30,7 @@ manpages = [
|
||||
['journalctl', '1', [], ''],
|
||||
['journald.conf', '5', ['journald.conf.d', 'journald@.conf'], ''],
|
||||
['kernel-command-line', '7', [], ''],
|
||||
- ['kernel-install', '8', [], ''],
|
||||
+ ['kernel-install', '8', [], 'ENABLE_KERNEL_INSTALL'],
|
||||
['libudev', '3', [], ''],
|
||||
['loader.conf', '5', [], 'HAVE_GNU_EFI'],
|
||||
['locale.conf', '5', [], ''],
|
||||
diff --git a/meson.build b/meson.build
|
||||
index e68791b8b4..311895db5e 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -1675,6 +1675,9 @@ else
|
||||
endif
|
||||
conf.set10('ENABLE_IMPORTD', have)
|
||||
|
||||
+want_kernel_install = get_option('kernel-install')
|
||||
+conf.set10('ENABLE_KERNEL_INSTALL', want_kernel_install)
|
||||
+
|
||||
want_homed = get_option('homed')
|
||||
if want_homed != 'false'
|
||||
have = (conf.get('HAVE_OPENSSL') == 1 and
|
||||
@@ -4143,7 +4146,7 @@ foreach tuple : [
|
||||
['hwdb'],
|
||||
['importd'],
|
||||
['initrd'],
|
||||
- ['kernel-install', get_option('kernel-install')],
|
||||
+ ['kernel-install'],
|
||||
['localed'],
|
||||
['logind'],
|
||||
['machined'],
|
||||
diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
|
||||
index 963a11b6ce..ae6a61e555 100644
|
||||
--- a/shell-completion/bash/meson.build
|
||||
+++ b/shell-completion/bash/meson.build
|
||||
@@ -31,7 +31,7 @@ items = [['busctl', ''],
|
||||
['systemd-path', ''],
|
||||
['systemd-run', ''],
|
||||
['udevadm', ''],
|
||||
- ['kernel-install', ''],
|
||||
+ ['kernel-install', 'ENABLE_KERNEL_INSTALL'],
|
||||
['bootctl', 'HAVE_GNU_EFI'],
|
||||
['coredumpctl', 'ENABLE_COREDUMP'],
|
||||
['homectl', 'ENABLE_HOMED'],
|
||||
diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
|
||||
index 6dca9dd595..bac531798c 100644
|
||||
--- a/shell-completion/zsh/meson.build
|
||||
+++ b/shell-completion/zsh/meson.build
|
||||
@@ -22,7 +22,7 @@ items = [['_busctl', ''],
|
||||
['_systemd-path', ''],
|
||||
['_systemd-run', ''],
|
||||
['_udevadm', ''],
|
||||
- ['_kernel-install', ''],
|
||||
+ ['_kernel-install', 'ENABLE_KERNEL_INSTALL'],
|
||||
['_sd_hosts_or_user_at_host', ''],
|
||||
['_sd_outputmodes', ''],
|
||||
['_sd_unit_files', ''],
|
||||
diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build
|
||||
index 508058f1cf..abc3520b62 100644
|
||||
--- a/src/kernel-install/meson.build
|
||||
+++ b/src/kernel-install/meson.build
|
||||
@@ -1,7 +1,5 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1-or-later
|
||||
|
||||
-want_kernel_install = get_option('kernel-install')
|
||||
-
|
||||
if want_kernel_install
|
||||
install_data('kernel-install',
|
||||
install_mode : 'rwxr-xr-x',
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ed75c74660149af8a8fe454169f9cd295aa329c2638d2de8474d8eed869112d5
|
||||
size 7626056
|
||||
3
systemd-v250.4+suse.47.ge43a1b0188.tar.xz
Normal file
3
systemd-v250.4+suse.47.ge43a1b0188.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6633132c53177f605c5744b6cc412c823e32249545ffd0520ac56ef33c270d9c
|
||||
size 7626800
|
||||
@ -1,3 +1,24 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 6 09:55:10 UTC 2022 - Franck Bui <fbui@suse.com>
|
||||
|
||||
- Import commit e43a1b018899266b764ab81afb9c30fb417675c6
|
||||
|
||||
1c229f8fc1 cryptsetup: fall back to traditional unlocking if any TPM2 operation fails
|
||||
8881f21539 cryptsetup: fix typo
|
||||
5882148902 journald: make use of CLAMP() in cache_space_refresh()
|
||||
6ee0601f73 journald: make sure journal_file_open() doesn't leave a corrupted file around after failing (bsc#1198114)
|
||||
fe928f3d49 fs-util: make sure openat_report_new() initializes return param also on shortcut
|
||||
3881af1806 fs-util: fix typos in comments
|
||||
96060b73ba journal-file: port journal_file_open() to openat_report_new()
|
||||
611d9955bb fs-util: add openat_report_new() wrapper around openat()
|
||||
f16edb41d4 network: ignore all errors in loading .network files (bsc#1197968)
|
||||
5422730a7b meson: build kernel-install man page when necessary
|
||||
45c627cfc2 build: include status of TPM2 in the feature string show by --version
|
||||
|
||||
- Drop 0001-meson-build-kernel-install-man-page-when-necessary.patch
|
||||
|
||||
It's been merged in the SUSE git repo.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Apr 4 11:40:30 UTC 2022 - Franck Bui <fbui@suse.com>
|
||||
|
||||
@ -106,6 +127,10 @@ Tue Mar 8 09:41:42 UTC 2022 - Franck Bui <fbui@suse.com>
|
||||
See https://github.com/openSUSE/systemd/blob/SUSE/v250/NEWS for
|
||||
details.
|
||||
|
||||
This includes the following bug fixes:
|
||||
|
||||
- upstream commit 34357545590d4791d1acbbeb07ae8f7636e187cb (bsc#1198093)
|
||||
|
||||
* Rebased 0001-conf-parser-introduce-early-drop-ins.patch
|
||||
0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
|
||||
%define min_kernel_version 4.5
|
||||
%define suse_version +suse.35.g8ef8dfd540
|
||||
%define suse_version +suse.47.ge43a1b0188
|
||||
%define _testsuitedir /usr/lib/systemd/tests
|
||||
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
|
||||
|
||||
@ -209,7 +209,6 @@ Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch
|
||||
# upstream and need an urgent fix. Even in this case, the patches are
|
||||
# temporary and should be removed as soon as a fix is merged by
|
||||
# upstream.
|
||||
Patch6000: 0001-meson-build-kernel-install-man-page-when-necessary.patch
|
||||
|
||||
%description
|
||||
Systemd is a system and service manager, compatible with SysV and LSB
|
||||
|
||||
Loading…
Reference in New Issue
Block a user