summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Vermeulen <swift@gentoo.org>2014-08-08 18:35:11 +0000
committerSven Vermeulen <swift@gentoo.org>2014-08-08 18:35:11 +0000
commitdc5d6501da024f65fd46898b26b02135cb56ff9d (patch)
tree5f867ef5671ac090af822a3f1989a3c48c9e2045
parentVersion bump. Removed old (diff)
downloadgentoo-2-dc5d6501da024f65fd46898b26b02135cb56ff9d.tar.gz
gentoo-2-dc5d6501da024f65fd46898b26b02135cb56ff9d.tar.bz2
gentoo-2-dc5d6501da024f65fd46898b26b02135cb56ff9d.zip
Use PVR for BASEPOL in SELinux eclass
-rw-r--r--eclass/ChangeLog6
-rw-r--r--eclass/selinux-policy-2.eclass4
2 files changed, 7 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 0a09840367d0..7e706c4b1600 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for eclass directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1345 2014/08/08 17:57:28 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1346 2014/08/08 18:35:11 swift Exp $
+
+ 08 Aug 2014; Sven Vermeulen <swift@gentoo.org> selinux-policy-2.eclass:
+ The BASEPOL variable can be deduced from the ebuild version as we no longer
+ support mixing versions
08 Aug 2014; Christoph Junghans <ottxor@gentoo.org> db-use.eclass:
added prefix support
diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.eclass
index 9f4ab95b55a4..5f28b1db58aa 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.22 2014/08/06 08:25:02 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/selinux-policy-2.eclass,v 1.23 2014/08/08 18:35:11 swift Exp $
# Eclass for installing SELinux policy, and optionally
# reloading the reference-policy based modules.
@@ -29,7 +29,7 @@
# This variable contains the version string of the selinux-base-policy package
# that this module build depends on. It is used to patch with the appropriate
# patch bundle(s) that are part of selinux-base-policy.
-: ${BASEPOL:=""}
+: ${BASEPOL:=${PVR}}
# @ECLASS-VARIABLE: POLICY_PATCH
# @DESCRIPTION: