diff options
author | Philip Tricca <flihp@twobit.us> | 2014-01-09 23:26:54 +0000 |
---|---|---|
committer | Mark Hatle <mark.hatle@windriver.com> | 2014-01-10 13:22:38 -0600 |
commit | f5e042c80a298eaec5dbdd8477c8f75268589a56 (patch) | |
tree | 473cba2fe6395b5202c549a04c776c3d2cb6ee41 | |
parent | 2209cb5fc21c1ad5a7471897528ed64170f70219 (diff) | |
download | meta-selinux-f5e042c80a298eaec5dbdd8477c8f75268589a56.tar.gz |
policycoreutils: Patch Makefile to get load_policy symlink right.
Setting DESTDIR in the policycoreutils do_install creates a bad
symlink for load_policy. This patch fixes up the Makefile to
create the symlink relative to DESTDIR.
Signed-off-by: Philip Tricca <flihp@twobit.us>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r-- | recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch | 19 | ||||
-rw-r--r-- | recipes-security/selinux/policycoreutils_2.1.14.bb | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch b/recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch new file mode 100644 index 0000000..ef9936a --- /dev/null +++ b/recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch | |||
@@ -0,0 +1,19 @@ | |||
1 | policycoreutils: Patch Makefile to get load_policy symlink right | ||
2 | |||
3 | Setting DESTDIR in the policycoreutils do_install creates a bad | ||
4 | symlink for load_policy. This patch fixes up the Makefile to | ||
5 | create the symlink relative to DESTDIR. | ||
6 | |||
7 | Signed-off-by: Philip Tricca <flihp@twobit.us> | ||
8 | |||
9 | --- a/load_policy/Makefile | ||
10 | +++ b/load_policy/Makefile | ||
11 | @@ -19,7 +19,7 @@ install: all | ||
12 | test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8 | ||
13 | install -m 644 load_policy.8 $(MANDIR)/man8/ | ||
14 | -mkdir -p $(USRSBINDIR) | ||
15 | - -ln -sf $(SBINDIR)/load_policy $(USRSBINDIR)/load_policy | ||
16 | + -ln -sf $(subst $(DESTDIR),,$(SBINDIR))/load_policy $(USRSBINDIR)/load_policy | ||
17 | |||
18 | clean: | ||
19 | -rm -f $(TARGETS) *.o | ||
diff --git a/recipes-security/selinux/policycoreutils_2.1.14.bb b/recipes-security/selinux/policycoreutils_2.1.14.bb index 64f0d8d..da91ddb 100644 --- a/recipes-security/selinux/policycoreutils_2.1.14.bb +++ b/recipes-security/selinux/policycoreutils_2.1.14.bb | |||
@@ -13,4 +13,5 @@ SRC_URI += "\ | |||
13 | file://policycoreutils-revert-run_init-open_init_pty.patch \ | 13 | file://policycoreutils-revert-run_init-open_init_pty.patch \ |
14 | file://policycoreutils-fix-sepolicy-install-path.patch \ | 14 | file://policycoreutils-fix-sepolicy-install-path.patch \ |
15 | file://policycoreutils-make-O_CLOEXEC-optional.patch \ | 15 | file://policycoreutils-make-O_CLOEXEC-optional.patch \ |
16 | file://policycoreutils-loadpolicy-symlink.patch \ | ||
16 | " | 17 | " |