diff options
| -rw-r--r-- | profiles/ChangeLog | 7 | ||||
| -rw-r--r-- | profiles/hardened/linux/amd64/no-multilib/parent | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 2ba24911dc83..1d1ac427eff5 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,6 +1,6 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6202 2012/02/11 19:26:14 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6203 2012/02/11 19:32:05 slyfox Exp $ # # This ChangeLog should include records for all changes in profiles directory. # Only typo fixes which don't affect portage/repoman behaviour could be avoided @@ -11,6 +11,11 @@ 11 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> hardened/linux/amd64/no-multilib/parent: + Reverted previous change as it caused phony profiles to pop up (found out by + blueness). + + 11 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> + hardened/linux/amd64/no-multilib/parent: Make hardened/linux/amd64/no-multilib include arch/amd64/no-multilib (http://archives.gentoo.org/gentoo-dev/msg_7c41ab6653426048c2e8b0f271637bf3.x ml). Approved by Zorry. diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent index d1be3c466bb6..6d6c60c5667b 100644 --- a/profiles/hardened/linux/amd64/no-multilib/parent +++ b/profiles/hardened/linux/amd64/no-multilib/parent @@ -1,3 +1,8 @@ .. -../../../../arch/amd64/no-multilib +# Don't enable it. It will introduce +# phony profiles like: +# /usr/portage/profiles/arch/base +# /usr/portage/profiles/features/multilib +# /usr/portage/profiles/features/multilib/lib32 +# ../../../../arch/amd64/no-multilib ../../../../features/64bit-native |