rpms
/
systemd
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add %systemd_ordering macro

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2016-08-17 18:00:17 +00:00
parent 9fbdc4bf7f
commit 726f6ebadc
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0086-macros.systemd.in-add-systemd_ordering-3776.patch Normal file
View File

@ -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

6
systemd.spec
View File

@ -13,7 +13,7 @@
Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 222
Release: 15%{?gitcommit:.git%{gitcommit}}%{?dist}
Release: 16%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@ -118,6 +118,7 @@ Patch0082: 0082-man-document-that-unit-file-globbing-only-operates-o.patch
Patch0083: 0083-ask-password-api-only-emit-a-star-on-valid-unicode-c.patch
Patch0084: 0084-core-add-new-RandomSec-setting-for-time-units.patch
Patch0085: 0085-core-rename-Random-to-RandomizedDelay.patch
Patch0086: 0086-macros.systemd.in-add-systemd_ordering-3776.patch
Patch997: 0001-Re-apply-walters-unit-patch-for-F23-systemd-v222.patch
Patch998: 0001-Revert-core-mount-add-dependencies-to-dynamically-mo-v222.patch
@ -859,8 +860,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
/usr/lib/firewalld/services/*
%changelog
* Tue Mar 15 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@bupkis> - 222-16
* Wed Aug 17 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 222-16
- Ignore the access mode on /var/log/journal (#1317570)
- Add %%systemd_ordering macro
* Thu Feb 11 2016 Jan Synáček <jsynacek@redhat.com> - 222-15
- various fixes in kernel-install (#1244057)