diff options
author | Joe Slater <jslater@windriver.com> | 2013-08-01 10:25:06 -0700 |
---|---|---|
committer | Mark Hatle <mark.hatle@windriver.com> | 2013-08-01 20:31:11 -0500 |
commit | 9d06d2ea818c2cf5b75cd114b48e33e016d15d26 (patch) | |
tree | 3be7500cc7ed4187f783e783f8dd582e4986c099 /recipes-security/selinux/policycoreutils | |
parent | d5b2d7d8e07e6371d74a60302f9eece5868b7794 (diff) | |
download | meta-selinux-dylan.tar.gz |
policycoreutils: fix genhomedircon constructiondylan
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>
Diffstat (limited to 'recipes-security/selinux/policycoreutils')
-rw-r--r-- | recipes-security/selinux/policycoreutils/scripts_makefile.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/recipes-security/selinux/policycoreutils/scripts_makefile.patch b/recipes-security/selinux/policycoreutils/scripts_makefile.patch new file mode 100644 index 0000000..8972474 --- /dev/null +++ b/recipes-security/selinux/policycoreutils/scripts_makefile.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | policycoreutils: fix genhomedircon generation | ||
2 | |||
3 | The script is put on the target and needs to reference | ||
4 | the directory in which semodule is installed. | ||
5 | |||
6 | Upstream Status: pending | ||
7 | |||
8 | Signed-off-by: Joe Slater <jslater@windriver.com> | ||
9 | |||
10 | --- a/scripts/Makefile | ||
11 | +++ b/scripts/Makefile | ||
12 | @@ -8,11 +8,12 @@ LOCALEDIR ?= $(PREFIX)/share/locale | ||
13 | |||
14 | all: fixfiles genhomedircon chcat | ||
15 | |||
16 | +# we want the script to use the user sbin directory on the target | ||
17 | +# | ||
18 | genhomedircon: | ||
19 | @echo "#!/bin/sh" > genhomedircon | ||
20 | @echo >> genhomedircon | ||
21 | - @if [ ! -e semodule_path ]; then echo -n "$(USRSBINDIR)/" >> genhomedircon; fi | ||
22 | - @if [ -e semodule_path ]; then echo -n "`cat semodule_path`/" >> genhomedircon; fi | ||
23 | + @echo -n "$(sbindir)/" >> genhomedircon | ||
24 | @echo "semodule -Bn" >> genhomedircon | ||
25 | |||
26 | install: all | ||