From 5ab6d288aa431940bdc964919750232ab1b294b4 Mon Sep 17 00:00:00 2001 From: James Troup Date: Sun, 7 Sep 2003 13:48:25 +0000 Subject: [PATCH] Remove oldstable. --- apt.conf-security | 11 ------ apt.conf.stable | 10 ----- apt.conf.stable-non-US | 10 ----- cron.buildd-security | 8 +--- cron.daily-security | 6 --- katie.conf | 79 -------------------------------------- katie.conf-non-US | 81 --------------------------------------- katie.conf-security | 32 ---------------- vars-security | 2 +- wanna-build/trigger.daily | 32 +--------------- 10 files changed, 5 insertions(+), 266 deletions(-) diff --git a/apt.conf-security b/apt.conf-security index 2ae920a3..c412f779 100644 --- a/apt.conf-security +++ b/apt.conf-security @@ -13,17 +13,6 @@ Default FileMode 0664; } -tree "dists/oldstable/updates" -{ - FileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/security.debian.org/katie-database/dists/oldstable_updates/$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm i386 m68k powerpc sparc source"; - BinOverride "override.potato.$(SECTION)"; - SrcOverride "override.potato.$(SECTION).src"; - Contents " "; -}; - tree "dists/stable/updates" { FileList "/org/security.debian.org/katie-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list"; diff --git a/apt.conf.stable b/apt.conf.stable index 2ce546cb..319e898d 100644 --- a/apt.conf.stable +++ b/apt.conf.stable @@ -20,16 +20,6 @@ TreeDefault Contents::Header "/org/ftp.debian.org/katie/Contents.top"; }; -tree "dists/oldstable" -{ - FileList "/org/ftp.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/ftp.debian.org/database/dists/oldstable_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm i386 m68k powerpc sparc source"; - BinOverride "override.potato.$(SECTION)"; - SrcOverride "override.potato.$(SECTION).src"; -}; - tree "dists/stable" { FileList "/org/ftp.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list"; diff --git a/apt.conf.stable-non-US b/apt.conf.stable-non-US index 9216e4db..e5c53426 100644 --- a/apt.conf.stable-non-US +++ b/apt.conf.stable-non-US @@ -20,16 +20,6 @@ TreeDefault Contents::Header "/org/non-us.debian.org/katie/Contents.top"; }; -tree "dists/oldstable/non-US" -{ - FileList "/org/non-us.debian.org/database/dists/oldstable_non-US/$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/non-us.debian.org/database/dists/oldstable_non-US/$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm i386 m68k powerpc sparc source"; - BinOverride "override.potato.$(SECTION)"; - SrcOverride "override.potato.$(SECTION).src"; -}; - tree "dists/stable/non-US" { FileList "/org/non-us.debian.org/database/dists/stable_non-US/$(SECTION)_binary-$(ARCH).list"; diff --git a/cron.buildd-security b/cron.buildd-security index e05ec333..9b8cffed 100755 --- a/cron.buildd-security +++ b/cron.buildd-security @@ -2,11 +2,10 @@ # # Executed after jennifer (merge there??) -ARCHS_oldstable="alpha arm i386 m68k powerpc sparc" ARCHS_stable="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390" ARCHS_testing="alpha arm hppa i386 ia64 m68k mips mipsel powerpc sparc s390" -#DISTS="oldstable stable testing" -DISTS="oldstable stable" +#DISTS="stable testing" +DISTS="stable" set -e export SCRIPTVARS=/org/security.debian.org/katie/vars-security @@ -17,9 +16,6 @@ if [ ! -e $ftpdir/Archive_Maintenance_In_Progress ]; then apt-ftparchive -qq generate apt.conf.buildd-security for d in $DISTS; do case "$d" in - oldstable) - ARCHS="$ARCHS_oldstable" - ;; stable) ARCHS="$ARCHS_stable" ;; diff --git a/cron.daily-security b/cron.daily-security index 73b30875..405b2924 100644 --- a/cron.daily-security +++ b/cron.daily-security @@ -32,7 +32,6 @@ rm -fr non-US for suite in $suites; do case $suite in - oldstable) override_suite=potato;; stable) override_suite=woody;; testing) override_suite=sarge;; *) echo "Unknown suite type ($suite)"; exit 1;; @@ -47,11 +46,6 @@ for suite in $suites; do if [ ! "$type" = "skip" ]; then $masterdir/natalie -q -S -t $override_type -s $suite -c updates/$component < override.$override_suite.$component$type case $suite in - oldstable) - $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.woody.$component$type - $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type - $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type - ;; stable) $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sarge.$component$type $masterdir/natalie -q -a -t $override_type -s $suite -c updates/$component < override.sid.$component$type diff --git a/katie.conf b/katie.conf index 541aa22b..ced20342 100644 --- a/katie.conf +++ b/katie.conf @@ -104,76 +104,6 @@ Rhona Suite { - OldStable - { - Components - { - main; - contrib; - non-free; - }; - Architectures - { - source; - all; - alpha; - arm; - i386; - m68k; - powerpc; - sparc; - }; - Announce "debian-changes@lists.debian.org"; - Version "2.2r7"; - Origin "Debian"; - Description "Debian 2.2r7 Released 12th July 2002"; - CodeName "potato"; - OverrideCodeName "potato"; - Priority "1"; - Untouchable "1"; - ChangeLogBase "dists/oldstable/"; - }; - - Old-Proposed-Updates - { - Architectures - { - source; - all; - alpha; - arm; - i386; - m68k; - powerpc; - sparc; - }; - Announce "debian-changes@lists.debian.org"; - CopyChanges "dists/old-proposed-updates/"; - CopyKatie "/org/ftp.debian.org/queue/old-proposed-updates/"; - Version "2.2r7"; - Origin "Debian"; - Description "Proposed Updates for Debian 2.2r7 - Not Released"; - CodeName "old-proposed-updates"; - OverrideCodeName "potato"; - OverrideSuite "oldstable"; - Priority "2"; - VersionChecks - { - MustBeNewerThan - { - OldStable; - }; - MustBeOlderThan - { - Stable; - Proposed-Updates; - Testing; - Testing-Proposed-Updates; - Unstable; - Experimental; - }; - }; - }; Stable { @@ -248,8 +178,6 @@ Suite { MustBeNewerThan { - OldStable; - Old-Proposed-Updates; Stable; }; MustBeOlderThan @@ -424,8 +352,6 @@ Suite { MustBeNewerThan { - OldStable; - Old-Proposed-Updates; Stable; Proposed-Updates; Testing; @@ -440,11 +366,6 @@ Suite SuiteMappings { - "map oldstable old-proposed-updates"; - "map oldstable-security old-proposed-updates"; - "map-unreleased oldstable stable"; - "map-unreleased old-proposed-updates stable"; - "map testing-security proposed-updates"; "map stable proposed-updates"; diff --git a/katie.conf-non-US b/katie.conf-non-US index 403fbc80..ee234514 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -93,76 +93,6 @@ Rhona Suite { - OldStable - { - Components - { - non-US/main; - non-US/contrib; - non-US/non-free; - }; - Architectures - { - source; - all; - alpha; - arm; - i386; - m68k; - powerpc; - sparc; - }; - Announce "debian-changes@lists.debian.org"; - Version "2.2r7"; - Origin "Debian"; - Description "Debian 2.2r7 Released 12th July 2002"; - CodeName "potato"; - OverrideCodeName "potato"; - Priority "1"; - Untouchable "1"; - ChangeLogBase "dists/oldstable/non-US/"; - }; - - Old-Proposed-Updates - { - Architectures - { - source; - all; - alpha; - arm; - i386; - m68k; - powerpc; - sparc; - }; - Announce "debian-changes@lists.debian.org"; - CopyChanges "dists/old-proposed-updates/"; - CopyKatie "/org/non-us.debian.org/queue/old-proposed-updates/"; - Version "2.2r7"; - Origin "Debian"; - Description "Proposed Updates for Debian 2.2r7 - Not Released"; - CodeName "old-proposed-updates"; - OverrideCodeName "potato"; - OverrideSuite "oldstable"; - Priority "2"; - VersionChecks - { - MustBeNewerThan - { - OldStable; - }; - MustBeOlderThan - { - Stable; - Proposed-Updates; - Testing; - Testing-Proposed-Updates; - Unstable; - Experimental; - }; - }; - }; Stable { @@ -237,8 +167,6 @@ Suite { MustBeNewerThan { - OldStable; - Old-Proposed-Updates; Stable; }; MustBeOlderThan @@ -314,8 +242,6 @@ Suite { MustBeNewerThan { - OldStable; - Old-Proposed-Updates; Stable; Proposed-Updates; Testing; @@ -364,8 +290,6 @@ Suite { MustBeNewerThan { - OldStable; - Old-Proposed-Updates; Stable; Proposed-Updates; Testing; @@ -378,11 +302,6 @@ Suite SuiteMappings { - "map oldstable old-proposed-updates"; - "map oldstable-security old-proposed-updates"; - "map-unreleased oldstable stable"; - "map-unreleased old-proposed-updates stable"; - // JT - temp measure "map testing-security proposed-updates"; diff --git a/katie.conf-security b/katie.conf-security index aa8c190e..bb9516d7 100644 --- a/katie.conf-security +++ b/katie.conf-security @@ -23,7 +23,6 @@ Dinstall BXANotify "false"; AcceptedAutoBuildSuites { - oldstable; stable; testing; }; @@ -104,35 +103,6 @@ Suite // Priority determines which suite is used for the Maintainers file // as generated by charisma (highest wins). - OldStable - { - Components - { - updates/main; - updates/contrib; - updates/non-free; - }; - Architectures - { - source; - all; - alpha; - arm; - i386; - m68k; - powerpc; - sparc; - }; - Announce "katie@security.debian.org"; - Version "2.2"; - Origin "Debian"; - Label "Debian-Security"; - Description "Debian 2.2 Security Updates"; - CodeName "potato"; - OverrideCodeName "potato"; - CopyKatie "/org/security.debian.org/queue/done/"; - }; - Stable { Components @@ -205,7 +175,6 @@ Suite SuiteMappings { - "silent-map oldstable-security oldstable"; "silent-map stable-security stable"; // JT - FIXME, hackorama "silent-map testing-security stable"; @@ -380,7 +349,6 @@ Location Archive "security"; Suites { - OldStable; Stable; Testing; }; diff --git a/vars-security b/vars-security index 05ccc8c1..f042e2ef 100644 --- a/vars-security +++ b/vars-security @@ -13,7 +13,7 @@ uploadhost=ftp-master.debian.org uploaddir=/pub/UploadQueue/ components="main non-free contrib" -suites="oldstable stable testing" +suites="stable testing" override_types="deb dsc udeb" PATH=$masterdir:$PATH diff --git a/wanna-build/trigger.daily b/wanna-build/trigger.daily index 8a1e4c39..e69a412a 100755 --- a/wanna-build/trigger.daily +++ b/wanna-build/trigger.daily @@ -8,10 +8,9 @@ # Sources.* == uncompressed, concat'd version PATH="/bin:/usr/bin" #testing must be before unstable so late upld don't build for testing needlessly -DISTS="oldstable-security stable stable-security testing testing-security unstable" +DISTS="stable stable-security testing testing-security unstable" SECTIONS="main contrib non-free" -ARCHS_oldstable="m68k arm sparc alpha powerpc i386" -ARCHS_stable="mips mipsel ia64 hppa s390 $ARCHS_oldstable" +ARCHS_stable="m68k arm sparc alpha powerpc i386 mips mipsel ia64 hppa s390" ARCHS_testing="$ARCHS_stable" ARCHS_unstable="$ARCHS_testing hurd-i386 sh" TMPDIR="/org/wanna-build/tmp" @@ -51,9 +50,6 @@ cd $TMPDIR for d in $DISTS ; do dist=`echo $d | sed s/-.*$//` case "$dist" in - oldstable) - ARCHS="$ARCHS_oldstable" - ;; stable) ARCHS="$ARCHS_stable" ;; @@ -144,25 +140,6 @@ for d in $DISTS ; do fi done - if [ "$d" = "oldstable" ]; then - gzip -dc /org/ftp.debian.org/ftp/dists/old-proposed-updates/Sources.gz >> Sources.$d - if "$NON_US" = "true" ]; then - rm -f Sources.gz - if wget $WGETOPT http://non-us.debian.org/debian-non-US/dists/old-proposed-updates/Sources.gz; then - mv Sources.gz Sources-non-us.p-u.gz - fi - gzip -dc Sources-non-us.p-u.gz >> Sources.$d - rm -f Packages.gz - if wget $WGETOPT http://non-us.debian.org/debian-non-US/dists/old-proposed-updates/Packages.gz; then - mv Packages.gz Packages-non-us.p-u.gz - fi - fi - - for a in $ARCHS ; do - gzip -dc /org/ftp.debian.org/ftp/dists/old-proposed-updates/Packages.gz >> Packages.$d.$a - gzip -dc Packages-non-us.p-u.gz >> Packages.$d.$a - done - fi for a in $ARCHS ; do if [ "$d" = "unstable" -o ! -e "quinn-unstable.$a-old" ]; then quinn-diff -A $a -a /org/buildd.debian.org/web/quinn-diff/Packages-arch-specific -s Sources.$d -p Packages.$d.$a >> quinn-$d.$a @@ -179,11 +156,6 @@ for a in $ARCHS_unstable ; do for d in $DISTS ; do dist=`echo $d | sed s/-.*$//` case "$dist" in - oldstable) - if echo $ARCHS_oldstable | grep -q -v "\b$a\b"; then - continue - fi - ;; stable) if echo $ARCHS_stable | grep -q -v "\b$a\b"; then continue -- 2.39.5