From f5e042c80a298eaec5dbdd8477c8f75268589a56 Mon Sep 17 00:00:00 2001 From: Philip Tricca Date: Thu, 9 Jan 2014 23:26:54 +0000 Subject: 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 Signed-off-by: Mark Hatle --- .../policycoreutils-loadpolicy-symlink.patch | 19 +++++++++++++++++++ recipes-security/selinux/policycoreutils_2.1.14.bb | 1 + 2 files changed, 20 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..ef9936a --- /dev/null +++ b/recipes-security/selinux/policycoreutils/policycoreutils-loadpolicy-symlink.patch @@ -0,0 +1,19 @@ +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 + +--- 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 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 += "\ file://policycoreutils-revert-run_init-open_init_pty.patch \ file://policycoreutils-fix-sepolicy-install-path.patch \ file://policycoreutils-make-O_CLOEXEC-optional.patch \ + file://policycoreutils-loadpolicy-symlink.patch \ " -- cgit v1.2.3-54-g00ecf