diff options
-rw-r--r-- | common/version.h | 2 | ||||
-rw-r--r-- | debian/arcboot.lintian-overrides | 3 | ||||
-rw-r--r-- | debian/changelog | 16 | ||||
-rw-r--r-- | debian/control | 2 | ||||
-rw-r--r-- | debian/dirs | 1 | ||||
-rw-r--r-- | debian/po/cs.po | 21 | ||||
-rw-r--r-- | debian/po/da.po | 17 | ||||
-rw-r--r-- | debian/po/de.po | 22 | ||||
-rw-r--r-- | debian/po/es.po | 28 | ||||
-rw-r--r-- | debian/po/fr.po | 4 | ||||
-rw-r--r-- | debian/po/ja.po | 22 | ||||
-rw-r--r-- | debian/po/nl.po | 25 | ||||
-rw-r--r-- | debian/po/pt.po | 19 | ||||
-rw-r--r-- | debian/po/pt_BR.po | 17 | ||||
-rw-r--r-- | debian/po/sv.po | 26 | ||||
-rw-r--r-- | debian/po/templates.pot | 28 | ||||
-rw-r--r-- | debian/po/vi.po | 22 | ||||
-rwxr-xr-x | debian/rules | 7 | ||||
-rw-r--r-- | tip22/tftpload.c | 68 |
19 files changed, 231 insertions, 119 deletions
diff --git a/common/version.h b/common/version.h index c144648..8a2150f 100644 --- a/common/version.h +++ b/common/version.h @@ -1 +1 @@ -#define __ARCSBOOT_VERSION__ "0.3.8.8" +#define __ARCSBOOT_VERSION__ "0.3.9.1" diff --git a/debian/arcboot.lintian-overrides b/debian/arcboot.lintian-overrides new file mode 100644 index 0000000..83cf448 --- /dev/null +++ b/debian/arcboot.lintian-overrides @@ -0,0 +1,3 @@ +arcboot: unstripped-binary-or-object ./usr/lib/arcboot/arcboot.ip32 +arcboot: statically-linked-binary ./usr/lib/arcboot/arcboot.ip32 + diff --git a/debian/changelog b/debian/changelog index d1695b5..0714332 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +arcboot (0.3.9.1) unstable; urgency=low + + * Non-Maintainer Upload requested by Guido. + + * Apply my temporary fix for #452798, hence not closing yet. + * Update french debconf translation (closes: #452933). + * debian/control: + + Bump Standards-Version to 3.7.3 (no changes). + * debian/rules: + + Do not ignore failures in clean target. + * Added lintian overrides for /usr/lib/arcboot/arcboot.ip32 + - arcboot: unstripped-binary-or-object ./usr/lib/arcboot/arcboot.ip32 + - arcboot: statically-linked-binary ./usr/lib/arcboot/arcboot.ip32 + + -- Julien BLACHE <jblache@debian.org> Thu, 24 Jan 2008 14:14:59 +0000 + arcboot (0.3.9) unstable; urgency=low * tftpload.c: fix misleading printouts diff --git a/debian/control b/debian/control index 70d45b4..f982ba3 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Guido Guenther <agx@sigxcpu.org> Uploaders: Thiemo Seufer <ths@debian.org> Build-Depends: debhelper (>=4.1.16), e2fslibs-dev Vcs-Git: http://honk.sigxcpu.org/git/arcboot.git/ -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: arcboot Architecture: mips diff --git a/debian/dirs b/debian/dirs index 1555bc9..947a565 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,3 +1,4 @@ usr/lib/arcboot usr/sbin etc/ +usr/share/lintian/overrides diff --git a/debian/po/cs.po b/debian/po/cs.po index 2c9825d..0bcd525 100644 --- a/debian/po/cs.po +++ b/debian/po/cs.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2005-07-10 16:11+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" @@ -23,18 +23,23 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "Kam chcete arcboot nainstalovat?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "Arcboot must be put into the volume header of a disk with a SGI disklabel. " "Usually the volume header of /dev/sda is used. Please give the device name " "of the disk you want to put arcboot onto." msgstr "" "Arcboot se musí nainstalovat do hlavičky svazku na disk obsahující SGI " -"disklabel. Obvykle se používá /dev/sda. Zadejte prosím jméno zařízení " -"disku, na který chcete arcboot nainstalovat." +"disklabel. Obvykle se používá /dev/sda. Zadejte prosím jméno zařízení disku, " +"na který chcete arcboot nainstalovat." + +#~ msgid "Where to put arcboot?" +#~ msgstr "Kam chcete arcboot nainstalovat?" diff --git a/debian/po/da.po b/debian/po/da.po index 65ae6c4..cbda5d3 100644 --- a/debian/po/da.po +++ b/debian/po/da.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot 0.3.8.4\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2004-10-15 18:02+0200\n" "Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -23,13 +23,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "Hvor skal arcboot placeres?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "Arcboot must be put into the volume header of a disk with a SGI disklabel. " "Usually the volume header of /dev/sda is used. Please give the device name " @@ -38,3 +40,6 @@ msgstr "" "Arcoot skal placeres i 'volume' hovedet af en disk med et SGI-diskmærke. " "Normalt er 'volume' hovedet på /dev/sda brugt. Angiv enhedsnavnet på den " "disk du gerne vil placere arcboot på." + +#~ msgid "Where to put arcboot?" +#~ msgstr "Hvor skal arcboot placeres?" diff --git a/debian/po/de.po b/debian/po/de.po index 8b6f233..e71bde1 100644 --- a/debian/po/de.po +++ b/debian/po/de.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot_0.3.8.1_de\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2004-05-23 22:29+0200\n" "Last-Translator: Erik Schanze <mail@erikschanze.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -24,20 +24,24 @@ msgstr "" "X-Generator: KBabel 1.3.1\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "Wo soll arcboot abgelegt werden?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "Arcboot must be put into the volume header of a disk with a SGI disklabel. " "Usually the volume header of /dev/sda is used. Please give the device name " "of the disk you want to put arcboot onto." msgstr "" "Arcboot muss in den Volume-Header einer Festplatte mit einem SGI Disk-Label " -"abgelegt werden. Normalerweise wird der Volume-Header von /dev/sda " -"benutzt. Bitte geben Sie den Gerätenamen der Festplatte ein, wo arcboot " -"abgelegt werden soll." +"abgelegt werden. Normalerweise wird der Volume-Header von /dev/sda benutzt. " +"Bitte geben Sie den Gerätenamen der Festplatte ein, wo arcboot abgelegt " +"werden soll." +#~ msgid "Where to put arcboot?" +#~ msgstr "Wo soll arcboot abgelegt werden?" diff --git a/debian/po/es.po b/debian/po/es.po index d64bf6a..21a55bd 100644 --- a/debian/po/es.po +++ b/debian/po/es.po @@ -26,8 +26,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2005-10-03 18:36+0100\n" "Last-Translator: César Gómez Martín <cesar.gomez@gmail.com>\n" "Language-Team: Debian l10n spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -38,14 +38,24 @@ msgstr "" "X-Poedit-Country: SPAIN\n" "X-Poedit-SourceCharset: utf-8\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "¿Dónde desea poner arcboot?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 -msgid "Arcboot must be put into the volume header of a disk with a SGI disklabel. Usually the volume header of /dev/sda is used. Please give the device name of the disk you want to put arcboot onto." -msgstr "Se debe poner arcboot en la cabecera del volumen de un disco con una etiqueta SGI. Normalmente la cabecera del volumen de /dev/sda está usada. Por favor, especifique el nombre del dispositivo del disco en el que quiere poner arcboot." - +#: ../templates:1001 +msgid "" +"Arcboot must be put into the volume header of a disk with a SGI disklabel. " +"Usually the volume header of /dev/sda is used. Please give the device name " +"of the disk you want to put arcboot onto." +msgstr "" +"Se debe poner arcboot en la cabecera del volumen de un disco con una " +"etiqueta SGI. Normalmente la cabecera del volumen de /dev/sda está usada. " +"Por favor, especifique el nombre del dispositivo del disco en el que quiere " +"poner arcboot." +#~ msgid "Where to put arcboot?" +#~ msgstr "¿Dónde desea poner arcboot?" diff --git a/debian/po/fr.po b/debian/po/fr.po index de0d41b..8993917 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot (0.3.6)\n" -"Report-Msgid-Bugs-To: Source: arcboot@packages.debian.org\n" -"POT-Creation-Date: 2007-11-26 08:14+0000\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2003-08-05 09:41+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" diff --git a/debian/po/ja.po b/debian/po/ja.po index 7436ef3..8ee87bd 100644 --- a/debian/po/ja.po +++ b/debian/po/ja.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot 0.3.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2004-01-12 22:02+0900\n" "Last-Translator: Hideki Yamane <henrich@samba.gr.jp>\n" "Language-Team: Japanese <debian-japanese@lists.debian.org>\n" @@ -24,17 +24,23 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "¤É¤³¤Ë arcboot ¤ò½ñ¤¹þ¤ß¤Þ¤¹¤«?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "Arcboot must be put into the volume header of a disk with a SGI disklabel. " "Usually the volume header of /dev/sda is used. Please give the device name " "of the disk you want to put arcboot onto." -msgstr "arcboot ¤Ï SGI ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤ò»ý¤Ã¤Æ¤¤¤ë¥Ç¥£¥¹¥¯¤Î¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À¤Ë½ñ¤¹þ¤Þ¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£" -"Ä̾/dev/sda ¤Î¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£arcboot ¤òÇÛÃÖ¤·¤¿¤¤¥Ç¥Ð¥¤¥¹Ì¾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£" +msgstr "" +"arcboot ¤Ï SGI ¥Ç¥£¥¹¥¯¥é¥Ù¥ë¤ò»ý¤Ã¤Æ¤¤¤ë¥Ç¥£¥¹¥¯¤Î¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À¤Ë½ñ¤¹þ¤Þ" +"¤Í¤Ð¤Ê¤ê¤Þ¤»¤ó¡£Ä̾/dev/sda ¤Î¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À¤¬»ÈÍѤµ¤ì¤Þ¤¹¡£arcboot " +"¤òÇÛÃÖ¤·¤¿¤¤¥Ç¥Ð¥¤¥¹Ì¾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤¡£" +#~ msgid "Where to put arcboot?" +#~ msgstr "¤É¤³¤Ë arcboot ¤ò½ñ¤¹þ¤ß¤Þ¤¹¤«?" diff --git a/debian/po/nl.po b/debian/po/nl.po index aa7c739..42c877d 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -14,7 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot 0.3.8.1\n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2004-04-16 11:04+0100\n" "Last-Translator: Luk Claes <luk.claes@ugent.be>\n" "Language-Team: Debian l10n Dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -22,13 +23,23 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "Waar moet arcboot geplaatst worden?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 -msgid "Arcboot must be put into the volume header of a disk with a SGI disklabel. Usually the volume header of /dev/sda is used. Please give the device name of the disk you want to put arcboot onto." -msgstr "Arcboot moet geplaatst worden in een volumehoofding van een schijf met een SGI-schijflabel. Gewoonlijk wordt de volumehoofding van /dev/sda gebruikt. Geef de toestelnaam van de schijf waar u arcboot wilt op plaatsen." +#: ../templates:1001 +msgid "" +"Arcboot must be put into the volume header of a disk with a SGI disklabel. " +"Usually the volume header of /dev/sda is used. Please give the device name " +"of the disk you want to put arcboot onto." +msgstr "" +"Arcboot moet geplaatst worden in een volumehoofding van een schijf met een " +"SGI-schijflabel. Gewoonlijk wordt de volumehoofding van /dev/sda gebruikt. " +"Geef de toestelnaam van de schijf waar u arcboot wilt op plaatsen." +#~ msgid "Where to put arcboot?" +#~ msgstr "Waar moet arcboot geplaatst worden?" diff --git a/debian/po/pt.po b/debian/po/pt.po index 5386be7..937fbf9 100644 --- a/debian/po/pt.po +++ b/debian/po/pt.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot_0.3.7_pt\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2003-10-18 13:43+0100\n" "Last-Translator: Bruno Rodrigues <bruno.rodrigues@litux.org>\n" "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n" @@ -24,18 +24,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.0.2\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "Qual o dispositivo para instalar o arcboot?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "Arcboot must be put into the volume header of a disk with a SGI disklabel. " "Usually the volume header of /dev/sda is used. Please give the device name " "of the disk you want to put arcboot onto." msgstr "" "O arcboot deverá ser instalado no inÃcio de um disco marcado como SGI. " -"Geralmente o dispositivo padrão é /dev/sda. Introduza o nome do dispositivo:" +"Geralmente o dispositivo padrão é /dev/sda. Introduza o nome do " +"dispositivo:" +#~ msgid "Where to put arcboot?" +#~ msgstr "Qual o dispositivo para instalar o arcboot?" diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index ccbd732..d442abe 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -15,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot_0.3.7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2004-01-17 21:15-0300\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" @@ -24,13 +24,15 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "Onde colocar o arcboot ?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "Arcboot must be put into the volume header of a disk with a SGI disklabel. " "Usually the volume header of /dev/sda is used. Please give the device name " @@ -40,3 +42,6 @@ msgstr "" "com um disklabel SGI. Normalmente o cabeçalho de volume de /dev/sda é " "usado. Por favor, informe o nome do dispositivo do disco onde você deseja " "colocar o arcboot." + +#~ msgid "Where to put arcboot?" +#~ msgstr "Onde colocar o arcboot ?" diff --git a/debian/po/sv.po b/debian/po/sv.po index bfc2a1a..60e4a46 100644 --- a/debian/po/sv.po +++ b/debian/po/sv.po @@ -8,33 +8,37 @@ # or http://www.debian.org/intl/l10n/po-debconf/README-trans # Developers do not need to manually edit POT or PO files. # , fuzzy -# -# +# +# msgid "" msgstr "" "Project-Id-Version: arcboot 0.3.8-7\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2005-10-03 23:09+0200\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <sv@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "Var ska arcboot ligga?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "Arcboot must be put into the volume header of a disk with a SGI disklabel. " "Usually the volume header of /dev/sda is used. Please give the device name " "of the disk you want to put arcboot onto." msgstr "" "Arcboot mste lggas i volymhuvudet p en disk med en SGI-disketikett. " -"Normalt r volymhuvudet i /dev/sda anvnt. Vnligen ange enhetsnamnet " -"p den disk du vill lgga arcboot p." +"Normalt r volymhuvudet i /dev/sda anvnt. Vnligen ange enhetsnamnet p den " +"disk du vill lgga arcboot p." +#~ msgid "Where to put arcboot?" +#~ msgstr "Var ska arcboot ligga?" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 97e4a9a..3c4fe68 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -1,22 +1,14 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -24,13 +16,15 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" +#: ../templates:1001 +msgid "Location of arcboot:" msgstr "" +#. Type: string #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "Arcboot must be put into the volume header of a disk with a SGI disklabel. " "Usually the volume header of /dev/sda is used. Please give the device name " diff --git a/debian/po/vi.po b/debian/po/vi.po index 7bb52c2..4bd7ca9 100644 --- a/debian/po/vi.po +++ b/debian/po/vi.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: arcboot 0.3.8.6\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2003-08-05 09:42+0200\n" +"Report-Msgid-Bugs-To: arcboot@packages.debian.org\n" +"POT-Creation-Date: 2008-01-24 14:06+0000\n" "PO-Revision-Date: 2005-06-12 11:33+0930\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n" @@ -15,15 +15,23 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" +#. Type: string #. Description -#: ../templates:4 -msgid "Where to put arcboot?" -msgstr "Bạn có muốn để trình arcboot vào chỗ nào?" +#: ../templates:1001 +msgid "Location of arcboot:" +msgstr "" +#. Type: string #. Description -#: ../templates:4 +#: ../templates:1001 msgid "" "Arcboot must be put into the volume header of a disk with a SGI disklabel. " "Usually the volume header of /dev/sda is used. Please give the device name " "of the disk you want to put arcboot onto." -msgstr "Phải để trình arcboot vào phần đầu khối tin của một đĩa có nhãn đĩa SGI. Thường dùng phần đầu khối tin của «/dev/sda». Hãy nhập tên thiết bị của đĩa nơi bạn muốn để trình arcboot." +msgstr "" +"Phải để trình arcboot vào phần đầu khối tin của một đĩa có nhãn đĩa SGI. " +"Thường dùng phần đầu khối tin của «/dev/sda». Hãy nhập tên thiết bị của đĩa " +"nơi bạn muốn để trình arcboot." + +#~ msgid "Where to put arcboot?" +#~ msgstr "Bạn có muốn để trình arcboot vào chỗ nào?" diff --git a/debian/rules b/debian/rules index cda0571..e003fda 100755 --- a/debian/rules +++ b/debian/rules @@ -45,8 +45,8 @@ clean: rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean - -rm -f arcboot.ip22 arcboot.ip32 + $(MAKE) clean + rm -f arcboot.ip22 arcboot.ip32 dh_clean @@ -65,6 +65,9 @@ install: build $(MAKE) PREFIX=${PREFIX_TIP22} BINDIR=${BIN_TIP22} LIBDIR=${LIB_TIP22} -C arclib install $(MAKE) PREFIX=${PREFIX_TIP22} BINDIR=${BIN_TIP22} LIBDIR=${LIB_TIP22} -C tip22 install + # Install lintian overrides + cp debian/arcboot.lintian-overrides $(CURDIR)/debian/arcboot/usr/share/lintian/overrides/arcboot + # Build architecture-independent files here. binary-indep: build install # nothing to do diff --git a/tip22/tftpload.c b/tip22/tftpload.c index 86bf111..74f709c 100644 --- a/tip22/tftpload.c +++ b/tip22/tftpload.c @@ -30,6 +30,8 @@ extern void* __kernel_end; extern void* __rd_start; extern void* __rd_end; +static int is64 = 0; + static void Wait(const char *prompt) { int ch; @@ -235,7 +237,7 @@ static ULONG CopyProgramSegments64(Elf64_Ehdr * header) return kernel_end; } -static ULONG CopyKernel(ULONG* kernel_end) +static Elf64_Addr CopyKernel(ULONG *kernel_end) { Elf32_Ehdr *header = (Elf32_Ehdr*)offset2addr(0L); Elf64_Ehdr *header64 = (Elf64_Ehdr*)header; @@ -257,10 +259,11 @@ static ULONG CopyKernel(ULONG* kernel_end) (*kernel_end) = CopyProgramSegments32(header); - printf("Kernel entry point is 0x%lx\n\r", - ((ULONG) KSEG0ADDR(header->e_entry))); - return KSEG0ADDR(header->e_entry); + printf("ELF32 kernel entry point = 0x%lx\n\r", (ULONG)header->e_entry); + return (Elf64_Addr) header->e_entry; } else if (header->e_ident[EI_CLASS] == ELFCLASS64) { + is64 = 1; + if (header64->e_ident[EI_DATA] != ELFDATA2MSB) Fatal("Not a big-endian file\n\r"); if (header64->e_ident[EI_VERSION] != EV_CURRENT) @@ -274,9 +277,9 @@ static ULONG CopyKernel(ULONG* kernel_end) (*kernel_end) = CopyProgramSegments64(header64); - printf("Kernel entry point is 0x%lx\n\r", - ((ULONG)KSEG0ADDR(header64->e_entry))); - return KSEG0ADDR(header64->e_entry); + printf("ELF64 kernel entry point = 0x%lx %lx\n\r", + (ULONG)(header64->e_entry >> 32), (ULONG)(header64->e_entry & 0xffffffff)); + return header64->e_entry; } else Fatal("Neither an ELF32 nor an ELF64 kernel\n\r"); @@ -291,6 +294,20 @@ static void copyRamdisk(void* rd_vaddr, void* rd_start, ULONG rd_size) printf("Initrd copied.\n\r"); } +void _start64(LONG argc, CHAR * argv[], CHAR * envp[], + unsigned long long *addr) +{ + __asm__ __volatile__( + ".set push\n" + "\t.set mips3\n" + "\t.set noreorder\n" + "\t.set noat\n" + "\tld $1, 0($7)\n" + "\tjr $1\n" + "\t nop\n" + "\t.set pop"); +} + void _start(LONG argc, CHAR * argv[], CHAR * envp[]) { char* nargv[3]; @@ -298,8 +315,9 @@ void _start(LONG argc, CHAR * argv[], CHAR * envp[]) char argv_rd[128]; /* passed to the kernel on its commandline */ ULONG kernel_end = 0L; ULONG rd_size= ((char*)&__rd_end) - ((char*)&__rd_start); - char* rd_vaddr=NULL; - void (*kernel_entry)(int argc, CHAR * argv[], CHAR * envp[]); + ULONG rd_vaddr; + Elf32_Addr kernel_entry32; + Elf64_Addr kernel_entry64; /* Print identification */ #if (SUBARCH == IP22) @@ -317,14 +335,21 @@ void _start(LONG argc, CHAR * argv[], CHAR * envp[]) printf("Embedded ramdisk image starts 0x%p, ends 0x%p\n\r", &__rd_start, &__rd_end); #endif - kernel_entry = (void (*)(int, CHAR *[], CHAR *[]))CopyKernel(&kernel_end); + kernel_entry64 = CopyKernel(&kernel_end); + kernel_entry32 = (Elf32_Addr) kernel_entry64; + rd_vaddr = (ULONG)malloc(rd_size + PAGE_SIZE); /* align to page boundary */ - rd_vaddr = (char*)(((kernel_end + PAGE_SIZE) / PAGE_SIZE ) * PAGE_SIZE); - copyRamdisk( rd_vaddr, (char*)&__rd_start, rd_size); + rd_vaddr = (rd_vaddr + PAGE_SIZE) & ~(PAGE_SIZE - 1); + +#ifdef DEBUG + printf("rd_start=0x%lx rd_size=0x%lx\n\r", rd_vaddr, rd_size); +#endif + + copyRamdisk( (char *)rd_vaddr, (char*)&__rd_start, rd_size); /* tell the kernel about the ramdisk */ - sprintf(argv_rd, "rd_start=0x%p rd_size=0x%lx", rd_vaddr, rd_size); + sprintf(argv_rd, "rd_start=0x%lx rd_size=0x%lx", rd_vaddr, rd_size); nargv[0] = argv[0]; nargv[1] = argv_rd; @@ -333,6 +358,7 @@ void _start(LONG argc, CHAR * argv[], CHAR * envp[]) if( !memcmp(argv[i],"append=",7) ) break; } + if( i < argc ) { /* we're asked to pass s.th. to the kernel */ nargv[2] = argv[i]+7; nargc++; @@ -345,11 +371,17 @@ void _start(LONG argc, CHAR * argv[], CHAR * envp[]) Wait("\n\r--- Debug: press <spacebar> to boot kernel ---"); #endif /* Finally jump into the kernel */ - printf("Starting kernel...\n\r"); - ArcFlushAllCaches(); - if( kernel_entry ) - (*kernel_entry)(nargc ,nargv, envp); - else + if( kernel_entry64 ) { + if (is64 == 0) { + printf("Starting ELF32 kernel\n\r"); + ArcFlushAllCaches(); + ((void (*)(int argc, CHAR * argv[], CHAR * envp[]))kernel_entry32)(nargc ,nargv, envp); + } else { + printf("Starting ELF64 kernel\n\r"); + ArcFlushAllCaches(); + _start64(nargc, nargv, envp, &kernel_entry64); + } + } else printf("Invalid kernel entry NULL\n\r"); /* Not likely to get back here in a functional state, |