Accepting request 838925 from home:fbui:systemd:openSUSE-Factory

- Import commit d7b5ac76dc95ddf30e707d26998e36303e9f52a7 (merge of v246.6) For a complete list of changes, visit: 1cab0d4458...d7b5ac76dc - Ship {/usr/lib,/etc}/systemd/network directories in the main package These directories can be used by both udevd and networkd. OBS-URL: https://build.opensuse.org/request/show/838925 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1121
2020-10-01 07:57:06 +00:00 · 2020-10-01 07:57:06 +00:00 · 0aef3358be
commit 0aef3358be
parent 17276831ba
7 changed files with 50 additions and 19 deletions
--- a/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch
+++ b/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch
@ -1,8 +1,7 @@
-From 59f2eadb29ac38803fd32fe52f1403343a7d74ac Mon Sep 17 00:00:00 2001
+From 47563b617a371680d1ec3729fa4324310ebe3710 Mon Sep 17 00:00:00 2001
 From: Thomas Blume <thomas.blume@suse.com>
 Date: Tue, 25 Mar 2014 13:08:56 +0000
-Subject: [PATCH 02/12] rc-local: fix ordering startup for
- /etc/init.d/boot.local
+Subject: [PATCH 1/1] rc-local: fix ordering startup for /etc/init.d/boot.local

 [tblume: fixes bnc#869142]
 ---
@ -10,13 +9,13 @@ Subject: [PATCH 02/12] rc-local: fix ordering startup for
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/units/rc-local.service.in b/units/rc-local.service.in
-index 78ce69e0ae..0bcea82bed 100644
+index d4aaaf09d4..5cd1571cc7 100644
 --- a/units/rc-local.service.in
 +++ b/units/rc-local.service.in
@@ -13,7 +13,7 @@
- Description=@RC_LOCAL_SCRIPT_PATH_START@ Compatibility
+ Description=@RC_LOCAL_PATH@ Compatibility
 Documentation=man:systemd-rc-local-generator(8)
- ConditionFileIsExecutable=@RC_LOCAL_SCRIPT_PATH_START@
+ ConditionFileIsExecutable=@RC_LOCAL_PATH@
 -After=network.target
 +After=basic.target
 
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Sep 30 19:09:59 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Import commit d7b5ac76dc95ddf30e707d26998e36303e9f52a7 (merge of v246.6)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/1cab0d44584687ace92d1df30eadf264231e3b65...d7b5ac76dc95ddf30e707d26998e36303e9f52a7
+
+-------------------------------------------------------------------
+Tue Sep 29 16:37:40 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Ship {/usr/lib,/etc}/systemd/network directories in the main package
+
+  These directories can be used by both udevd and networkd.
+
 -------------------------------------------------------------------
 Thu Sep 17 15:12:48 UTC 2020 - Franck Bui <fbui@suse.com>

--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@ -26,7 +26,7 @@
 ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! #####
 %define mini -mini
 %define min_kernel_version 4.5
-%define suse_version +suse.25.g1cab0d4458
+%define suse_version +suse.27.gd7b5ac76dc

 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@ -55,7 +55,7 @@

 Name:           systemd-mini
 URL:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        246.5
+Version:        246.6
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1-or-later
@ -605,6 +605,7 @@ install -m0755 -D %{S:3}  %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-conve
 install -m0755 -D %{S:4}  %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install
 %endif

+mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network
 mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn

 # Package the scripts used to fix all packaging issues. Also drop the
@ -1122,6 +1123,7 @@ fi
 %{_prefix}/lib/kernel/install.d/50-depmod.install
 %{_prefix}/lib/kernel/install.d/90-loaderentry.install
 %dir %{_prefix}/lib/systemd
+%dir %{_prefix}/lib/systemd/network
 %dir %{_unitdir}
 %{_userunitdir}
 %if %{with coredump}
@ -1245,6 +1247,7 @@ fi
 %dir %{_sysconfdir}/X11/xinit/xinitrc.d
 %dir %{_sysconfdir}/X11/xorg.conf.d
 %dir %{_sysconfdir}/systemd
+%dir %{_sysconfdir}/systemd/network
 %dir %{_sysconfdir}/systemd/system
 %dir %{_sysconfdir}/systemd/user
 %dir %{_sysconfdir}/xdg/systemd
@ -1449,7 +1452,7 @@ fi
 %{_mandir}/man8/systemd-udev*
 %{_mandir}/man8/udev*
 %endif
-%dir %{_prefix}/lib/systemd/system
+%dir %{_unitdir}
 %{_prefix}/lib/systemd/systemd-udevd
 %{_unitdir}/systemd-udev*.service
 %{_unitdir}/systemd-udevd*.socket
@ -1458,7 +1461,6 @@ fi
 %{_unitdir}/sysinit.target.wants/systemd-udev*.service
 %dir %{_unitdir}/sockets.target.wants
 %{_unitdir}/sockets.target.wants/systemd-udev*.socket
-%dir %{_prefix}/lib/systemd/network
 %{_prefix}/lib/systemd/network/99-default.link
 %{_datadir}/pkgconfig/udev.pc

@ -1597,7 +1599,6 @@ fi
 %files network
 %defattr(-,root,root)
 %if %{with networkd}
-%dir %{_sysconfdir}/systemd/network
 %config(noreplace) %{_sysconfdir}/systemd/networkd.conf
 %{_bindir}/networkctl
 %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf
--- a/systemd-v246.5+suse.25.g1cab0d4458.tar.xz
+++ b/systemd-v246.5+suse.25.g1cab0d4458.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0eca844c16e0c0391eb73b3d908b714d190e5c5d7ccc20c6fca5abf634fa078c
-size 6551712
--- a/systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz
+++ b/systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a49af04e1d1dbadfcc869108ab16976a774dbbc379ae2226a4977f32c734a499
+size 6552824
--- a/systemd.changes
+++ b/systemd.changes
@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Sep 30 19:09:59 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Import commit d7b5ac76dc95ddf30e707d26998e36303e9f52a7 (merge of v246.6)
+
+  For a complete list of changes, visit:
+  https://github.com/openSUSE/systemd/compare/1cab0d44584687ace92d1df30eadf264231e3b65...d7b5ac76dc95ddf30e707d26998e36303e9f52a7
+
+-------------------------------------------------------------------
+Tue Sep 29 16:37:40 UTC 2020 - Franck Bui <fbui@suse.com>
+
+- Ship {/usr/lib,/etc}/systemd/network directories in the main package
+
+  These directories can be used by both udevd and networkd.
+
 -------------------------------------------------------------------
 Thu Sep 17 15:12:48 UTC 2020 - Franck Bui <fbui@suse.com>

--- a/systemd.spec
+++ b/systemd.spec
@ -24,7 +24,7 @@
 %define bootstrap 0
 %define mini %nil
 %define min_kernel_version 4.5
-%define suse_version +suse.25.g1cab0d4458
+%define suse_version +suse.27.gd7b5ac76dc

 %bcond_with     gnuefi
 %if 0%{?bootstrap}
@ -53,7 +53,7 @@

 Name:           systemd
 URL:            http://www.freedesktop.org/wiki/Software/systemd
-Version:        246.5
+Version:        246.6
 Release:        0
 Summary:        A System and Session Manager
 License:        LGPL-2.1-or-later
@ -603,6 +603,7 @@ install -m0755 -D %{S:3}  %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-conve
 install -m0755 -D %{S:4}  %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install
 %endif

+mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network
 mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn

 # Package the scripts used to fix all packaging issues. Also drop the
@ -1120,6 +1121,7 @@ fi
 %{_prefix}/lib/kernel/install.d/50-depmod.install
 %{_prefix}/lib/kernel/install.d/90-loaderentry.install
 %dir %{_prefix}/lib/systemd
+%dir %{_prefix}/lib/systemd/network
 %dir %{_unitdir}
 %{_userunitdir}
 %if %{with coredump}
@ -1243,6 +1245,7 @@ fi
 %dir %{_sysconfdir}/X11/xinit/xinitrc.d
 %dir %{_sysconfdir}/X11/xorg.conf.d
 %dir %{_sysconfdir}/systemd
+%dir %{_sysconfdir}/systemd/network
 %dir %{_sysconfdir}/systemd/system
 %dir %{_sysconfdir}/systemd/user
 %dir %{_sysconfdir}/xdg/systemd
@ -1447,7 +1450,7 @@ fi
 %{_mandir}/man8/systemd-udev*
 %{_mandir}/man8/udev*
 %endif
-%dir %{_prefix}/lib/systemd/system
+%dir %{_unitdir}
 %{_prefix}/lib/systemd/systemd-udevd
 %{_unitdir}/systemd-udev*.service
 %{_unitdir}/systemd-udevd*.socket
@ -1456,7 +1459,6 @@ fi
 %{_unitdir}/sysinit.target.wants/systemd-udev*.service
 %dir %{_unitdir}/sockets.target.wants
 %{_unitdir}/sockets.target.wants/systemd-udev*.socket
-%dir %{_prefix}/lib/systemd/network
 %{_prefix}/lib/systemd/network/99-default.link
 %{_datadir}/pkgconfig/udev.pc

@ -1595,7 +1597,6 @@ fi
 %files network
 %defattr(-,root,root)
 %if %{with networkd}
-%dir %{_sysconfdir}/systemd/network
 %config(noreplace) %{_sysconfdir}/systemd/networkd.conf
 %{_bindir}/networkctl
 %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf