From 156cb6f00dd5881acee773234fae9033fb67318f Mon Sep 17 00:00:00 2001 From: Joerg Jaspert Date: Tue, 22 Mar 2011 19:32:32 +0100 Subject: [PATCH] gps move stable/oldstable into gps too, so we only generate packages/sources from there, ever Signed-off-by: Joerg Jaspert --- config/debian/apt.conf | 7 +++ config/debian/apt.conf.oldstable | 58 ------------------- config/debian/apt.conf.stable | 58 ------------------- dak/generate_packages_sources.py | 95 +++++++++++++++++++++++++++++--- 4 files changed, 94 insertions(+), 124 deletions(-) delete mode 100644 config/debian/apt.conf.oldstable delete mode 100644 config/debian/apt.conf.stable diff --git a/config/debian/apt.conf b/config/debian/apt.conf index 6faf2e13..b8bb8651 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -1,3 +1,10 @@ +// The only use of this file nowadays is to serve as something for "apt-ftparchive clean" +// and for the "python apt read an apt.conf" thingie. Otherwise its not really in use, +// all the generation stuff is done in generate-packages-sources +// +// Well, except for that generate-releases and generate-index-diffs codebase, which +// REALLY wants a cleanup. + Dir { ArchiveDir "/srv/ftp-master.debian.org/ftp/"; diff --git a/config/debian/apt.conf.oldstable b/config/debian/apt.conf.oldstable deleted file mode 100644 index 0bc8839b..00000000 --- a/config/debian/apt.conf.oldstable +++ /dev/null @@ -1,58 +0,0 @@ -Dir -{ - ArchiveDir "/srv/ftp-master.debian.org/ftp/"; - OverrideDir "/srv/ftp-master.debian.org/scripts/override/"; - CacheDir "/srv/ftp-master.debian.org/database/"; -}; - -Default -{ - Packages::Compress "gzip bzip2"; - Sources::Compress "gzip bzip2"; - Contents::Compress "gzip"; - DeLinkLimit 0; - FileMode 0664; -} - -TreeDefault -{ - Contents::Header "/srv/ftp-master.debian.org/dak/config/debian/Contents.top"; -}; - -tree "dists/oldstable" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny.$(SECTION)"; - ExtraOverride "override.lenny.extra.$(SECTION)"; - SrcOverride "override.lenny.$(SECTION).src"; -}; - -// debian-installer - -tree "dists/oldstable/main" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny.main.$(SECTION)"; - SrcOverride "override.lenny.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - Contents "$(DIST)/../Contents-udeb"; -}; - -tree "dists/oldstable/non-free" -{ - FileList "/srv/ftp-master.debian.org/database/dists/oldstable_non-free_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source"; - BinOverride "override.lenny.main.$(SECTION)"; - SrcOverride "override.lenny.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - Contents "$(DIST)/../Contents-udeb-nf"; -}; - diff --git a/config/debian/apt.conf.stable b/config/debian/apt.conf.stable deleted file mode 100644 index 0b61d235..00000000 --- a/config/debian/apt.conf.stable +++ /dev/null @@ -1,58 +0,0 @@ -Dir -{ - ArchiveDir "/srv/ftp-master.debian.org/ftp/"; - OverrideDir "/srv/ftp-master.debian.org/scripts/override/"; - CacheDir "/srv/ftp-master.debian.org/database/"; -}; - -Default -{ - Packages::Compress "gzip bzip2"; - Sources::Compress "gzip bzip2"; - Contents::Compress "gzip"; - DeLinkLimit 0; - FileMode 0664; -} - -TreeDefault -{ - Contents::Header "/srv/ftp-master.debian.org/dak/config/debian/Contents.top"; -}; - -tree "dists/stable" -{ - FileList "/srv/ftp-master.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/stable_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source"; - BinOverride "override.squeeze.$(SECTION)"; - ExtraOverride "override.squeeze.extra.$(SECTION)"; - SrcOverride "override.squeeze.$(SECTION).src"; -}; - -// debian-installer - -tree "dists/stable/main" -{ - FileList "/srv/ftp-master.debian.org/database/dists/stable_main_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source"; - BinOverride "override.squeeze.main.$(SECTION)"; - SrcOverride "override.squeeze.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - Contents "$(DIST)/../Contents-udeb"; -}; - -tree "dists/stable/non-free" -{ - FileList "/srv/ftp-master.debian.org/database/dists/stable_non-free_$(SECTION)_binary-$(ARCH).list"; - Sections "debian-installer"; - Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source"; - BinOverride "override.squeeze.main.$(SECTION)"; - SrcOverride "override.squeeze.main.src"; - BinCacheDB "packages-debian-installer-$(ARCH).db"; - Packages::Extensions ".udeb"; - Contents "$(DIST)/../Contents-udeb-nf"; -}; - diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py index 3a018769..a4f41f5f 100755 --- a/dak/generate_packages_sources.py +++ b/dak/generate_packages_sources.py @@ -105,17 +105,82 @@ TreeDefault apt_trees={} apt_trees["di"]={} - apt_trees["testing"]=""" -tree "dists/testing" + + apt_trees["oldstable"]=""" +tree "dists/oldstable" { - FakeDI "dists/unstable"; - FileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_source.list"; + FileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_source.list"; Sections "main contrib non-free"; Architectures "%(arch)s"; - BinOverride "override.wheezy.$(SECTION)"; - ExtraOverride "override.wheezy.extra.$(SECTION)"; - SrcOverride "override.wheezy.$(SECTION).src"; + BinOverride "override.lenny.$(SECTION)"; + ExtraOverride "override.lenny.extra.$(SECTION)"; + SrcOverride "override.lenny.$(SECTION).src"; +}; +""" + + apt_trees["di"]["oldstable"]=""" +tree "dists/oldstable/main" +{ + FileList "/srv/ftp-master.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list"; + Sections "debian-installer"; + Architectures "%(arch)s"; + BinOverride "override.lenny.main.$(SECTION)"; + SrcOverride "override.lenny.main.src"; + BinCacheDB "packages-debian-installer-$(ARCH).db"; + Packages::Extensions ".udeb"; + %(contentsline)s +}; + +tree "dists/oldstable/non-free" +{ + FileList "/srv/ftp-master.debian.org/database/dists/oldstable_non-free_$(SECTION)_binary-$(ARCH).list"; + Sections "debian-installer"; + Architectures "%(arch)s"; + BinOverride "override.lenny.main.$(SECTION)"; + SrcOverride "override.lenny.main.src"; + BinCacheDB "packages-debian-installer-$(ARCH).db"; + Packages::Extensions ".udeb"; + %(contentsline)s +}; +""" + + apt_trees["stable"]=""" +tree "dists/stable" +{ + FileList "/srv/ftp-master.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/srv/ftp-master.debian.org/database/dists/stable_$(SECTION)_source.list"; + Sections "main contrib non-free"; + Architectures "%(arch)s"; + BinOverride "override.squeeze.$(SECTION)"; + ExtraOverride "override.squeeze.extra.$(SECTION)"; + SrcOverride "override.squeeze.$(SECTION).src"; +}; +""" + + apt_trees["di"]["stable"]=""" +tree "dists/stable/main" +{ + FileList "/srv/ftp-master.debian.org/database/dists/stable_main_$(SECTION)_binary-$(ARCH).list"; + Sections "debian-installer"; + Architectures "%(arch)s"; + BinOverride "override.squeeze.main.$(SECTION)"; + SrcOverride "override.squeeze.main.src"; + BinCacheDB "packages-debian-installer-$(ARCH).db"; + Packages::Extensions ".udeb"; + %(contentsline)s +}; + +tree "dists/stable/non-free" +{ + FileList "/srv/ftp-master.debian.org/database/dists/stable_non-free_$(SECTION)_binary-$(ARCH).list"; + Sections "debian-installer"; + Architectures "%(arch)s"; + BinOverride "override.squeeze.main.$(SECTION)"; + SrcOverride "override.squeeze.main.src"; + BinCacheDB "packages-debian-installer-$(ARCH).db"; + Packages::Extensions ".udeb"; + %(contentsline)s }; """ @@ -131,6 +196,20 @@ tree "dists/squeeze-updates" SrcOverride "override.squeeze.$(SECTION).src"; Contents " "; }; +""" + + apt_trees["testing"]=""" +tree "dists/testing" +{ + FakeDI "dists/unstable"; + FileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_source.list"; + Sections "main contrib non-free"; + Architectures "%(arch)s"; + BinOverride "override.wheezy.$(SECTION)"; + ExtraOverride "override.wheezy.extra.$(SECTION)"; + SrcOverride "override.wheezy.$(SECTION).src"; +}; """ apt_trees["di"]["testing"]=""" -- 2.39.2