diff options
| author |   Gordon Malm <gengor@gentoo.org> | 2010-02-01 13:03:47 -0800 |
|---|---|---|
| committer | Gordon Malm <gengor@gentoo.org> | 2010-02-01 13:03:47 -0800 |
| commit | 1d7110a9e705ce0e44542630ed91e6734d41ffb7 (patch) | |
| tree | 20b73f9dc1a2b31e1aa9c4a97889c0d898002073 | |
| parent | Also update deprecated in hardened/ARCH and subdirs so users dont switch to h... (diff) | |
| parent | Updeted the amd64 profile from amd64/10.0 to amd64 (diff) | |
| download | hardened-dev-1d7110a9e705ce0e44542630ed91e6734d41ffb7.tar.gz hardened-dev-1d7110a9e705ce0e44542630ed91e6734d41ffb7.tar.bz2 hardened-dev-1d7110a9e705ce0e44542630ed91e6734d41ffb7.zip | |
Merge branch 'profiles' of git+ssh://git.overlays.gentoo.org/proj/hardened-dev into profiles
16 files changed, 7 insertions, 73 deletions
diff --git a/profiles/hardened/linux/amd64/2008.0/deprecated b/profiles/hardened/linux/amd64/2008.0/deprecated deleted file mode 100644 index a4054a37..00000000 --- a/profiles/hardened/linux/amd64/2008.0/deprecated +++ /dev/null @@ -1,7 +0,0 @@ -hardened/linux/amd64/10.0 -# Check 'eselect profile list'. -# Find the number that corresponds with the hardened/linux/amd64/10.0 profile. -# Use 'eselect profile set <number>' to set a new /etc/make.profile symlink. -# -# Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml -# See: "General instructions" in Section 3. "Profile updating instructions" diff --git a/profiles/hardened/linux/amd64/2008.0/desktop/deprecated b/profiles/hardened/linux/amd64/2008.0/desktop/deprecated deleted file mode 100644 index a4054a37..00000000 --- a/profiles/hardened/linux/amd64/2008.0/desktop/deprecated +++ /dev/null @@ -1,7 +0,0 @@ -hardened/linux/amd64/10.0 -# Check 'eselect profile list'. -# Find the number that corresponds with the hardened/linux/amd64/10.0 profile. -# Use 'eselect profile set <number>' to set a new /etc/make.profile symlink. -# -# Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml -# See: "General instructions" in Section 3. "Profile updating instructions" diff --git a/profiles/hardened/linux/amd64/2008.0/desktop/make.defaults b/profiles/hardened/linux/amd64/2008.0/desktop/make.defaults deleted file mode 100644 index b11f236c..00000000 --- a/profiles/hardened/linux/amd64/2008.0/desktop/make.defaults +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/2008.0/desktop/make.defaults,v 1.1 2009/08/06 17:58:48 ssuominen Exp $ - -# Samuli Suominen <ssuominen@gentoo.org> (06 Aug 2009) -# Deprecated since 10.0 profiles. -USE="esd qt3" diff --git a/profiles/hardened/linux/amd64/2008.0/desktop/parent b/profiles/hardened/linux/amd64/2008.0/desktop/parent deleted file mode 100644 index ad6c5e12..00000000 --- a/profiles/hardened/linux/amd64/2008.0/desktop/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/desktop diff --git a/profiles/hardened/linux/amd64/2008.0/developer/deprecated b/profiles/hardened/linux/amd64/2008.0/developer/deprecated deleted file mode 100644 index a4054a37..00000000 --- a/profiles/hardened/linux/amd64/2008.0/developer/deprecated +++ /dev/null @@ -1,7 +0,0 @@ -hardened/linux/amd64/10.0 -# Check 'eselect profile list'. -# Find the number that corresponds with the hardened/linux/amd64/10.0 profile. -# Use 'eselect profile set <number>' to set a new /etc/make.profile symlink. -# -# Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml -# See: "General instructions" in Section 3. "Profile updating instructions" diff --git a/profiles/hardened/linux/amd64/2008.0/developer/parent b/profiles/hardened/linux/amd64/2008.0/developer/parent deleted file mode 100644 index 4c893748..00000000 --- a/profiles/hardened/linux/amd64/2008.0/developer/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/developer diff --git a/profiles/hardened/linux/amd64/2008.0/make.defaults b/profiles/hardened/linux/amd64/2008.0/make.defaults deleted file mode 100644 index 09a9483e..00000000 --- a/profiles/hardened/linux/amd64/2008.0/make.defaults +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/2008.0/make.defaults,v 1.2 2009/09/30 03:08:32 gengor Exp $ - -# STAGE1_USE does not stack -STAGE1_USE="hardened multilib nptl nptlonly pic" - -USE="-unicode" diff --git a/profiles/hardened/linux/amd64/2008.0/no-multilib/deprecated b/profiles/hardened/linux/amd64/2008.0/no-multilib/deprecated deleted file mode 100644 index 2ec537be..00000000 --- a/profiles/hardened/linux/amd64/2008.0/no-multilib/deprecated +++ /dev/null @@ -1,7 +0,0 @@ -hardened/linux/amd64/10.0/no-multilib -# Check 'eselect profile list'. -# Find the number that corresponds with the hardened/linux/amd64/10.0/no-multilib profile. -# Use 'eselect profile set <number>' to set a new /etc/make.profile symlink. -# -# Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml -# See: "General instructions" in Section 3. "Profile updating instructions" diff --git a/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults b/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults deleted file mode 100644 index b4d6e380..00000000 --- a/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/2008.0/no-multilib/make.defaults,v 1.1 2008/04/01 17:41:13 wolf31o2 Exp $ - -ARCH="amd64" -ACCEPT_KEYWORDS="${ARCH}" - -MULTILIB_ABIS="amd64" - -STAGE1_USE="hardened nptl nptlonly pic" diff --git a/profiles/hardened/linux/amd64/2008.0/no-multilib/parent b/profiles/hardened/linux/amd64/2008.0/no-multilib/parent deleted file mode 100644 index 52bcba73..00000000 --- a/profiles/hardened/linux/amd64/2008.0/no-multilib/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../features/64bit-native diff --git a/profiles/hardened/linux/amd64/2008.0/parent b/profiles/hardened/linux/amd64/2008.0/parent deleted file mode 100644 index 3c71bf2b..00000000 --- a/profiles/hardened/linux/amd64/2008.0/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../releases/2008.0 diff --git a/profiles/hardened/linux/amd64/2008.0/server/deprecated b/profiles/hardened/linux/amd64/2008.0/server/deprecated deleted file mode 100644 index a4054a37..00000000 --- a/profiles/hardened/linux/amd64/2008.0/server/deprecated +++ /dev/null @@ -1,7 +0,0 @@ -hardened/linux/amd64/10.0 -# Check 'eselect profile list'. -# Find the number that corresponds with the hardened/linux/amd64/10.0 profile. -# Use 'eselect profile set <number>' to set a new /etc/make.profile symlink. -# -# Reference: http://www.gentoo.org/doc/en/gentoo-upgrading.xml -# See: "General instructions" in Section 3. "Profile updating instructions" diff --git a/profiles/hardened/linux/amd64/2008.0/server/parent b/profiles/hardened/linux/amd64/2008.0/server/parent deleted file mode 100644 index c3990165..00000000 --- a/profiles/hardened/linux/amd64/2008.0/server/parent +++ /dev/null @@ -1,2 +0,0 @@ -.. -../../../../../targets/server diff --git a/profiles/hardened/linux/amd64/make.defaults b/profiles/hardened/linux/amd64/make.defaults index 51e59c6c..b61284a3 100644 --- a/profiles/hardened/linux/amd64/make.defaults +++ b/profiles/hardened/linux/amd64/make.defaults @@ -2,7 +2,10 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/make.defaults,v 1.2 2009/07/09 00:47:47 gengor Exp $ -USE="justify" +USE="justify -unicode" CFLAGS="-O2 -pipe" CXXFLAGS="${CFLAGS}" + +# STAGE1_USE does not stack +STAGE1_USE="hardened multilib nptl nptlonly pic" diff --git a/profiles/hardened/linux/amd64/parent b/profiles/hardened/linux/amd64/parent index 158dd88c..376245ae 100644 --- a/profiles/hardened/linux/amd64/parent +++ b/profiles/hardened/linux/amd64/parent @@ -1,3 +1,4 @@ ../../../base .. ../../../arch/amd64 +../../../releases/10.0 diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 833acbd7..a1d5245c 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -242,8 +242,8 @@ sparc-fbsd default/bsd/fbsd/sparc/7.2 dev x86-fbsd default/bsd/fbsd/x86/7.2 dev # Hardened Profiles -amd64 hardened/linux/amd64/10.0 stable -amd64 hardened/linux/amd64/10.0/no-multilib dev +amd64 hardened/linux/amd64 stable +amd64 hardened/linux/amd64/no-multilib dev ia64 hardened/linux/ia64/10.0 dev ppc hardened/linux/powerpc/ppc32/10.0 dev ppc hardened/linux/powerpc/ppc64/10.0/32bit-userland dev |