[dak/master 2/2] Kill etch
Signed-off-by: Mark Hymers <mhy@debian.org>
---
config/debian/apt.conf | 44 +++++++++---------
config/debian/cron.dinstall | 14 +++---
config/debian/dak.conf | 98 ++------------------------------------
config/debian/dinstall.functions | 2 +-
dak/control_suite.py | 2 +-
5 files changed, 35 insertions(+), 125 deletions(-)
diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 4c01d30..257470e 100644
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -20,17 +20,17 @@ TreeDefault
Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top";
};
-tree "dists/oldstable-proposed-updates"
-{
- FileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
- SourceFileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_source.list";
- Sections "main contrib non-free";
- Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
- BinOverride "override.etch.$(SECTION)";
- ExtraOverride "override.etch.extra.$(SECTION)";
- SrcOverride "override.etch.$(SECTION).src";
- Contents " ";
-};
+//tree "dists/oldstable-proposed-updates"
+//{
+// FileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+// SourceFileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_source.list";
+// Sections "main contrib non-free";
+// Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+// BinOverride "override.etch.$(SECTION)";
+// ExtraOverride "override.etch.extra.$(SECTION)";
+// SrcOverride "override.etch.$(SECTION).src";
+// Contents " ";
+//};
tree "dists/proposed-updates"
{
@@ -81,17 +81,17 @@ tree "dists/unstable"
// debian-installer
-tree "dists/oldstable-proposed-updates/main"
-{
- FileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
- Sections "debian-installer";
- Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
- BinOverride "override.etch.main.$(SECTION)";
- SrcOverride "override.etch.main.src";
- BinCacheDB "packages-debian-installer-$(ARCH).db";
- Packages::Extensions ".udeb";
- Contents " ";
-};
+//tree "dists/oldstable-proposed-updates/main"
+//{
+// FileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
+// Sections "debian-installer";
+// Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
+// BinOverride "override.etch.main.$(SECTION)";
+// SrcOverride "override.etch.main.src";
+// BinCacheDB "packages-debian-installer-$(ARCH).db";
+// Packages::Extensions ".udeb";
+// Contents " ";
+//};
tree "dists/proposed-updates/main"
{
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 61835f7..856548e 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -214,13 +214,13 @@ GO=(
)
stage $GO
-GO=(
- FUNC="opunew"
- TIME="o-p-u-new"
- ARGS="oldproposedupdates"
- ERR="false"
-)
-stage $GO
+#GO=(
+# FUNC="opunew"
+# TIME="o-p-u-new"
+# ARGS="oldproposedupdates"
+# ERR="false"
+#)
+#stage $GO
GO=(
FUNC="newstage"
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index bb7682b..755e918 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -201,73 +201,6 @@ Check-Overrides
Suite
{
- OldStable
- {
- Components
- {
- main;
- contrib;
- non-free;
- };
- Announce "debian-changes@lists.debian.org";
- // Version "4.0r1";
- Origin "Debian";
- // Description "Debian 4.0r1 Released 15 August 2007";
- CodeName "etch";
- OverrideCodeName "etch";
- Priority "5";
- ChangeLogBase "dists/oldstable/";
- UdebComponents
- {
- main;
- non-free;
- };
- };
-
- Oldstable-Proposed-Updates
- {
- Components
- {
- main;
- contrib;
- non-free;
- };
- Announce "debian-changes@lists.debian.org";
- CopyChanges "dists/oldstable-proposed-updates/";
- CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
- CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/";
- Version "4.0-updates";
- Origin "Debian";
- Description "Debian 4.0 Proposed Updates - Not Released";
- CodeName "etch-proposed-updates";
- OverrideCodeName "etch";
- OverrideSuite "oldstable";
- ValidTime 604800; // 7 days
- Priority "4";
- VersionChecks
- {
- MustBeNewerThan
- {
- OldStable;
- };
- MustBeOlderThan
- {
- Stable;
- Testing;
- Unstable;
- Experimental;
- };
- Enhances
- {
- OldStable;
- };
- };
- UdebComponents
- {
- main;
- };
- };
-
Stable
{
Components
@@ -400,27 +333,6 @@ Suite
};
};
- Etch-m68k
- {
- Components
- {
- main;
- contrib;
- non-free;
- };
- Announce "debian-testing-changes@lists.debian.org";
- Origin "Debian";
- Description "Debian Etch for m68k - Not Released";
- CodeName "etch-m68k";
- OverrideCodeName "etch";
- Priority "5";
- UdebComponents
- {
- main;
- non-free;
- };
- };
-
Unstable
{
Components
@@ -494,27 +406,25 @@ Suite
SuiteMappings
{
- "propup-version oldstable-security stable testing testing-proposed-updates unstable";
+# "propup-version oldstable-security stable testing testing-proposed-updates unstable";
"propup-version stable-security testing testing-proposed-updates unstable";
"propup-version testing-security unstable";
- "map etch oldstable";
"map lenny stable";
"map squeeze testing";
"map sid unstable";
"map rc-buggy experimental";
- "map oldstable oldstable-proposed-updates";
- "map oldstable-security oldstable-proposed-updates";
+# "map oldstable oldstable-proposed-updates";
+# "map oldstable-security oldstable-proposed-updates";
"map stable proposed-updates";
"map stable-security proposed-updates";
"map stable-proposed-updates proposed-updates";
- "map-unreleased oldstable unstable";
+# "map-unreleased oldstable unstable";
"map-unreleased stable unstable";
"map-unreleased proposed-updates unstable";
"map testing testing-proposed-updates";
"map testing-security testing-proposed-updates";
"map-unreleased testing unstable";
"map-unreleased testing-proposed-updates unstable";
- "reject etch-m68k";
};
AutomaticByHandPackages {
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index d3a7dc2..6e5376b 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -387,7 +387,7 @@ function mkfilesindices() {
done
)
- (cat ../arch-i386.files ../arch-amd64.files; zcat suite-oldstable.list.gz suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-squeeze.list.gz) |
+ (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-squeeze.list.gz) |
sort -u | poolfirst > ../typical.files
rm -f $ARCHLIST
diff --git a/dak/control_suite.py b/dak/control_suite.py
index 7a979fa..d8f8227 100755
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -302,7 +302,7 @@ def main ():
# Safety/Sanity check
# XXX: This should be stored in the database
- if action == "set" and suite_name not in ["testing", "etch-m68k"]:
+ if action == "set" and suite_name not in ["testing"]:
utils.fubar("Will not reset suite %s" % (suite_name))
if action == "list":
--
1.6.5
Reply to: