On 1/9/14, 5:26 PM, fl...@twobit.us wrote:
From: Philip Tricca <fl...@twobit.us>
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.
Merged to 'master-next'. Note, I updated the patch to include a copy of the
commit message it indicate what the purpose of the patch was.
Signed-off-by: Philip Tricca <fl...@twobit.us>
---
.../policycoreutils-loadpolicy-symlink.patch | 11 +++++++++++
recipes-security/selinux/policycoreutils_2.1.14.bb | 1 +
2 files changed, 12 insertions(+)
create mode 100644
recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch
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..e0bd352
--- /dev/null
+++
b/recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch
@@ -0,0 +1,11 @@
+--- a/load_policy/Makefile
++++ b/load_policy/Makefile
+@@ -19,7 +19,7 @@ install: all
+ test -d $(MANDIR)/man8 || install -m 755 -d $(MANDIR)/man8
+ install -m 644 load_policy.8 $(MANDIR)/man8/
+ -mkdir -p $(USRSBINDIR)
+- -ln -sf $(SBINDIR)/load_policy $(USRSBINDIR)/load_policy
++ -ln -sf $(subst $(DESTDIR),,$(SBINDIR))/load_policy
$(USRSBINDIR)/load_policy
+
+ clean:
+ -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 b177042..8a35322 100644
--- a/recipes-security/selinux/policycoreutils_2.1.14.bb
+++ b/recipes-security/selinux/policycoreutils_2.1.14.bb
@@ -12,4 +12,5 @@ SRC_URI += "\
file://policycoreutils-fix-strict-prototypes.patch \
file://policycoreutils-revert-run_init-open_init_pty.patch \
file://policycoreutils-fix-sepolicy-install-path.patch \
+ file://policycoreutils-loadpolicy-symlink.patch \
"
_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto
