SHA256
1
0
forked from pool/systemd

Accepting request 933100 from Base:System

- Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of 249.7)
  For a complete list of changes, visit:
  c34c987126...523f32df57
- Import commit c34c98712600bc206919ec6ed136195f75ac1967
  f99aa40c6e TEST-12: make sure 'adm' group exist
  6c7194ff99 TEST-08: don't force ext4 for /
  dd1814b8f9 test: use kbd-mode-map we ship in one more test case
  94c5febf2a test: fix TEST-10-ISSUE-2467

- Update the dependencies of the systemd-testsuite sub-package.

OBS-URL: https://build.opensuse.org/request/show/933100
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=341
This commit is contained in:
Dominique Leuenberger 2021-11-24 22:54:17 +00:00 committed by Git OBS Bridge
commit eb533e30c1
4 changed files with 33 additions and 5 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18f1ac7b13a20f603d4a3601d17afa2ba9f0856f0e3efa83455735121ecc394e
size 7269052

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:688c3f4409788f5ecea74d1dd6c5d1b2fbeb789a6c24c79bd35ed5f62c4b119c
size 7275376

View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Mon Nov 22 08:48:12 UTC 2021 - Franck Bui <fbui@suse.com>
- Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of 249.7)
For a complete list of changes, visit:
https://github.com/openSUSE/systemd/compare/c34c98712600bc206919ec6ed136195f75ac1967...523f32df573d459551760b072cb62906f4a2cf23
- Import commit c34c98712600bc206919ec6ed136195f75ac1967
f99aa40c6e TEST-12: make sure 'adm' group exist
6c7194ff99 TEST-08: don't force ext4 for /
dd1814b8f9 test: use kbd-mode-map we ship in one more test case
94c5febf2a test: fix TEST-10-ISSUE-2467
-------------------------------------------------------------------
Mon Nov 22 08:43:25 UTC 2021 - Franck Bui <fbui@suse.com>
- Update the dependencies of the systemd-testsuite sub-package.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 15 09:35:08 UTC 2021 - Franck Bui <fbui@suse.com> Mon Nov 15 09:35:08 UTC 2021 - Franck Bui <fbui@suse.com>

View File

@ -32,7 +32,7 @@
%endif %endif
%define min_kernel_version 4.5 %define min_kernel_version 4.5
%define suse_version +suse.50.g61c79e6838 %define suse_version +suse.57.g523f32df57
%define _testsuitedir /usr/lib/systemd/tests %define _testsuitedir /usr/lib/systemd/tests
%if 0%{?bootstrap} %if 0%{?bootstrap}
@ -69,7 +69,7 @@
Name: systemd%{?mini} Name: systemd%{?mini}
URL: http://www.freedesktop.org/wiki/Software/systemd URL: http://www.freedesktop.org/wiki/Software/systemd
Version: 249.6 Version: 249.7
Release: 0 Release: 0
Summary: A System and Session Manager Summary: A System and Session Manager
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -518,6 +518,7 @@ Requires: cryptsetup
Requires: dosfstools Requires: dosfstools
Requires: libcap-progs Requires: libcap-progs
Requires: lz4 Requires: lz4
Requires: make
Requires: netcat Requires: netcat
Requires: qemu-kvm Requires: qemu-kvm
Requires: quota Requires: quota
@ -537,6 +538,9 @@ Requires: systemd-experimental
%if %{with journal_remote} %if %{with journal_remote}
Requires: systemd-journal-remote Requires: systemd-journal-remote
%endif %endif
%if %{with networkd}
Requires: systemd-network
%endif
%if %{with portabled} %if %{with portabled}
Requires: systemd-portable Requires: systemd-portable
%endif %endif
@ -897,6 +901,10 @@ rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket
%if %{with testsuite} %if %{with testsuite}
cp -a test %{buildroot}%{_testsuitedir}/ cp -a test %{buildroot}%{_testsuitedir}/
# When the tests are installed, the effective testdata directory is in
# %{_testsuitedir}, the other one, which is actually a symlink, is
# only useful when the tests are run directly from the source.
rm %{buildroot}%{_testsuitedir}/test/testdata
# kbd-model-map became a dangling symlink, drop it. # kbd-model-map became a dangling symlink, drop it.
rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map
find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \;