* [gentoo-commits] proj/releng:master commit in: tools-uclibc/portage.i686.hardened/savedconfig/sys-apps/, tools-uclibc/, ...
@ 2012-10-27 0:56 Anthony G. Basile
0 siblings, 0 replies; only message in thread
From: Anthony G. Basile @ 2012-10-27 0:56 UTC (permalink / raw
To: gentoo-commits
commit: 42b3272b688933dcc6068feffb9fc29d88dd6170
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 27 00:55:24 2012 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat Oct 27 00:55:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=42b3272b
tools-uclibc: correct portage_confdir for i686 and vanilla
---
.../package.accept_keywords | 0
.../package.use | 0
.../savedconfig/sys-apps/busybox-1.20.2 | 0
.../savedconfig/sys-libs/uclibc-0.9.33.2-r2 | 0
.../package.accept_keywords | 0
.../{portage => portage.amd64.vanilla}/package.use | 0
.../portage.amd64.vanilla/profile/use.mask | 1 +
.../savedconfig/sys-apps/busybox-1.20.2 | 0
.../savedconfig/sys-libs/uclibc-0.9.33.2-r2 | 0
.../package.accept_keywords | 0
.../{portage => portage.i686.hardened}/package.use | 0
.../savedconfig/sys-apps/busybox-1.20.2 | 0
.../savedconfig/sys-libs/uclibc-0.9.33.2-r2 | 30 ++++++++++++++++----
.../package.accept_keywords | 0
.../{portage => portage.i686.vanilla}/package.use | 0
tools-uclibc/portage.i686.vanilla/profile/use.mask | 1 +
.../savedconfig/sys-apps/busybox-1.20.2 | 0
.../savedconfig/sys-libs/uclibc-0.9.33.2-r2 | 30 ++++++++++++++++----
.../stage1-amd64-uclibc-hardened.conf.template | 2 +-
.../stage1-amd64-uclibc-vanilla.conf.template | 2 +-
.../stage1-i686-uclibc-hardened.conf.template | 2 +-
.../stage1-i686-uclibc-vanilla.conf.template | 2 +-
.../stage2-amd64-uclibc-hardened.conf.template | 2 +-
.../stage2-amd64-uclibc-vanilla.conf.template | 2 +-
.../stage2-i686-uclibc-hardened.conf.template | 2 +-
.../stage2-i686-uclibc-vanilla.conf.template | 2 +-
.../stage3-amd64-uclibc-hardened.conf.template | 2 +-
.../stage3-amd64-uclibc-vanilla.conf.template | 2 +-
.../stage3-i686-uclibc-hardened.conf.template | 2 +-
.../stage3-i686-uclibc-vanilla.conf.template | 2 +-
30 files changed, 62 insertions(+), 24 deletions(-)
diff --git a/tools-uclibc/portage/package.accept_keywords b/tools-uclibc/portage.amd64.hardened/package.accept_keywords
similarity index 100%
copy from tools-uclibc/portage/package.accept_keywords
copy to tools-uclibc/portage.amd64.hardened/package.accept_keywords
diff --git a/tools-uclibc/portage/package.use b/tools-uclibc/portage.amd64.hardened/package.use
similarity index 100%
copy from tools-uclibc/portage/package.use
copy to tools-uclibc/portage.amd64.hardened/package.use
diff --git a/tools-uclibc/portage/savedconfig/sys-apps/busybox-1.20.2 b/tools-uclibc/portage.amd64.hardened/savedconfig/sys-apps/busybox-1.20.2
similarity index 100%
copy from tools-uclibc/portage/savedconfig/sys-apps/busybox-1.20.2
copy to tools-uclibc/portage.amd64.hardened/savedconfig/sys-apps/busybox-1.20.2
diff --git a/tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2 b/tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r2
similarity index 100%
copy from tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2
copy to tools-uclibc/portage.amd64.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r2
diff --git a/tools-uclibc/portage/package.accept_keywords b/tools-uclibc/portage.amd64.vanilla/package.accept_keywords
similarity index 100%
copy from tools-uclibc/portage/package.accept_keywords
copy to tools-uclibc/portage.amd64.vanilla/package.accept_keywords
diff --git a/tools-uclibc/portage/package.use b/tools-uclibc/portage.amd64.vanilla/package.use
similarity index 100%
copy from tools-uclibc/portage/package.use
copy to tools-uclibc/portage.amd64.vanilla/package.use
diff --git a/tools-uclibc/portage.amd64.vanilla/profile/use.mask b/tools-uclibc/portage.amd64.vanilla/profile/use.mask
new file mode 100644
index 0000000..cf56f2f
--- /dev/null
+++ b/tools-uclibc/portage.amd64.vanilla/profile/use.mask
@@ -0,0 +1 @@
+hardened
diff --git a/tools-uclibc/portage/savedconfig/sys-apps/busybox-1.20.2 b/tools-uclibc/portage.amd64.vanilla/savedconfig/sys-apps/busybox-1.20.2
similarity index 100%
copy from tools-uclibc/portage/savedconfig/sys-apps/busybox-1.20.2
copy to tools-uclibc/portage.amd64.vanilla/savedconfig/sys-apps/busybox-1.20.2
diff --git a/tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2 b/tools-uclibc/portage.amd64.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r2
similarity index 100%
copy from tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2
copy to tools-uclibc/portage.amd64.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r2
diff --git a/tools-uclibc/portage/package.accept_keywords b/tools-uclibc/portage.i686.hardened/package.accept_keywords
similarity index 100%
copy from tools-uclibc/portage/package.accept_keywords
copy to tools-uclibc/portage.i686.hardened/package.accept_keywords
diff --git a/tools-uclibc/portage/package.use b/tools-uclibc/portage.i686.hardened/package.use
similarity index 100%
copy from tools-uclibc/portage/package.use
copy to tools-uclibc/portage.i686.hardened/package.use
diff --git a/tools-uclibc/portage/savedconfig/sys-apps/busybox-1.20.2 b/tools-uclibc/portage.i686.hardened/savedconfig/sys-apps/busybox-1.20.2
similarity index 100%
copy from tools-uclibc/portage/savedconfig/sys-apps/busybox-1.20.2
copy to tools-uclibc/portage.i686.hardened/savedconfig/sys-apps/busybox-1.20.2
diff --git a/tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2 b/tools-uclibc/portage.i686.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r2
similarity index 90%
copy from tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2
copy to tools-uclibc/portage.i686.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r2
index def249d..944a43e 100644
--- a/tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2
+++ b/tools-uclibc/portage.i686.hardened/savedconfig/sys-libs/uclibc-0.9.33.2-r2
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Tue Oct 16 14:29:56 2012
+# Version: 0.9.33
+# Sun Jun 10 08:56:18 2012
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -13,7 +13,7 @@
# TARGET_frv is not set
# TARGET_h8300 is not set
# TARGET_hppa is not set
-# TARGET_i386 is not set
+TARGET_i386=y
# TARGET_i960 is not set
# TARGET_ia64 is not set
# TARGET_m68k is not set
@@ -27,15 +27,32 @@
# TARGET_sparc is not set
# TARGET_v850 is not set
# TARGET_vax is not set
-TARGET_x86_64=y
+# TARGET_x86_64 is not set
# TARGET_xtensa is not set
#
# Target Architecture Features and Options
#
-TARGET_ARCH="x86_64"
+TARGET_ARCH="i386"
FORCE_OPTIONS_FOR_ARCH=y
-TARGET_SUBARCH=""
+# CONFIG_GENERIC_386 is not set
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+CONFIG_686=y
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH="i686"
#
# Using ELF file format
@@ -224,6 +241,7 @@ HARDWIRED_ABSPATH=y
#
# Security options
#
+UCLIBC_BUILD_PIE=y
UCLIBC_HAS_ARC4RANDOM=y
UCLIBC_HAS_SSP=y
# UCLIBC_HAS_SSP_COMPAT is not set
diff --git a/tools-uclibc/portage/package.accept_keywords b/tools-uclibc/portage.i686.vanilla/package.accept_keywords
similarity index 100%
rename from tools-uclibc/portage/package.accept_keywords
rename to tools-uclibc/portage.i686.vanilla/package.accept_keywords
diff --git a/tools-uclibc/portage/package.use b/tools-uclibc/portage.i686.vanilla/package.use
similarity index 100%
rename from tools-uclibc/portage/package.use
rename to tools-uclibc/portage.i686.vanilla/package.use
diff --git a/tools-uclibc/portage.i686.vanilla/profile/use.mask b/tools-uclibc/portage.i686.vanilla/profile/use.mask
new file mode 100644
index 0000000..cf56f2f
--- /dev/null
+++ b/tools-uclibc/portage.i686.vanilla/profile/use.mask
@@ -0,0 +1 @@
+hardened
diff --git a/tools-uclibc/portage/savedconfig/sys-apps/busybox-1.20.2 b/tools-uclibc/portage.i686.vanilla/savedconfig/sys-apps/busybox-1.20.2
similarity index 100%
rename from tools-uclibc/portage/savedconfig/sys-apps/busybox-1.20.2
rename to tools-uclibc/portage.i686.vanilla/savedconfig/sys-apps/busybox-1.20.2
diff --git a/tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2 b/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r2
similarity index 90%
rename from tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2
rename to tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r2
index def249d..944a43e 100644
--- a/tools-uclibc/portage/savedconfig/sys-libs/uclibc-0.9.33.2-r2
+++ b/tools-uclibc/portage.i686.vanilla/savedconfig/sys-libs/uclibc-0.9.33.2-r2
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Version: 0.9.33.2
-# Tue Oct 16 14:29:56 2012
+# Version: 0.9.33
+# Sun Jun 10 08:56:18 2012
#
# TARGET_alpha is not set
# TARGET_arm is not set
@@ -13,7 +13,7 @@
# TARGET_frv is not set
# TARGET_h8300 is not set
# TARGET_hppa is not set
-# TARGET_i386 is not set
+TARGET_i386=y
# TARGET_i960 is not set
# TARGET_ia64 is not set
# TARGET_m68k is not set
@@ -27,15 +27,32 @@
# TARGET_sparc is not set
# TARGET_v850 is not set
# TARGET_vax is not set
-TARGET_x86_64=y
+# TARGET_x86_64 is not set
# TARGET_xtensa is not set
#
# Target Architecture Features and Options
#
-TARGET_ARCH="x86_64"
+TARGET_ARCH="i386"
FORCE_OPTIONS_FOR_ARCH=y
-TARGET_SUBARCH=""
+# CONFIG_GENERIC_386 is not set
+# CONFIG_386 is not set
+# CONFIG_486 is not set
+# CONFIG_586 is not set
+# CONFIG_586MMX is not set
+CONFIG_686=y
+# CONFIG_PENTIUMII is not set
+# CONFIG_PENTIUMIII is not set
+# CONFIG_PENTIUM4 is not set
+# CONFIG_K6 is not set
+# CONFIG_K7 is not set
+# CONFIG_ELAN is not set
+# CONFIG_CRUSOE is not set
+# CONFIG_WINCHIPC6 is not set
+# CONFIG_WINCHIP2 is not set
+# CONFIG_CYRIXIII is not set
+# CONFIG_NEHEMIAH is not set
+TARGET_SUBARCH="i686"
#
# Using ELF file format
@@ -224,6 +241,7 @@ HARDWIRED_ABSPATH=y
#
# Security options
#
+UCLIBC_BUILD_PIE=y
UCLIBC_HAS_ARC4RANDOM=y
UCLIBC_HAS_SSP=y
# UCLIBC_HAS_SSP_COMPAT is not set
diff --git a/tools-uclibc/stage1-amd64-uclibc-hardened.conf.template b/tools-uclibc/stage1-amd64-uclibc-hardened.conf.template
index ab8ca6a..a3c2def 100644
--- a/tools-uclibc/stage1-amd64-uclibc-hardened.conf.template
+++ b/tools-uclibc/stage1-amd64-uclibc-hardened.conf.template
@@ -6,4 +6,4 @@ profile: hardened/linux/uclibc/amd64
snapshot: current
source_subpath: hardened/amd64/stage3-amd64-uclibc-hardened
chost: x86_64-gentoo-linux-uclibc
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.amd64.hardened
diff --git a/tools-uclibc/stage1-amd64-uclibc-vanilla.conf.template b/tools-uclibc/stage1-amd64-uclibc-vanilla.conf.template
index da05161..cafd823 100644
--- a/tools-uclibc/stage1-amd64-uclibc-vanilla.conf.template
+++ b/tools-uclibc/stage1-amd64-uclibc-vanilla.conf.template
@@ -6,4 +6,4 @@ profile: hardened/linux/uclibc/amd64
snapshot: current
source_subpath: vanilla/amd64/stage3-amd64-uclibc-vanilla
chost: x86_64-gentoo-linux-uclibc
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.amd64.vanilla
diff --git a/tools-uclibc/stage1-i686-uclibc-hardened.conf.template b/tools-uclibc/stage1-i686-uclibc-hardened.conf.template
index e620e0a..9752148 100644
--- a/tools-uclibc/stage1-i686-uclibc-hardened.conf.template
+++ b/tools-uclibc/stage1-i686-uclibc-hardened.conf.template
@@ -6,4 +6,4 @@ profile: hardened/linux/uclibc/x86
snapshot: current
source_subpath: hardened/i686/stage3-i686-uclibc-hardened
chost: i686-gentoo-linux-uclibc
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.i686.hardened
diff --git a/tools-uclibc/stage1-i686-uclibc-vanilla.conf.template b/tools-uclibc/stage1-i686-uclibc-vanilla.conf.template
index 97ddd12..645daed 100644
--- a/tools-uclibc/stage1-i686-uclibc-vanilla.conf.template
+++ b/tools-uclibc/stage1-i686-uclibc-vanilla.conf.template
@@ -6,4 +6,4 @@ profile: vanilla/linux/uclibc/x86
snapshot: current
source_subpath: vanilla/i686/stage3-i686-uclibc-vanilla
chost: i686-gentoo-linux-uclibc
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.i686.vanilla
diff --git a/tools-uclibc/stage2-amd64-uclibc-hardened.conf.template b/tools-uclibc/stage2-amd64-uclibc-hardened.conf.template
index 51e95c9..5ba6182 100644
--- a/tools-uclibc/stage2-amd64-uclibc-hardened.conf.template
+++ b/tools-uclibc/stage2-amd64-uclibc-hardened.conf.template
@@ -6,4 +6,4 @@ profile: hardened/linux/uclibc/amd64
snapshot: current
source_subpath: hardened/amd64/stage1-amd64-uclibc-hardened
chost: x86_64-gentoo-linux-uclibc
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.amd64.hardened
diff --git a/tools-uclibc/stage2-amd64-uclibc-vanilla.conf.template b/tools-uclibc/stage2-amd64-uclibc-vanilla.conf.template
index 2277dab..955a31b 100644
--- a/tools-uclibc/stage2-amd64-uclibc-vanilla.conf.template
+++ b/tools-uclibc/stage2-amd64-uclibc-vanilla.conf.template
@@ -6,4 +6,4 @@ profile: hardened/linux/uclibc/amd64
snapshot: current
source_subpath: vanilla/amd64/stage1-amd64-uclibc-vanilla
chost: x86_64-gentoo-linux-uclibc
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.amd64.vanilla
diff --git a/tools-uclibc/stage2-i686-uclibc-hardened.conf.template b/tools-uclibc/stage2-i686-uclibc-hardened.conf.template
index c2687d8..93f48b4 100644
--- a/tools-uclibc/stage2-i686-uclibc-hardened.conf.template
+++ b/tools-uclibc/stage2-i686-uclibc-hardened.conf.template
@@ -6,4 +6,4 @@ profile: hardened/linux/uclibc/x86
snapshot: current
source_subpath: hardened/i686/stage1-i686-uclibc-hardened
chost: i686-gentoo-linux-uclibc
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.i686.hardened
diff --git a/tools-uclibc/stage2-i686-uclibc-vanilla.conf.template b/tools-uclibc/stage2-i686-uclibc-vanilla.conf.template
index 4d01d6a..1a230fb 100644
--- a/tools-uclibc/stage2-i686-uclibc-vanilla.conf.template
+++ b/tools-uclibc/stage2-i686-uclibc-vanilla.conf.template
@@ -6,4 +6,4 @@ profile: vanilla/linux/uclibc/x86
snapshot: current
source_subpath: vanilla/i686/stage1-i686-uclibc-vanilla
chost: i686-gentoo-linux-uclibc
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.i686.vanilla
diff --git a/tools-uclibc/stage3-amd64-uclibc-hardened.conf.template b/tools-uclibc/stage3-amd64-uclibc-hardened.conf.template
index 0ceda9f..256e5e5 100644
--- a/tools-uclibc/stage3-amd64-uclibc-hardened.conf.template
+++ b/tools-uclibc/stage3-amd64-uclibc-hardened.conf.template
@@ -5,4 +5,4 @@ rel_type: hardened/amd64
profile: hardened/linux/uclibc/amd64
snapshot: current
source_subpath: hardened/amd64/stage2-amd64-uclibc-hardened
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.amd64.hardened
diff --git a/tools-uclibc/stage3-amd64-uclibc-vanilla.conf.template b/tools-uclibc/stage3-amd64-uclibc-vanilla.conf.template
index 0f9eeab..d1d2339 100644
--- a/tools-uclibc/stage3-amd64-uclibc-vanilla.conf.template
+++ b/tools-uclibc/stage3-amd64-uclibc-vanilla.conf.template
@@ -5,4 +5,4 @@ rel_type: vanilla/amd64
profile: hardened/linux/uclibc/amd64
snapshot: current
source_subpath: vanilla/amd64/stage2-amd64-uclibc-vanilla
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.amd64.vanilla
diff --git a/tools-uclibc/stage3-i686-uclibc-hardened.conf.template b/tools-uclibc/stage3-i686-uclibc-hardened.conf.template
index 0b08c1d..6f559c1 100644
--- a/tools-uclibc/stage3-i686-uclibc-hardened.conf.template
+++ b/tools-uclibc/stage3-i686-uclibc-hardened.conf.template
@@ -5,4 +5,4 @@ rel_type: hardened/i686
profile: hardened/linux/uclibc/x86
snapshot: current
source_subpath: hardened/i686/stage2-i686-uclibc-hardened
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.i686.hardened
diff --git a/tools-uclibc/stage3-i686-uclibc-vanilla.conf.template b/tools-uclibc/stage3-i686-uclibc-vanilla.conf.template
index 726d173..b89cf74 100644
--- a/tools-uclibc/stage3-i686-uclibc-vanilla.conf.template
+++ b/tools-uclibc/stage3-i686-uclibc-vanilla.conf.template
@@ -5,4 +5,4 @@ rel_type: vanilla/i686
profile: vanilla/linux/uclibc/x86
snapshot: current
source_subpath: vanilla/i686/stage2-i686-uclibc-vanilla
-portage_confdir: /root/MyCatalyst/portage
+portage_confdir: /root/MyCatalyst/portage.i686.vanilla
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2012-10-27 0:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-27 0:56 [gentoo-commits] proj/releng:master commit in: tools-uclibc/portage.i686.hardened/savedconfig/sys-apps/, tools-uclibc/, Anthony G. Basile
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox