swift 14/08/28 18:20:49 Modified: ChangeLog selinux-policy-2.eclass Log: Update selinux eclass with improved rlpkg call and relabeling package set optimization
Revision Changes Path 1.1358 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1358&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1358&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1357&r2=1.1358 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1357 retrieving revision 1.1358 diff -u -r1.1357 -r1.1358 --- ChangeLog 27 Aug 2014 08:15:27 -0000 1.1357 +++ ChangeLog 28 Aug 2014 18:20:49 -0000 1.1358 @@ -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 <[email protected]> selinux-policy-2.eclass: + Simplify rlpkg call and optimize package relabeling thanks to Jason Perfinion 27 Aug 2014; Michał Górny <[email protected]> bash-completion-r1.eclass: Make completionsdir default to the new location (for new installs). Eselect 1.27 eclass/selinux-policy-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/selinux-policy-2.eclass?rev=1.27&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/selinux-policy-2.eclass?rev=1.27&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/selinux-policy-2.eclass?r1=1.26&r2=1.27 Index: selinux-policy-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- selinux-policy-2.eclass 24 Aug 2014 07:54:37 -0000 1.26 +++ selinux-policy-2.eclass 28 Aug 2014 18:20:49 -0000 1.27 @@ -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 @@ # 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
