From 55d37c6b50d3fda758cd825fe5c6fc0932fcedaf Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Mon, 27 Oct 2008 22:17:28 +0100 Subject: [PATCH] Remove / Deactivate oldstable Signed-off-by: Joerg Jaspert --- ChangeLog | 15 ++++++++++- config/debian/apt.conf | 24 ----------------- config/debian/apt.conf.oldstable | 45 -------------------------------- config/debian/dak.conf | 7 ++--- config/debian/vars | 2 +- scripts/debian/mkfilesindices | 5 +--- 6 files changed, 20 insertions(+), 78 deletions(-) delete mode 100644 config/debian/apt.conf.oldstable diff --git a/ChangeLog b/ChangeLog index e57705e2..468f6047 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-10-27 Joerg Jaspert + + * scripts/debian/mkfilesindices: Remove oldstable + + * config/debian/vars: Remove sarge + + * config/debian/dak.conf: Untouchable o-p-u, until we removed all + of sarge and its files. + + * config/debian/apt.conf.oldstable: Removed + + * config/debian/apt.conf: Remove oldstable + 2008-10-14 Thomas Viehmann * dak/show_deferred.py: produce .changes and improve status @@ -11,7 +24,7 @@ * daklib/database.py: added get_suites * dak/dak.py, dak/show_deferred.py: add show-deferred to dak. - + 2008-09-23 Joerg Jaspert * config/debian/dak.conf: Add the validtime fields, set to 7 diff --git a/config/debian/apt.conf b/config/debian/apt.conf index 408e7dce..25486b8b 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -20,18 +20,6 @@ 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 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; - BinOverride "override.sarge.$(SECTION)"; - ExtraOverride "override.sarge.extra.$(SECTION)"; - SrcOverride "override.sarge.$(SECTION).src"; - Contents " "; -}; - tree "dists/proposed-updates" { FileList "/srv/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list"; @@ -81,18 +69,6 @@ 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 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; - BinOverride "override.sarge.main.$(SECTION)"; - SrcOverride "override.sarge.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - Contents " "; -}; - tree "dists/proposed-updates/main" { FileList "/srv/ftp.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; diff --git a/config/debian/apt.conf.oldstable b/config/debian/apt.conf.oldstable deleted file mode 100644 index d827a66c..00000000 --- a/config/debian/apt.conf.oldstable +++ /dev/null @@ -1,45 +0,0 @@ -Dir -{ - ArchiveDir "/srv/ftp.debian.org/ftp/"; - OverrideDir "/srv/ftp.debian.org/scripts/override/"; - CacheDir "/srv/ftp.debian.org/database/"; -}; - -Default -{ - Packages::Compress ". gzip"; - Sources::Compress "gzip"; - Contents::Compress "gzip"; - DeLinkLimit 0; - FileMode 0664; -} - -TreeDefault -{ - Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top"; -}; - -tree "dists/oldstable" -{ - FileList "/srv/ftp.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp.debian.org/database/dists/oldstable_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; - BinOverride "override.sarge.$(SECTION)"; - ExtraOverride "override.sarge.extra.$(SECTION)"; - SrcOverride "override.sarge.$(SECTION).src"; -}; - -// debian-installer - -tree "dists/oldstable/main" -{ - FileList "/srv/ftp.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; - BinOverride "override.sarge.main.$(SECTION)"; - SrcOverride "override.sarge.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - Contents " "; -}; diff --git a/config/debian/dak.conf b/config/debian/dak.conf index b8e1a481..fc251f8b 100644 --- a/config/debian/dak.conf +++ b/config/debian/dak.conf @@ -307,6 +307,7 @@ Suite CodeName "sarge-proposed-updates"; OverrideCodeName "sarge"; OverrideSuite "oldstable"; + Untouchable "1"; Priority "2"; VersionChecks { @@ -665,11 +666,11 @@ 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 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"; diff --git a/config/debian/vars b/config/debian/vars index ef4b670c..69cef765 100644 --- a/config/debian/vars +++ b/config/debian/vars @@ -24,7 +24,7 @@ incoming=$base/incoming ftpgroup=debadmin -copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-free etch.non-free.src etch.extra.main etch.extra.non-free etch.extra.contrib etch.main.debian-installer sarge.contrib sarge.contrib.src sarge.main sarge.main.src sarge.non-free sarge.non-free.src sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free sarge.extra.contrib sarge.extra.main sarge.extra.non-free lenny.contrib lenny.contrib.src lenny.main lenny.main.src lenny.non-free lenny.non-free.src lenny.extra.main lenny.extra.contrib lenny.extra.non-free" +copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-free etch.non-free.src etch.extra.main etch.extra.non-free etch.extra.contrib etch.main.debian-installer sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free lenny.contrib lenny.contrib.src lenny.main lenny.main.src lenny.non-free lenny.non-free.src lenny.extra.main lenny.extra.contrib lenny.extra.non-free" PATH=$masterdir:$PATH umask 022 diff --git a/scripts/debian/mkfilesindices b/scripts/debian/mkfilesindices index f7a14a00..8457e811 100755 --- a/scripts/debian/mkfilesindices +++ b/scripts/debian/mkfilesindices @@ -38,9 +38,6 @@ for a in $ARCHES; do cd $base/ftp find ./dists -maxdepth 1 \! -type d find ./dists \! -type d | grep -E "(proposed-updates.*_$a.changes$|/main/disks-$a/|/main/installer-$a/|/Contents-$a|/binary-$a/)" - if echo X sparc mips mipsel hppa X | grep -q " $a "; then - find ./dists/sarge/main/upgrade-kernel \! -type d - fi ) | sort -u | gzip -9 > arch-$a.list.gz done @@ -83,7 +80,7 @@ for a in $ARCHES; do sort -u | poolfirst > ../arch-$a.files done -(cat ../arch-i386.files ../arch-amd64.files; zcat suite-oldstable.list.gz suite-proposed-updates.list.gz) | +(cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz) | sort -u | poolfirst > ../typical.files rm -f $ARCHLIST -- 2.39.2