Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jb48729' into 'master'
[policycoreutils] Update to 3.0. Contributes to JB#48729 See merge request mer-core/policycoreutils!6
- Loading branch information
Showing
3 changed files
with
57 additions
and
21 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,27 @@ | ||
From ef6dc2583233c3b1a4a59d36033f724166bd07eb Mon Sep 17 00:00:00 2001 | ||
From: Lauri Kopo <lauri.kopo@jolla.com> | ||
Date: Tue, 28 Jan 2020 11:53:50 +0200 | ||
Subject: [PATCH] fix_systemd_path | ||
|
||
--- | ||
restorecond/Makefile | 4 ++-- | ||
1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/restorecond/Makefile b/restorecond/Makefile | ||
index 25be18d4..65bd1775 100644 | ||
index 12452cd2..27062bc2 100644 | ||
--- a/restorecond/Makefile | ||
+++ b/restorecond/Makefile | ||
@@ -51,8 +51,8 @@ install: all | ||
@@ -48,8 +48,8 @@ install: all | ||
install -m 644 restorecond.desktop $(DESTDIR)$(AUTOSTARTDIR)/restorecond.desktop | ||
-mkdir -p $(DESTDIR)$(DBUSSERVICEDIR) | ||
install -m 600 org.selinux.Restorecond.service $(DESTDIR)$(DBUSSERVICEDIR)/org.selinux.Restorecond.service | ||
install -m 644 org.selinux.Restorecond.service $(DESTDIR)$(DBUSSERVICEDIR)/org.selinux.Restorecond.service | ||
- -mkdir -p $(DESTDIR)$(SYSTEMDDIR)/system | ||
- install -m 644 restorecond.service $(DESTDIR)$(SYSTEMDDIR)/system/ | ||
+ -mkdir -p $(DESTDIR)$(SYSTEMDDIR)/ | ||
+ install -m 644 restorecond.service $(DESTDIR)$(SYSTEMDDIR)/ | ||
relabel: install | ||
/sbin/restorecon $(DESTDIR)$(SBINDIR)/restorecond | ||
|
||
-- | ||
2.24.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule upstream
updated
from a9f8a1 to dca7ce