CaROS/meta-selinux
3
0
Fork 0
mirror of git://git.yoctoproject.org/meta-selinux synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

policycoreutils: fix genhomedircon construction

Browse Source 
CQID: 418197

Reference /usr/sbin instead of the directory into which
the script is installed on the host.

Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
This commit is contained in:
Joe Slater 2013-08-01 10:25:06 -07:00 committed by Mark Hatle
parent d5b2d7d8e0
commit 9d06d2ea81
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
recipes-security/selinux/policycoreutils/scripts_makefile.patch Normal file
View File

@ -0,0 +1,26 @@
policycoreutils: fix genhomedircon generation
The script is put on the target and needs to reference
the directory in which semodule is installed.
Upstream Status: pending
Signed-off-by: Joe Slater <jslater@windriver.com>
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -8,11 +8,12 @@ LOCALEDIR ?= $(PREFIX)/share/locale
all: fixfiles genhomedircon chcat
+# we want the script to use the user sbin directory on the target
+#
genhomedircon:
@echo "#!/bin/sh" > genhomedircon
@echo >> genhomedircon
- @if [ ! -e semodule_path ]; then echo -n "$(USRSBINDIR)/" >> genhomedircon; fi
- @if [ -e semodule_path ]; then echo -n "`cat semodule_path`/" >> genhomedircon; fi
+ @echo -n "$(sbindir)/" >> genhomedircon
@echo "semodule -Bn" >> genhomedircon
install: all

3
recipes-security/selinux/policycoreutils_2.1.13.bb
View File

@ -1,4 +1,4 @@
PR = "r2"
PR = "r3"
include selinux_20120924.inc
include ${BPN}.inc
@ -11,4 +11,5 @@ SRC_URI[sha256sum] = "34040f06f3111d9ee957576e4095841d35b9ca9141ee8d80aab036cbef
SRC_URI += "\
file://policycoreutils-revert-restorecon-update-type.patch \
file://policycoreutils-revert-run_init-open_init_pty.patch \
file://scripts_makefile.patch \
"