diff options
| author |   Sven Vermeulen <swift@gentoo.org> | 2014-08-28 18:20:49 +0000 |
|---|---|---|
| committer | Sven Vermeulen <swift@gentoo.org> | 2014-08-28 18:20:49 +0000 |
| commit | d6ee58931b027d04ca73812546577ffdd76b49ec (patch) | |
| tree | cbfba24ded4d7ed251bec12148d7cbb930d98e52 /eclass | |
| parent | Drop old (diff) | |
| download | gentoo-2-d6ee58931b027d04ca73812546577ffdd76b49ec.tar.gz gentoo-2-d6ee58931b027d04ca73812546577ffdd76b49ec.tar.bz2 gentoo-2-d6ee58931b027d04ca73812546577ffdd76b49ec.zip | |
Update selinux eclass with improved rlpkg call and relabeling package set optimization
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/selinux-policy-2.eclass | 13 |
2 files changed, 10 insertions, 8 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index ce9bac9a8392..5ddfc9980433 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1357 2014/08/27 08:15:27 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1358 2014/08/28 18:20:49 swift Exp $ + + 28 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-policy-2.eclass: + Simplify rlpkg call and optimize package relabeling thanks to Jason Perfinion 27 Aug 2014; Michał Górny <mgorny@gentoo.org> bash-completion-r1.eclass: Make completionsdir default to the new location (for new installs). Eselect diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass index 045a8c6feeb3..790a9701bf24 100644 --- a/eclass/selinux-policy-2.eclass +++ b/eclass/selinux-policy-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.26 2014/08/24 07:54:37 swift Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.27 2014/08/28 18:20:49 swift Exp $ # Eclass for installing SELinux policy, and optionally # reloading the reference-policy based modules. @@ -318,14 +318,13 @@ selinux-policy-2_pkg_postinst() { # Relabel depending packages PKGSET=""; if [ -x /usr/bin/qdepends ] ; then - PKGSET=$(/usr/bin/qdepends -Cq -Q ${CATEGORY}/${PN}); + PKGSET=$(/usr/bin/qdepends -Cq -Q ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-"); elif [ -x /usr/bin/equery ] ; then - PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN}); + PKGSET=$(/usr/bin/equery -Cq depends ${CATEGORY}/${PN} | grep -v "sec-policy/selinux-"); + fi + if [ -n "${PKGSET}" ] ; then + rlpkg ${PKGSET}; fi - for PKG in ${PKGSET}; - do - rlpkg ${PKG}; - done } # @FUNCTION: selinux-policy-2_pkg_postrm |