36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
From 916640d786b5896fbf75d219e16422c9a48529ab Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nicolas Iooss <nicolas.iooss@m4x.org>
|
||
|
|
Date: Sat, 5 Jan 2019 20:37:58 +0100
|
||
|
|
Subject: [PATCH 119/170] python/sepolgen: refpolicy installs its Makefile in
|
||
|
|
include/Makefile
|
||
|
|
|
||
|
|
When running "make install-headers" on refpolicy,
|
||
|
|
/usr/share/selinux/refpolicy/Makefile does not exist but
|
||
|
|
/usr/share/selinux/refpolicy/include/Makefile does. Use it when
|
||
|
|
available.
|
||
|
|
|
||
|
|
Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
|
||
|
|
---
|
||
|
|
selinux-python-2.8/sepolgen/src/sepolgen/defaults.py | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/selinux-python-2.8/sepolgen/src/sepolgen/defaults.py b/selinux-python-2.8/sepolgen/src/sepolgen/defaults.py
|
||
|
|
index 533a9041..6e800695 100644
|
||
|
|
--- a/selinux-python-2.8/sepolgen/src/sepolgen/defaults.py
|
||
|
|
+++ b/selinux-python-2.8/sepolgen/src/sepolgen/defaults.py
|
||
|
|
@@ -70,7 +70,10 @@ def attribute_info():
|
||
|
|
|
||
|
|
def refpolicy_makefile():
|
||
|
|
chooser = PathChooser("/etc/selinux/sepolgen.conf")
|
||
|
|
- return chooser("Makefile")
|
||
|
|
+ result = chooser("Makefile")
|
||
|
|
+ if not os.path.exists(result):
|
||
|
|
+ result = chooser("include/Makefile")
|
||
|
|
+ return result
|
||
|
|
|
||
|
|
def headers():
|
||
|
|
chooser = PathChooser("/etc/selinux/sepolgen.conf")
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|