commit:     d70057496ea43cadab0426afa7918a5408ef1854
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  1 03:57:41 2021 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  1 03:58:03 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7005749

config/old: Remove

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 config/README                     | 2 --
 config/old/active-release         | 1 -
 config/old/amd64-default.conf     | 9 ---------
 config/old/amd64-default.env      | 3 ---
 config/old/amd64-dev.conf         | 9 ---------
 config/old/amd64-hardened.conf    | 9 ---------
 config/old/amd64-hardened.env     | 7 -------
 config/old/amd64-uclibc.conf      | 9 ---------
 config/old/amd64-uclibc.env       | 1 -
 config/old/snapshot-official.conf | 7 -------
 config/old/x86-default.conf       | 9 ---------
 config/old/x86-default.env        | 4 ----
 config/old/x86-dev.conf           | 9 ---------
 config/old/x86-hardened.conf      | 9 ---------
 config/old/x86-hardened.env       | 5 -----
 config/old/x86-uclibc.conf        | 9 ---------
 config/old/x86-uclibc.env         | 4 ----
 17 files changed, 106 deletions(-)

diff --git a/config/README b/config/README
index 93cbf3dc..22badd08 100644
--- a/config/README
+++ b/config/README
@@ -2,8 +2,6 @@ This directory houses the config files for catalyst to be used 
by releng
 build boxes. To use these config files, add a symlink in a build box from
 /etc/catalyst/release to this dir.
 
-Old config files that serve as examples are stores in the old subdir.
-
 Changes to these files should be discussed with the members responsible
 for individual build boxes / arches or with the RelEng team.
 

diff --git a/config/old/active-release b/config/old/active-release
deleted file mode 100644
index 4a70890b..00000000
--- a/config/old/active-release
+++ /dev/null
@@ -1 +0,0 @@
-2008.0

diff --git a/config/old/amd64-default.conf b/config/old/amd64-default.conf
deleted file mode 100644
index 92647308..00000000
--- a/config/old/amd64-default.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/amd64-default"
-envscript="/etc/catalyst/amd64-default.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/amd64-default.env b/config/old/amd64-default.env
deleted file mode 100644
index d130ae5a..00000000
--- a/config/old/amd64-default.env
+++ /dev/null
@@ -1,3 +0,0 @@
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/";
-export INPUT_DEVICES="evdev keyboard mouse vmmouse"
-export MAKEOPTS="-j4"

diff --git a/config/old/amd64-dev.conf b/config/old/amd64-dev.conf
deleted file mode 100644
index d15a803f..00000000
--- a/config/old/amd64-dev.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/amd64-dev"
-envscript="/etc/catalyst/amd64-dev.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/amd64-hardened.conf b/config/old/amd64-hardened.conf
deleted file mode 100644
index 20c39a0b..00000000
--- a/config/old/amd64-hardened.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/amd64-hardened"
-envscript="/etc/catalyst/amd64-hardened.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/amd64-hardened.env b/config/old/amd64-hardened.env
deleted file mode 100644
index fe933ce0..00000000
--- a/config/old/amd64-hardened.env
+++ /dev/null
@@ -1,7 +0,0 @@
-export CFLAGS="-O2 -pipe"
-export CXXFLAGS="${CFLAGS}"
-export CHOS="x86_64-pc-linux-gnu" 
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/";
-export MAKEOPTS="-j3"
-# Jorge Vicetto - testing for hardened builds
-#export MAKEOPTS="-j6"

diff --git a/config/old/amd64-uclibc.conf b/config/old/amd64-uclibc.conf
deleted file mode 100644
index eb46f361..00000000
--- a/config/old/amd64-uclibc.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/amd64-uclibc"
-envscript="/etc/catalyst/amd64-uclibc.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/amd64-uclibc.env b/config/old/amd64-uclibc.env
deleted file mode 100644
index a1c428c6..00000000
--- a/config/old/amd64-uclibc.env
+++ /dev/null
@@ -1 +0,0 @@
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/";

diff --git a/config/old/snapshot-official.conf 
b/config/old/snapshot-official.conf
deleted file mode 100644
index 8db59586..00000000
--- a/config/old/snapshot-official.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-distdir="/usr/portage/distfiles"
-#portdir="/release/snapshot-tree/2008.0/portage"
-sharedir="/usr/lib/catalyst"
-storedir="/release"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/x86-default.conf b/config/old/x86-default.conf
deleted file mode 100644
index daee9e92..00000000
--- a/config/old/x86-default.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/x86-default"
-envscript="/etc/catalyst/x86-default.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/x86-default.env b/config/old/x86-default.env
deleted file mode 100644
index 5966120f..00000000
--- a/config/old/x86-default.env
+++ /dev/null
@@ -1,4 +0,0 @@
-export CFLAGS="-Os -mcpu=i686 -pipe -fomit-frame-pointer"
-export CXXFLAGS="${CFLAGS}"
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/";
-export MAKEOPTS="-j16"

diff --git a/config/old/x86-dev.conf b/config/old/x86-dev.conf
deleted file mode 100644
index 0186c0d0..00000000
--- a/config/old/x86-dev.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/x86-dev"
-envscript="/etc/catalyst/x86-dev.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/x86-hardened.conf b/config/old/x86-hardened.conf
deleted file mode 100644
index c7582f29..00000000
--- a/config/old/x86-hardened.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/x86-hardened"
-envscript="/etc/catalyst/x86-hardened.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/x86-hardened.env b/config/old/x86-hardened.env
deleted file mode 100644
index 6f2e505c..00000000
--- a/config/old/x86-hardened.env
+++ /dev/null
@@ -1,5 +0,0 @@
-export CFLAGS="-O2 -pipe"
-export CXXFLAGS="${CFLAGS}"
-export CHOST="i386-pc-linux-gnu"
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/";
-export MAKEOPTS="-j6" 

diff --git a/config/old/x86-uclibc.conf b/config/old/x86-uclibc.conf
deleted file mode 100644
index 1fe6a8d7..00000000
--- a/config/old/x86-uclibc.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-distdir="/usr/portage/distfiles"
-portdir="/release/portage"
-options="ccache pkgcache autoresume snapcache seedcache kerncache"
-sharedir="/usr/lib/catalyst/"
-storedir="/release/buildroot/x86-uclibc"
-envscript="/etc/catalyst/x86-uclibc.env"
-hash_function="crc32"
-digests="md5 sha1"
-contents="auto"

diff --git a/config/old/x86-uclibc.env b/config/old/x86-uclibc.env
deleted file mode 100644
index 0e1b92c0..00000000
--- a/config/old/x86-uclibc.env
+++ /dev/null
@@ -1,4 +0,0 @@
-export CFLAGS="-Os -pipe -fomit-frame-pointer"
-export CHOST="i386-pc-linux-uclibc"
-export CXXFLAGS="${CFLAGS}"
-export GENTOO_MIRRORS="http://gentoo.osuosl.org/";

Reply via email to