Add %systemd_ordering macro
This commit is contained in:
parent
6474b3a260
commit
8a9b24f9e9
|
@ -0,0 +1,37 @@
|
|||
From 2c3f5a607188d876b3dcfb0075dab79eda914803 Mon Sep 17 00:00:00 2001
|
||||
From: Harald Hoyer <harald@redhat.com>
|
||||
Date: Fri, 22 Jul 2016 15:33:13 +0200
|
||||
Subject: [PATCH] macros.systemd.in: add %systemd_ordering (#3776)
|
||||
|
||||
To remove the hard dependency on systemd, for packages, which function
|
||||
without a running systemd the %systemd_ordering macro can be used to
|
||||
ensure ordering in the rpm transaction. %systemd_ordering makes sure,
|
||||
the systemd rpm is installed prior to the package, so the %pre/%post
|
||||
scripts can execute the systemd parts.
|
||||
|
||||
Installing systemd afterwards though, does not result in the same outcome.
|
||||
(cherry picked from commit 2424b6bd716f0c1c3bf3406b1fd1a16ba1b6a556)
|
||||
---
|
||||
src/core/macros.systemd.in | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/core/macros.systemd.in b/src/core/macros.systemd.in
|
||||
index 2cace3d3ba..f3089cbcc9 100644
|
||||
--- a/src/core/macros.systemd.in
|
||||
+++ b/src/core/macros.systemd.in
|
||||
@@ -36,6 +36,12 @@ Requires(preun): systemd \
|
||||
Requires(postun): systemd \
|
||||
%{nil}
|
||||
|
||||
+%systemd_ordering \
|
||||
+OrderWithRequires(post): systemd \
|
||||
+OrderWithRequires(preun): systemd \
|
||||
+OrderWithRequires(postun): systemd \
|
||||
+%{nil}
|
||||
+
|
||||
%systemd_post() \
|
||||
if [ $1 -eq 1 ] ; then \
|
||||
# Initial installation \
|
||||
--
|
||||
2.9.0
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
Name: systemd
|
||||
Url: http://www.freedesktop.org/wiki/Software/systemd
|
||||
Version: 229
|
||||
Release: 12%{?gitcommit:.git%{gitcommitshort}}%{?dist}
|
||||
Release: 13%{?gitcommit:.git%{gitcommitshort}}%{?dist}
|
||||
# For a breakdown of the licensing, see README
|
||||
License: LGPLv2+ and MIT and GPLv2+
|
||||
Summary: A System and Service Manager
|
||||
|
@ -79,6 +79,7 @@ Patch0043: 0043-networkd-disable-IPv6-for-bridge-slave.patch
|
|||
Patch0044: 0044-networkd-add-route-expiration-handler-3242.patch
|
||||
Patch0045: 0045-coredump-ignore-RLIMIT_CORE.patch
|
||||
Patch0046: 0046-networkd-link-fix-handler-typo-for-route_remove-3433.patch
|
||||
Patch0047: 0047-macros.systemd.in-add-systemd_ordering-3776.patch
|
||||
|
||||
Patch0999: 0999-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
|
||||
|
||||
|
@ -963,6 +964,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
|
|||
/usr/lib/firewalld/services/*
|
||||
|
||||
%changelog
|
||||
* Wed Aug 17 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 229-13
|
||||
- Add %%systemd_ordering macro
|
||||
|
||||
* Wed Aug 10 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 229-12
|
||||
- Fixup for the networkd route fix (#1365915)
|
||||
|
||||
|
|
Loading…
Reference in New Issue