From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SM2Zs-0001LQ-43 for garchives@archives.gentoo.org; Sun, 22 Apr 2012 19:36:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9181AE09CF; Sun, 22 Apr 2012 19:36:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5BDD5E09CF for ; Sun, 22 Apr 2012 19:36:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC9461B40F5 for ; Sun, 22 Apr 2012 19:35:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6D5ABE5402 for ; Sun, 22 Apr 2012 19:35:58 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1335118716.e331cd79231ea08fa39006640112c4c9f1de9b7f.SwifT@gentoo> Subject: [gentoo-commits] proj/hardened-dev:master commit in: eclass/ X-VCS-Repository: proj/hardened-dev X-VCS-Files: eclass/selinux-policy-2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: SwifT X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: e331cd79231ea08fa39006640112c4c9f1de9b7f X-VCS-Branch: master Date: Sun, 22 Apr 2012 19:35:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: e938a773-90cf-403e-83c2-6d776d7e3d02 X-Archives-Hash: e413ca30915ebd22435c1bc393b8c420 commit: e331cd79231ea08fa39006640112c4c9f1de9b7f Author: Sven Vermeulen siphos be> AuthorDate: Sun Apr 22 18:18:36 2012 +0000 Commit: Sven Vermeulen siphos be> CommitDate: Sun Apr 22 18:18:36 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/hardened-dev.= git;a=3Dcommit;h=3De331cd79 Policy files are meant to be in filesdir, so already use it --- eclass/selinux-policy-2.eclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/selinux-policy-2.eclass b/eclass/selinux-policy-2.ecl= ass index 6724067..fb22dd1 100644 --- a/eclass/selinux-policy-2.eclass +++ b/eclass/selinux-policy-2.eclass @@ -139,7 +139,7 @@ selinux-policy-2_src_prepare() { cd "${S}/refpolicy/policy/modules" for POLFILE in "${POLICY_FILES[@]}"; do - cp "${POLFILE}" contrib/ || die "Could not copy over ${POLFILE} to co= ntrib/ location"; + cp "${FILESDIR}/${POLFILE}" contrib/ || die "Could not copy over ${PO= LFILE} to contrib/ location"; done else if [[ -n ${POLICY_FILES} ]]; @@ -147,7 +147,7 @@ selinux-policy-2_src_prepare() { cd "${S}/refpolicy/policy/modules" for POLFILE in ${POLICY_FILES}; do - cp "${POLFILE}" contrib/ || die "Could not copy ${POLFILE} into cont= rib/ location"; + cp "${FILESDIR}/${POLFILE}" contrib/ || die "Could not copy ${POLFIL= E} into contrib/ location"; done fi fi