summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-09-14 16:10:58 -0500
committerMark Hatle <mark.hatle@windriver.com>2017-09-14 16:12:25 -0500
commit907e373e4059870231360aabf9d9651d318968d9 (patch)
treeb636fd69d0a641be1eccad8e134e9f132138dbaa
parentbca5c611508d0d19a08fb7fc3f7810c85fcfeba5 (diff)
downloadmeta-selinux-mgh/master-next.tar.gz
policycoreutils: Update fixfilemgh/master-next
The functional call may not always work as specified, be sure to include the () to make sure the shell knows this is a function. Also add both findutils and grep as necessary for fixfiles to run properly in a minimal environment. Busybox is not adequate at this time. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--recipes-security/selinux/policycoreutils.inc2
-rw-r--r--recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch2
2 files changed, 3 insertions, 1 deletions
diff --git a/recipes-security/selinux/policycoreutils.inc b/recipes-security/selinux/policycoreutils.inc
index fc181f7..442b086 100644
--- a/recipes-security/selinux/policycoreutils.inc
+++ b/recipes-security/selinux/policycoreutils.inc
@@ -25,6 +25,8 @@ DEPENDS += "${@target_selinux(d, 'libpam audit')}"
25 25
26RDEPENDS_${BPN}-fixfiles += "\ 26RDEPENDS_${BPN}-fixfiles += "\
27 ${BPN}-setfiles \ 27 ${BPN}-setfiles \
28 grep \
29 findutils \
28" 30"
29RDEPENDS_${BPN}-genhomedircon += "\ 31RDEPENDS_${BPN}-genhomedircon += "\
30 ${BPN}-genhomedircon \ 32 ${BPN}-genhomedircon \
diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch b/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch
index 0144de7..70cdd4f 100644
--- a/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch
+++ b/recipes-security/selinux/policycoreutils/policycoreutils-fixfiles-de-bashify.patch
@@ -33,7 +33,7 @@ index 1aa330f..a10837d 100755
33 # number if the current is less than 2.6.30 and 0 if they are the same. 33 # number if the current is less than 2.6.30 and 0 if they are the same.
34 # 34 #
35-function useseclabel { 35-function useseclabel {
36+useseclabel { 36+useseclabel () {
37 VER=`uname -r` 37 VER=`uname -r`
38 SUP=2.6.30 38 SUP=2.6.30
39 expr '(' "$VER" : '\([^.]*\)' ')' '-' '(' "$SUP" : '\([^.]*\)' ')' '|' \ 39 expr '(' "$VER" : '\([^.]*\)' ')' '-' '(' "$SUP" : '\([^.]*\)' ')' '|' \