From: Mark Hatle <mark.hatle@windriver.com>
To: <yocto@yoctoproject.org>
Subject: Re: [meta-selinux][PATCH] policycoreutils: Patch Makefile to get load_policy symlink right.
Date: Fri, 10 Jan 2014 14:42:06 -0600 [thread overview]
Message-ID: <52D05B1E.30509@windriver.com> (raw)
In-Reply-To: <1389310014-31051-1-git-send-email-flihp@twobit.us>
On 1/9/14, 5:26 PM, flihp@twobit.us wrote:
> From: Philip Tricca <flihp@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 <flihp@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 \
> "
>
prev parent reply other threads:[~2014-01-10 20:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-09 23:26 [meta-selinux][PATCH] policycoreutils: Patch Makefile to get load_policy symlink right flihp
2014-01-10 20:42 ` Mark Hatle [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52D05B1E.30509@windriver.com \
--to=mark.hatle@windriver.com \
--cc=yocto@yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.