From d8d06a21a57eaba8f0e5a25ab57315423be41842 Mon Sep 17 00:00:00 2001 From: codehelp Date: Thu, 22 Jul 2010 20:21:14 +0000 Subject: [PATCH] improve the completeness of the docs and corresponding examples git-svn-id: http://emdebian.org/svn/current@7333 563faec7-e20c-0410-992a-a66f704d0ccd --- cross/buildchroot-stable.conf | 4 +++ cross/buildchroot-testing.conf | 4 +++ cross/buildchroot.conf | 4 +++ cross/crosschroot-stable.conf | 4 +++ cross/crosschroot-testing.conf | 5 ++- cross/crosschroot.conf | 5 ++- doc/po/fr.po | 55 ++++++++++++++++---------------- doc/po/pt.po | 40 +++++++++++------------ examples/lenny.conf | 3 +- examples/multistrap-example.conf | 4 ++- examples/sid.conf | 3 +- examples/squeeze.conf | 3 +- pod/multistrap | 55 +++++++++++++++++++------------- 13 files changed, 114 insertions(+), 75 deletions(-) diff --git a/cross/buildchroot-stable.conf b/cross/buildchroot-stable.conf index 26cc005..978d1be 100644 --- a/cross/buildchroot-stable.conf +++ b/cross/buildchroot-stable.conf @@ -10,6 +10,9 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. @@ -24,3 +27,4 @@ packages=gcc-4.2-base dpkg-dev binutils-multiarch source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=stable +omitdebsrc=false diff --git a/cross/buildchroot-testing.conf b/cross/buildchroot-testing.conf index 74f9dc7..8c0a5b6 100644 --- a/cross/buildchroot-testing.conf +++ b/cross/buildchroot-testing.conf @@ -10,6 +10,9 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. @@ -23,3 +26,4 @@ packages=dpkg-dev binutils-multiarch source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=testing +omitdebsrc=false diff --git a/cross/buildchroot.conf b/cross/buildchroot.conf index 8dd8c0e..971c045 100644 --- a/cross/buildchroot.conf +++ b/cross/buildchroot.conf @@ -9,6 +9,9 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. @@ -23,3 +26,4 @@ packages=build-essential fakeroot source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=unstable +omitdebsrc=false diff --git a/cross/crosschroot-stable.conf b/cross/crosschroot-stable.conf index 85fac54..eb4d565 100644 --- a/cross/crosschroot-stable.conf +++ b/cross/crosschroot-stable.conf @@ -10,6 +10,9 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. +explicitsuite=false # extract all downloaded archives (default is true) unpack=true # the order of sections is not important. @@ -24,3 +27,4 @@ packages=gcc-4.2-base dpkg-dev binutils-multiarch source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=stable +omitdebsrc=false diff --git a/cross/crosschroot-testing.conf b/cross/crosschroot-testing.conf index 82b8b1a..d750328 100644 --- a/cross/crosschroot-testing.conf +++ b/cross/crosschroot-testing.conf @@ -10,7 +10,8 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false -# set apt to get particular packages from specified suites. +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. explicitsuite=true # extract all downloaded archives (default is true) unpack=true @@ -26,6 +27,7 @@ packages=gcc-4.2-base source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=stable +omitdebsrc=false # this is a duplicate if the suite is the same as the toolchain. [Debian] @@ -33,3 +35,4 @@ packages=dpkg-dev binutils-multiarch source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=testing +omitdebsrc=false diff --git a/cross/crosschroot.conf b/cross/crosschroot.conf index 919702c..fbb28eb 100644 --- a/cross/crosschroot.conf +++ b/cross/crosschroot.conf @@ -10,7 +10,8 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false -# set apt to get particular packages from specified suites. +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. explicitsuite=true # extract all downloaded archives (default is true) unpack=true @@ -26,6 +27,7 @@ packages=gcc-4.2-base source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=stable +omitdebsrc=false # this is a duplicate if the suite is the same as the toolchain. [Debian] @@ -33,3 +35,4 @@ packages=dpkg-dev binutils-multiarch build-essential dpkg-cross source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=unstable +omitdebsrc=false diff --git a/doc/po/fr.po b/doc/po/fr.po index 0095b53..9c26db7 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -7,17 +7,18 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.4\n" -"POT-Creation-Date: 2010-06-05 18:18+0200\n" +"POT-Creation-Date: 2010-07-20 23:00+0200\n" "PO-Revision-Date: 2010-05-30 11:24+0100\n" "Last-Translator: Alexandre Normand \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Bookmarks: 138,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" #. type: =head1 -#: pod/multistrap:3 device-table.pl:161 +#: pod/multistrap:3 device-table.pl:153 msgid "Name" msgstr "Nom" @@ -29,7 +30,7 @@ msgstr "" "capacité de gérer plusieurs dépôts" #. type: =head1 -#: pod/multistrap:7 device-table.pl:165 +#: pod/multistrap:7 device-table.pl:157 msgid "Synopsis" msgstr "Synopsis" @@ -48,7 +49,7 @@ msgstr "" "\n" #. type: =head1 -#: pod/multistrap:13 device-table.pl:170 +#: pod/multistrap:13 device-table.pl:162 msgid "Options" msgstr "Options" @@ -296,9 +297,9 @@ msgid "" "'Architecture' and 'directory' can be overridden on the command line. Some " "other general options also have command line options." msgstr "" -"« Architecture » et « directory » peuvent être modifiés en ligne de commande. " -"D'autres options générales peuvent aussi être indiquées en ligne de " -"commande, sauf debootstrap." +"« Architecture » et « directory » peuvent être modifiés en ligne de " +"commande. D'autres options générales peuvent aussi être indiquées en ligne " +"de commande, sauf debootstrap." #. type: =head1 #: pod/multistrap:97 @@ -370,8 +371,8 @@ msgid "" "'directory' specifies the top level directory where the bootstrap will be " "created - it is not packed into a .tgz once complete." msgstr "" -"« directory » indique le répertoire de haut niveau dans lequel le debootstrap " -"sera créé - il n'est pas empaqueté en un .tgz une fois complété." +"« directory » indique le répertoire de haut niveau dans lequel le " +"debootstrap sera créé - il n'est pas empaqueté en un .tgz une fois complété." #. type: textblock #: pod/multistrap:123 @@ -1240,14 +1241,14 @@ msgid "" msgstr "" #. type: textblock -#: device-table.pl:163 +#: device-table.pl:155 msgid "device-table.pl - parses simple device tables and passes to mknod" msgstr "" "device-table.pl - analyse des tables de périphériques simples et passe la " "sortie à mknod" #. type: verbatim -#: device-table.pl:167 +#: device-table.pl:159 #, fuzzy, no-wrap #| msgid "" #| " device-table.pl [-d DIR] [-f FILE]\n" @@ -1263,7 +1264,7 @@ msgstr "" "\n" #. type: textblock -#: device-table.pl:172 +#: device-table.pl:164 #, fuzzy #| msgid "" #| "By default, device-table.pl writes out the device nodes in the current " @@ -1277,7 +1278,7 @@ msgstr "" "écrire vers un autre emplacement." #. type: textblock -#: device-table.pl:175 +#: device-table.pl:167 #, fuzzy #| msgid "" #| "multistrap contains a default device-table file, use the file option to " @@ -1291,14 +1292,14 @@ msgstr "" "device-table.txt" #. type: textblock -#: device-table.pl:178 +#: device-table.pl:170 msgid "Use the dry-run option to see the commands that would be run." msgstr "" "Il faut utiliser l'option dry-run pour voir les commandes qui seraient " "exécutées." #. type: textblock -#: device-table.pl:180 +#: device-table.pl:172 #, fuzzy #| msgid "" #| "Device nodes needs fakeroot or another way to use root access. If device-" @@ -1316,7 +1317,7 @@ msgstr "" "no-fakeroot pour abandonner l'utilisation interne de fakeroot." #. type: textblock -#: device-table.pl:185 +#: device-table.pl:177 msgid "" "Note that fakeroot does not support changing the actual ownerships, for " "that, run the final packing into a tarball under fakeroot as well, or use " @@ -1324,12 +1325,12 @@ msgid "" msgstr "" #. type: =head1 -#: device-table.pl:189 +#: device-table.pl:181 msgid "Device table format" msgstr "" #. type: textblock -#: device-table.pl:191 +#: device-table.pl:183 msgid "" "Device table files are tab separated value files (TSV). All lines in the " "device table must have exactly 10 entries, each separated by a single tab, " @@ -1337,12 +1338,12 @@ msgid "" msgstr "" #. type: textblock -#: device-table.pl:195 +#: device-table.pl:187 msgid "Device table entries take the form of:" msgstr "" #. type: verbatim -#: device-table.pl:197 +#: device-table.pl:189 #, no-wrap msgid "" " \n" @@ -1350,12 +1351,12 @@ msgid "" msgstr "" #. type: textblock -#: device-table.pl:199 +#: device-table.pl:191 msgid "where name is the file name, type can be one of:" msgstr "" #. type: verbatim -#: device-table.pl:201 +#: device-table.pl:193 #, no-wrap msgid "" " f A regular file\n" @@ -1369,7 +1370,7 @@ msgid "" msgstr "" #. type: textblock -#: device-table.pl:209 +#: device-table.pl:201 msgid "" "symlinks and hardlinks are extensions to the device table, just for F, other device table parsers might not handle these types. The " @@ -1378,7 +1379,7 @@ msgid "" msgstr "" #. type: verbatim -#: device-table.pl:215 +#: device-table.pl:207 #, no-wrap msgid "" " /proc/self/fd/0 s /dev/stdin - - - - - - -\n" @@ -1386,7 +1387,7 @@ msgid "" msgstr "" #. type: textblock -#: device-table.pl:217 +#: device-table.pl:209 #, fuzzy #| msgid "See also: http://wiki.debian.org/Multistrap" msgid "See http://wiki.debian.org/DeviceTableScripting" @@ -2058,8 +2059,8 @@ msgstr "Voir aussi : http://wiki.debian.org/Multistrap" #~ "Adds \"export DEBCONF_USE_CDEBCONF=true\" to $TARGET/etc/profile for " #~ "cdebconf support." #~ msgstr "" -#~ "Ajoute « export DEBCONF_USE_CDEBCONF=true » au fichier $TARGET/etc/profile " -#~ "pour activer l'assistance de cdebconf." +#~ "Ajoute « export DEBCONF_USE_CDEBCONF=true » au fichier $TARGET/etc/" +#~ "profile pour activer l'assistance de cdebconf." #~ msgid "symlink_rcS" #~ msgstr "symlink_rcS" diff --git a/doc/po/pt.po b/doc/po/pt.po index 6a7e447..68e36b7 100644 --- a/doc/po/pt.po +++ b/doc/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: multistrap 2.1.4\n" -"POT-Creation-Date: 2010-06-01 23:46+0200\n" +"POT-Creation-Date: 2010-07-20 23:00+0200\n" "PO-Revision-Date: 2010-05-14 20:52+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -18,7 +18,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. type: =head1 -#: pod/multistrap:3 device-table.pl:161 +#: pod/multistrap:3 device-table.pl:153 msgid "Name" msgstr "Nome" @@ -29,7 +29,7 @@ msgstr "" "multistrap - substituto do debootstrap para suporte a múltiplos repositórios" #. type: =head1 -#: pod/multistrap:7 device-table.pl:165 +#: pod/multistrap:7 device-table.pl:157 msgid "Synopsis" msgstr "Sinopse" @@ -48,7 +48,7 @@ msgstr "" "\n" #. type: =head1 -#: pod/multistrap:13 device-table.pl:170 +#: pod/multistrap:13 device-table.pl:162 msgid "Options" msgstr "Opções" @@ -1158,14 +1158,14 @@ msgid "" msgstr "" #. type: textblock -#: device-table.pl:163 +#: device-table.pl:155 msgid "device-table.pl - parses simple device tables and passes to mknod" msgstr "" "device-table.pl - analisa tabelas de dispositivos simples e passa-o para o " "mknod" #. type: verbatim -#: device-table.pl:167 +#: device-table.pl:159 #, fuzzy, no-wrap msgid "" " device-table.pl [-n|--dry-run] [-d DIR] [-f FILE]\n" @@ -1177,7 +1177,7 @@ msgstr "" "\n" #. type: textblock -#: device-table.pl:172 +#: device-table.pl:164 #, fuzzy msgid "" "By default, F writes out the device nodes in the current " @@ -1188,7 +1188,7 @@ msgstr "" "sítio." #. type: textblock -#: device-table.pl:175 +#: device-table.pl:167 #, fuzzy msgid "" "multistrap contains a default device-table file, use the file option to " @@ -1198,12 +1198,12 @@ msgstr "" "para sobrepor a predefinição /usr/share/multistrap/device-table.txt" #. type: textblock -#: device-table.pl:178 +#: device-table.pl:170 msgid "Use the dry-run option to see the commands that would be run." msgstr "Use a opção dry-run para ver os comandos que seriam executados." #. type: textblock -#: device-table.pl:180 +#: device-table.pl:172 #, fuzzy msgid "" "Device nodes need fakeroot or another way to use root access. If F \n" @@ -1251,12 +1251,12 @@ msgid "" msgstr "" #. type: textblock -#: device-table.pl:199 +#: device-table.pl:191 msgid "where name is the file name, type can be one of:" msgstr "" #. type: verbatim -#: device-table.pl:201 +#: device-table.pl:193 #, no-wrap msgid "" " f A regular file\n" @@ -1270,7 +1270,7 @@ msgid "" msgstr "" #. type: textblock -#: device-table.pl:209 +#: device-table.pl:201 msgid "" "symlinks and hardlinks are extensions to the device table, just for F, other device table parsers might not handle these types. The " @@ -1279,7 +1279,7 @@ msgid "" msgstr "" #. type: verbatim -#: device-table.pl:215 +#: device-table.pl:207 #, no-wrap msgid "" " /proc/self/fd/0 s /dev/stdin - - - - - - -\n" @@ -1287,7 +1287,7 @@ msgid "" msgstr "" #. type: textblock -#: device-table.pl:217 +#: device-table.pl:209 #, fuzzy msgid "See http://wiki.debian.org/DeviceTableScripting" msgstr "Veja também: http://wiki.debian.org/Multistrap" diff --git a/examples/lenny.conf b/examples/lenny.conf index b064385..11b4744 100644 --- a/examples/lenny.conf +++ b/examples/lenny.conf @@ -9,7 +9,8 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false -# set apt to get particular packages from specified suites. +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. explicitsuite=false # extract all downloaded archives (default is true) unpack=true diff --git a/examples/multistrap-example.conf b/examples/multistrap-example.conf index aec41cf..b99e771 100644 --- a/examples/multistrap-example.conf +++ b/examples/multistrap-example.conf @@ -10,7 +10,8 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false -# set apt to get particular packages from specified suites. +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. explicitsuite=false # extract all downloaded archives (default is true) unpack=true @@ -25,3 +26,4 @@ packages= source=http://ftp.uk.debian.org/debian keyring=debian-archive-keyring suite=stable +omitdebsrc=false diff --git a/examples/sid.conf b/examples/sid.conf index 94122be..23e93f4 100644 --- a/examples/sid.conf +++ b/examples/sid.conf @@ -9,7 +9,8 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false -# set apt to get particular packages from specified suites. +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. explicitsuite=false # extract all downloaded archives (default is true) unpack=true diff --git a/examples/squeeze.conf b/examples/squeeze.conf index a0434e2..3bc60e4 100644 --- a/examples/squeeze.conf +++ b/examples/squeeze.conf @@ -9,7 +9,8 @@ cleanup=true # keyring packages listed in each debootstrap will # still be installed. noauth=false -# set apt to get particular packages from specified suites. +# whether to add the /suite to be explicit about where apt +# needs to look for packages. Default is false. explicitsuite=false # extract all downloaded archives (default is true) unpack=true diff --git a/pod/multistrap b/pod/multistrap index 0d08454..6da26d2 100644 --- a/pod/multistrap +++ b/pod/multistrap @@ -2,7 +2,7 @@ =head1 Name -multistrap - debootstrap replacement for multiple repository support +multistrap - multiple repository bootstraps =head1 Synopsis @@ -74,13 +74,20 @@ Example configuration: suite=lenny This will result in a completely normal debootstrap of Debian lenny from -the specified mirror, for armel in '/opt/multistrap/'. +the specified mirror, for armel in '/opt/multistrap/'. (This configuration +is retained in the package as F) Specify a package to extend the multistrap to include that package and -all dependencies. +all dependencies of that package. -Specify more bootstraps by adding new sections. Section names are used -in the bootstrap general option. +Specify more repositories for the bootstrap by adding new sections. +Section names need to be listed in the bootstrap general option for the +packages to be included in the bootstrap. + +Specify which repositories will be available to the final system at +boot by listing the section names in the aptsources general option, +e.g. to exclude some internal sources or when using a local mirror when +building the rootfs. Section names are case-insensitive. @@ -89,7 +96,8 @@ repositories, to use only the most recent and most suitable dependencies. Note that multistrap turns off Install-Recommends so if the multistrap needs a package that is only a Recommended dependency, the recommended package needs to be specified in the -packages line explicitly. +packages line explicitly. See C for +more information on getting specific packages from specific suites. 'Architecture' and 'directory' can be overridden on the command line. Some other general options also have command line options. @@ -147,7 +155,8 @@ a tarball. Note that multistrap ignores any unrecognised options in the config file - this allows for backwards-compatible behaviour as well as overloading the multistrap config files to support other tools -(like pbuilder). +(like pbuilder). Use the C<--simulate> option to see the combined +configuration settings. =head1 Section settings @@ -157,10 +166,10 @@ overloading the multistrap config files to support other tools keyring=debian-archive-keyring suite=lenny -The section name (in [] brackets) needs to be unique for this configuration -file and any configuration files which this file includes. Section names -are case insensitive (all comparisons happen after conversion to lower -case). +The section name (in [] brackets) needs to be unique for this +configuration file and any configuration files which this file +includes. Section names are case insensitive (all comparisons happen +after conversion to lower case). 'packages' is the list of packages to be added when this Section is listed in C. @@ -186,15 +195,15 @@ The codename (etch, lenny, squeeze, sid) does not change. To use authenticated apt repositories, multistrap either needs to be able to install an appropriate keyring package from the existing apt -sources *outside the multistrap environment* or have the relevant keys -already configured using apt-key *on the host system*. +sources B or have the relevant keys +already configured using apt-key B. If relevant packages exist, specify them in the 'keyring' option for each repository. multistrap will then check that apt has already installed this package so that the repository can be authenticated before any packages are downloaded from it. -Note that *all* repositories to be used with multistrap must be +Note that B repositories to be used with multistrap must be authenticated or apt will fail. Similarly, secure apt can only be disabled for all repositories (by using the --no-auth command line option or setting the general noauth option in the configuration @@ -213,7 +222,7 @@ running multistrap itself. multistrap is stateless - if the directory exists, it will simply proceed as normal and apt will try to pick up where it left off. -=head1 Configuration +=head1 Root Filesystem Configuration multistrap unpacks the downloaded packages but other stages of system configuration are not attempted. Examples include: @@ -228,13 +237,11 @@ system configuration are not attempted. Examples include: /etc/init.d /etc/dhcp3 -Any device-specific device nodes will also need to be created -using MAKEDEV. - -As an alternative, multistrap includes a device-table.pl helper -script that can work around some of the issues with MAKEDEV. -device-table.pl requires a device table file along the lines of -the one in the mtd-utils source package. +Any device-specific device nodes will also need to be created using +MAKEDEV or C - a helper script that can work around +some of the issues with MAKEDEV. F requires a device +table file along the lines of the one in the mtd-utils source package. +See F Once multistrap has successfully created the basic file and directory layout, other device-specific scripts are needed before @@ -369,6 +376,10 @@ rootfs. Only the packages specified manually in the configuration files will be used in the calculations - dependencies of those packages will be added but no others. +Packages with Priority: important or standard are never included by +C unless specifically included in a C option in +a section specified in the C general option. + =head1 Recommends behaviour The Debian default behaviour after the Lenny release was to consider