From c1dc7ece68fe661f666295c33979bdb5b3d1b1e99e0aeec795b9695494793bab Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 20 Dec 2023 12:50:37 +0000 Subject: [PATCH 1/2] - Import commit 071ac409a0564863657d8f8a5a35e6a4f914695f 071ac409a0 rules: set up tty permissions and group for /dev/hvc* nodes f693b3ed8a vconsole-setup: remember the correct error value when open_terminal() fails 963d838bad vconsole-setup: handle the case where the vc is in KD_GRAPHICS mode more gracefully (bsc#1215282) 6f53f71d2d vconsole-setup: simplify error handling OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1477 --- systemd-v254.5+suse.17.gce08cd5f66.tar.xz | 3 --- systemd-v254.5+suse.21.g071ac409a0.tar.xz | 3 +++ systemd.changes | 10 ++++++++++ systemd.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 systemd-v254.5+suse.17.gce08cd5f66.tar.xz create mode 100644 systemd-v254.5+suse.21.g071ac409a0.tar.xz diff --git a/systemd-v254.5+suse.17.gce08cd5f66.tar.xz b/systemd-v254.5+suse.17.gce08cd5f66.tar.xz deleted file mode 100644 index ed22265e..00000000 --- a/systemd-v254.5+suse.17.gce08cd5f66.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85fcae5c382ca7b6a635a103888097b96c1436c165206a342e6713aa482c84f4 -size 10351072 diff --git a/systemd-v254.5+suse.21.g071ac409a0.tar.xz b/systemd-v254.5+suse.21.g071ac409a0.tar.xz new file mode 100644 index 00000000..d42f86a8 --- /dev/null +++ b/systemd-v254.5+suse.21.g071ac409a0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4b5a0cb1989c2850c7087d2f1c00051878e26505a71ffe3287e27011b81023c8 +size 10352172 diff --git a/systemd.changes b/systemd.changes index d6e66c4a..fa6380e7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Dec 20 12:40:55 UTC 2023 - Franck Bui + +- Import commit 071ac409a0564863657d8f8a5a35e6a4f914695f + + 071ac409a0 rules: set up tty permissions and group for /dev/hvc* nodes + f693b3ed8a vconsole-setup: remember the correct error value when open_terminal() fails + 963d838bad vconsole-setup: handle the case where the vc is in KD_GRAPHICS mode more gracefully (bsc#1215282) + 6f53f71d2d vconsole-setup: simplify error handling + ------------------------------------------------------------------- Tue Dec 12 08:02:52 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 8f7abf82..606d88df 100644 --- a/systemd.spec +++ b/systemd.spec @@ -18,7 +18,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define archive_version +suse.17.gce08cd5f66 +%define archive_version +suse.21.g071ac409a0 %define _testsuitedir %{_systemd_util_dir}/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit From 7beaf185f7792e28e819ddc751cdebbcf1cbd47577f354ab24b2fd384793202f Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 20 Dec 2023 12:58:01 +0000 Subject: [PATCH 2/2] Accepting request 1134210 from home:dimstar:Factory - udev: only require kmod in the full flavor. udev-mini is only used inside OBS in a strictly defined setup and udev will never have to load device drivers there. This should allow us to remove system-module-tools from almost all buildroots. OBS-URL: https://build.opensuse.org/request/show/1134210 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1478 --- systemd.changes | 7 +++++++ systemd.spec | 2 ++ 2 files changed, 9 insertions(+) diff --git a/systemd.changes b/systemd.changes index fa6380e7..143ed472 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 20 12:49:09 UTC 2023 - Dominique Leuenberger + +- udev: only require kmod in the full flavor. udev-mini is only + used inside OBS in a strictly defined setup and udev will never + have to load device drivers there. + ------------------------------------------------------------------- Wed Dec 20 12:40:55 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 606d88df..daba32a2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -306,7 +306,9 @@ URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: %{name} = %{version}-%{release} %systemd_requires Requires: filesystem +%if %{without bootstrap} Requires: kmod +%endif Requires: system-group-hardware Requires: group(kvm) Requires: group(lp)