From e8375579ca7db67ed3ec35055db53cab34b27875 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Mon, 11 May 2009 10:38:37 +0000 Subject: [PATCH] Remove separate -hardened files svn path=/trunk/; revision=645 --- tools/ChangeLog | 4 ++++ tools/catalyst-auto-amd64-hardened.conf | 26 ------------------------- tools/catalyst-auto-x86-hardened.conf | 25 ------------------------ 3 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 tools/catalyst-auto-amd64-hardened.conf delete mode 100644 tools/catalyst-auto-x86-hardened.conf diff --git a/tools/ChangeLog b/tools/ChangeLog index 2e67fb9d..9781b8e9 100644 --- a/tools/ChangeLog +++ b/tools/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Id$ + 11 May 2009; Andrew Gaffney + -catalyst-auto-amd64-hardened.conf, -catalyst-auto-x86-hardened.conf: + Remove separate -hardened files + 11 May 2009; Andrew Gaffney catalyst-auto-amd64.conf: move amd64 hardened builds into normal amd64 build diff --git a/tools/catalyst-auto-amd64-hardened.conf b/tools/catalyst-auto-amd64-hardened.conf deleted file mode 100644 index 3ddbcb62..00000000 --- a/tools/catalyst-auto-amd64-hardened.conf +++ /dev/null @@ -1,26 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/amd64/hardened - -SPECS="stage1.spec stage2.spec stage3.spec stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" - -OPTIONAL_SPECS="" - -KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/amd64 - -EMAIL_TO=releng@gentoo.org -EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org -EMAIL_SUBJECT_PREPEND="[amd64-hardened-auto]" - -CATALYST_CONFIG=/etc/catalyst/amd64-auto.conf - -pre_build() { - svn up /release/svn-releng/ -} - -post_build() { - cd /release/buildroot/amd64-dev/builds/hardened - mv stage3-*${DATESTAMP}*bz2* /home/buildsync/builds/amd64/hardened/ -} - diff --git a/tools/catalyst-auto-x86-hardened.conf b/tools/catalyst-auto-x86-hardened.conf deleted file mode 100644 index 5b831e57..00000000 --- a/tools/catalyst-auto-x86-hardened.conf +++ /dev/null @@ -1,25 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -SPECS_DIR=/release/svn-releng/trunk/releases/weekly/specs/x86/hardened - -SPECS="stage1.spec stage2.spec stage3.spec" - -OPTIONAL_SPECS="" - -KCONFIG_DIR=/release/svn-releng/trunk/releases/weekly/kconfig/x86 - -EMAIL_TO=releng@gentoo.org -EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org -EMAIL_SUBJECT_PREPEND="[x86-hardened-auto]" - -CATALYST_CONFIG=/etc/catalyst/x86-auto.conf - -pre_build() { - svn up /release/svn-releng/ -} - -post_build() { - cd /release/buildroot/x86-dev/builds/hardened - mv stage3-i686-*${DATESTAMP}*.bz2* /home/buildsync/builds/x86/hardened/ -}