[dak/master] Add armhf and s390x architectures
Signed-off-by: Mark Hymers <mhy@debian.org>
---
config/debian/apt.conf | 12 ++++++------
scripts/debian/ftpstats.R | 4 ++--
scripts/debian/update-ftpstats | 4 ++--
tools/debianqueued-0.9/config | 2 ++
tools/debianqueued-0.9/config-upload | 2 ++
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index b8bb865..7974096 100644
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -92,7 +92,7 @@ tree "dists/unstable"
FileList "/srv/ftp-master.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp-master.debian.org/database/dists/unstable_$(SECTION)_source.list";
Sections "main contrib non-free";
- Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+ Architectures "alpha amd64 armel armhf hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-i386 kfreebsd-amd64 source";
BinOverride "override.sid.$(SECTION)";
ExtraOverride "override.sid.extra.$(SECTION)";
SrcOverride "override.sid.$(SECTION).src";
@@ -164,7 +164,7 @@ tree "dists/unstable/main"
{
FileList "/srv/ftp-master.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
- Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
+ Architectures "alpha amd64 armel armhf hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-i386 kfreebsd-amd64";
BinOverride "override.sid.main.$(SECTION)";
SrcOverride "override.sid.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
@@ -176,7 +176,7 @@ tree "dists/unstable/non-free"
{
FileList "/srv/ftp-master.debian.org/database/dists/unstable_non-free_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
- Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
+ Architectures "alpha amd64 armel armhf hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-i386 kfreebsd-amd64";
BinOverride "override.sid.main.$(SECTION)";
SrcOverride "override.sid.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
@@ -188,7 +188,7 @@ tree "dists/experimental/main"
{
FileList "/srv/ftp-master.debian.org/database/dists/experimental_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
- Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
+ Architectures "alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-i386 kfreebsd-amd64";
BinOverride "override.sid.main.$(SECTION)";
SrcOverride "override.sid.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
@@ -200,7 +200,7 @@ tree "dists/experimental/non-free"
{
FileList "/srv/ftp-master.debian.org/database/dists/experimental_non-free_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
- Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
+ Architectures "alpha amd64 armel armhf hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-i386 kfreebsd-amd64";
BinOverride "override.sid.main.$(SECTION)";
SrcOverride "override.sid.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
@@ -215,7 +215,7 @@ tree "dists/experimental"
FileList "/srv/ftp-master.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp-master.debian.org/database/dists/experimental_$(SECTION)_source.list";
Sections "main contrib non-free";
- Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+ Architectures "alpha amd64 armel armhf hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 s390x sparc kfreebsd-i386 kfreebsd-amd64 source";
BinOverride "override.sid.$(SECTION)";
SrcOverride "override.sid.$(SECTION).src";
};
diff --git a/scripts/debian/ftpstats.R b/scripts/debian/ftpstats.R
index 84786df..85d9bb9 100644
--- a/scripts/debian/ftpstats.R
+++ b/scripts/debian/ftpstats.R
@@ -1,5 +1,5 @@
-arch <- c("source", "all", "amd64", "i386", "alpha", "arm", "armel", "hppa", "hurd-i386", "ia64",
- "kfreebsd-amd64", "kfreebsd-i386", "mips", "mipsel", "powerpc", "s390", "sparc")
+arch <- c("source", "all", "amd64", "i386", "alpha", "arm", "armel", "armhf", "hppa", "hurd-i386", "ia64",
+ "kfreebsd-amd64", "kfreebsd-i386", "mips", "mipsel", "powerpc", "s390", "s390x", "sparc")
palette(c("midnightblue", "gold", "turquoise", "cyan", "black", "red", "OrangeRed", "green3", "blue", "magenta",
"cornsilk3", "darkolivegreen3", "tomato4", "violetred2","thistle4", "steelblue2", "springgreen4",
"salmon","gray"))
diff --git a/scripts/debian/update-ftpstats b/scripts/debian/update-ftpstats
index c2e1355..1f9727a 100755
--- a/scripts/debian/update-ftpstats
+++ b/scripts/debian/update-ftpstats
@@ -2,9 +2,9 @@
my %data;
my %data2;
-my @archs = ("source", "all", "amd64", "i386", "alpha", "arm", "armel", "hppa",
+my @archs = ("source", "all", "amd64", "i386", "alpha", "arm", "armel", "armhf", "hppa",
"hurd-i386", "ia64", "kfreebsd-amd64", "kfreebsd-i386", "mips", "mipsel", "powerpc", "s390",
- "sparc");
+ "s390x", "sparc");
while (<>) {
if (/^(\d{8})\d{6}\|(?:k(?:atie|elly)|process-(?:accepted|upload))(?:\|dak)?\|installed\|[^|]+\|[^|]+\|(\d+)\|([-\w]+)$/) {
diff --git a/tools/debianqueued-0.9/config b/tools/debianqueued-0.9/config
index c54e8ea..4f94796 100644
--- a/tools/debianqueued-0.9/config
+++ b/tools/debianqueued-0.9/config
@@ -67,6 +67,7 @@ $statusdelay = 30;
"/srv/keyring.debian.org/keyrings/debian-maintainers.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-alpha-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-amd64-keyring.gpg",
+ "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-armhf-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-armel-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hppa-keyring.gpg",
@@ -79,6 +80,7 @@ $statusdelay = 30;
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg",
+ "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390x-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg");
# our log file
diff --git a/tools/debianqueued-0.9/config-upload b/tools/debianqueued-0.9/config-upload
index eee964a..47f456d 100644
--- a/tools/debianqueued-0.9/config-upload
+++ b/tools/debianqueued-0.9/config-upload
@@ -68,6 +68,7 @@ $statusdelay = 30;
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-alpha-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-amd64-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-armel-keyring.gpg",
+ "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-armhf-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hppa-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-hurd-i386-keyring.gpg",
@@ -79,6 +80,7 @@ $statusdelay = 30;
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-mips-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-powerpc-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390-keyring.gpg",
+ "/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-s390x-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-sparc-keyring.gpg");
# our log file
--
1.7.2.5
Reply to: