[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#571325: packages.debian.org: Please update architecture list from debian-ports.



* Petr Salinger | 2010-02-25 13:17:07 [+0100]:

>Hello,
Hi,

>the debian-ports currently host 4 architectures: "avr32 m68k sh4
>sparc64", see i.e. http://ftp.debian-ports.org/debian/dists/sid/main/

In the meantime powerpcspe got on board :)

>The addition of avr32 have been performed by
>http://git.debian.org/?p=webwml/packages.git;a=commitdiff;h=d2c37ad5a233f2026d3309905f6715ec672be45b
>
>Please, could you do similar changes for the other two ?
I made a patch which adds sh4 and powerpcspe. I didn't add sparc64 as I
haven't found a "status" page.
Is it possible to merge this or do you want to have sparc64 as well?

>Petr

Sebastian
>From 6f5645bca6b0c78a053a49edc27012ceb1f70a51 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 27 May 2010 16:05:09 +0200
Subject: [PATCH] Add two missing debian-ports arches

- powerpcspe
- sh4

I haven't found a brief info page about sparc64 so I did not include it.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
 bin/parse-contents                  |    4 +++-
 config.sh.sed.in                    |    4 ++--
 cron.d/100syncarchive_debports      |    2 +-
 templates/config/architectures.tmpl |    2 ++
 templates/config/mirrors.tmpl       |    8 ++++++++
 templates/html/homepage.tmpl        |    3 ++-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/bin/parse-contents b/bin/parse-contents
index 11d076f..0fe4bba 100755
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -46,6 +46,8 @@ use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @ARCHITECTURES );
 my @archives = @ARCHIVES;
 my @suites = @SUITES;
 my @archs = @ARCHITECTURES;
+my %deborts_hash;
+@deborts_hash{qw( avr32 m68k powerpcspe sh4 )} = ();
 
 $DBDIR .= "/contents";
 mkdirp( $DBDIR );
@@ -142,7 +144,7 @@ for my $suite (@suites) {
 
 	    activate($filelist_db);
 	    #FIXME: hardcoded archs. (debports has no contrib/non-free)
-	    if ($arch ne 'avr32' and $arch ne 'm68k') {
+	    if (not exists $deborts_hash{$arch}) {
 		system("ln", "-sf", basename($filelist_db),
 		       "$DBDIR/filelists_${suite}_all.db") == 0
 			   or die "Oops";
diff --git a/config.sh.sed.in b/config.sh.sed.in
index f5a511d..394b111 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -48,11 +48,11 @@ parts="$sections"
 suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze sid experimental"
 priorities="required important standard optional extra"
 dists="$suites"
-architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
+architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc powerpcspe s390 sh4 sparc"
 arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
 arch_lenny="${arch_etch} armel"
 arch_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc"
-arch_sid="${arch_squeeze} avr32 hurd-i386 m68k"
+arch_sid="${arch_squeeze} avr32 hurd-i386 m68k powerpcspe sh4"
 arch_experimental="${arch_sid}"
 arch_lenny_proposed_updates="${arch_lenny}"
 arch_etch_proposed_updates="${arch_etch}"
diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index a45a144..f26241b 100755
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # Main archive
 #
-architectures="avr32 m68k"
+architectures="avr32 powerpcspe sh4 m68k"
 
 for dist in sid experimental
   do
diff --git a/templates/config/architectures.tmpl b/templates/config/architectures.tmpl
index 9e85c11..e3c6f01 100644
--- a/templates/config/architectures.tmpl
+++ b/templates/config/architectures.tmpl
@@ -18,6 +18,8 @@ architectures = {
         "kfreebsd-i386" => g('GNU/kFreeBSD (i386)'),
         "kfreebsd-amd64" => g('GNU/kFreeBSD (amd64)'),
         avr32   => g('AVR32'),
+        powerpcspe => g('PowerPC SPE (e500 core)'),
+        sh4	=> g('SH4'),
 }
 
 %]
diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 28c4a0e..a04fd34 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -168,6 +168,14 @@ mirrors = {
 				url => 'http://avr32.debian.net/',
 				name => 'AVR32',
 			},
+			powerpcspe => {
+				url => 'http://wiki.debian.org/PowerPCSPEPort',
+				name => 'PowerPCSPE',
+			},
+			sh4 => {
+				url => 'http://wiki.debian.org/SH4',
+				name => 'SH4',
+			},
 			m68k => {
 				url_name => 'm68k',
 				name => 'M68K',
diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 0f77b5c..4c61d70 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -13,7 +13,8 @@
     all_sections = [ 'main', 'contrib', 'non-free' ]
     all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'avr32', 'hppa', 'i386',
     		      	  'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
-			  'mipsel', 'm68k', 'powerpc', 's390', 'sparc' ]
+			  'mipsel', 'm68k', 'powerpc', 'powerpcspe', 's390', 'sh4',
+			  'sparc' ]
 -%]
 
 <p>[% g('This site provides you with information about all the packages available in the <a href="%s">%s</a> Package archive.', project_homepage, organisation) %]</p>
-- 
1.6.5


Reply to: