Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/systemd.git#97a60859120d1c6357a6cb7dfda11c09174af1c0
This commit is contained in:
DistroBaker 2020-12-01 11:08:02 +00:00
parent fbcaffe246
commit 61cf7d568f
3 changed files with 11 additions and 6 deletions

View File

@ -1 +1 @@
SHA512 (systemd-247.tar.gz) = dd11cf46e5d9cbf44beb2d383262e9b13eb80fbb3403d86d011b4c2f9e0a4778c7c9779c856960f5654177581c20d7336c00ce687d35fe35ce069c56924604c2 SHA512 (systemd-247.1.tar.gz) = 2a737afcee4409c2be073d8cb650c3465a25c101b3c3072ea6e6a0614d06e3ed7ae55c84f9ae60555915ad1480b3a13aa72fef4b9210139afe6b0d7a7629385a

View File

@ -72,12 +72,10 @@ for file in files(buildroot):
/machine.slice| /machine.slice|
/machines.target| /machines.target|
var-lib-machines.mount| var-lib-machines.mount|
network/80-container|
network/80-vm|
org.freedesktop.(import|machine)1 org.freedesktop.(import|machine)1
''', n, re.X): ''', n, re.X):
o = o_container o = o_container
elif re.search(r'''/usr/lib/systemd/network/..-wifi| elif re.search(r'''/usr/lib/systemd/network/80-|
networkd| networkd|
networkctl| networkctl|
org.freedesktop.network1 org.freedesktop.network1

View File

@ -1,7 +1,7 @@
#global commit c4b843473a75fb38ed5bf54e9d3cfb1cb3719efa #global commit c4b843473a75fb38ed5bf54e9d3cfb1cb3719efa
%{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})} %{?commit:%global shortcommit %(c=%{commit}; echo ${c:0:7})}
#global stable 1 %global stable 1
# We ship a .pc file but don't want to have a dep on pkg-config. We # We ship a .pc file but don't want to have a dep on pkg-config. We
# strip the automatically generated dep here and instead co-own the # strip the automatically generated dep here and instead co-own the
@ -20,7 +20,7 @@
Name: systemd Name: systemd
Url: https://www.freedesktop.org/wiki/Software/systemd Url: https://www.freedesktop.org/wiki/Software/systemd
Version: 247 Version: 247.1
Release: 1%{?dist} Release: 1%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
@ -892,6 +892,13 @@ getent passwd systemd-network &>/dev/null || useradd -r -u 192 -l -g systemd-net
%files standalone-sysusers -f .file-list-standalone-sysusers %files standalone-sysusers -f .file-list-standalone-sysusers
%changelog %changelog
* Tue Dec 1 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 247.1-1
- Latest stable release
- Fixes #1902819.
- Files to configure networking with systemd-networkd in a VM or container are
moved to systemd-networkd subpackage. (They were previously in the -container
subpackage, which is for container/VM management.)
* Thu Nov 26 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 247-1 * Thu Nov 26 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 247-1
- Update to the latest version - Update to the latest version
- #1900878 should be fixed - #1900878 should be fixed