From 04459772af29807145b68e9cbd1ece951a3cc741 Mon Sep 17 00:00:00 2001 From: Sven Vermeulen Date: Mon, 22 Aug 2011 19:51:33 +0000 Subject: [PATCH] Iterate across patches since bundled application is only supported if the patches are non-incremental --- eclass/selinux-policy-2.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass index 429a6db11206..a4bd338f617a 100644 --- a/eclass/selinux-policy-2.eclass +++ b/eclass/selinux-policy-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 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.9 2011/08/22 04:46:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.10 2011/08/22 19:51:33 swift Exp $ # Eclass for installing SELinux policy, and optionally # reloading the reference-policy based modules. @@ -117,7 +117,11 @@ selinux-policy-2_src_prepare() { if [[ -n ${BASEPOL} ]]; then cd "${S}" - epatch "${PATCHBUNDLE}" + EPATCH_MULTI_MSG="Applying SELinux policy updates ... " \ + EPATCH_SUFFIX="patch" \ + EPATCH_SOURCE="${WORKDIR}" \ + EPATCH_FORCE="yes" \ + epatch fi # Apply the additional patches refered to by the module ebuild. -- 2.26.2