diff options
| -rwxr-xr-x | functions/defaults.sh | 7 | ||||
| -rw-r--r-- | manpages/de/lb_config.de.1 | 18 | ||||
| -rw-r--r-- | manpages/de/live-build.de.7 | 2 | ||||
| -rw-r--r-- | manpages/en/lb_config.1 | 8 | ||||
| -rw-r--r-- | manpages/en/live-build.7 | 2 | ||||
| -rw-r--r-- | manpages/po/de/lb_config.1.po | 41 | ||||
| -rw-r--r-- | manpages/po/de/live-build.7.po | 85 | ||||
| -rw-r--r-- | manpages/pot/lb_config.1.pot | 41 | ||||
| -rw-r--r-- | manpages/pot/live-build.7.pot | 85 | ||||
| -rwxr-xr-x | scripts/build/binary | 1 | ||||
| -rwxr-xr-x | scripts/build/binary_iso | 7 | ||||
| -rwxr-xr-x | scripts/build/binary_yaboot | 284 | ||||
| -rwxr-xr-x | scripts/build/config | 2 | ||||
| -rwxr-xr-x | scripts/build/source_debian | 4 | ||||
| -rw-r--r-- | templates/yaboot/boot.msg | 22 | ||||
| -rw-r--r-- | templates/yaboot/hfs.map | 12 | ||||
| -rw-r--r-- | templates/yaboot/ofboot.b | 64 | ||||
| -rw-r--r-- | templates/yaboot/pegasos | 90 | ||||
| -rw-r--r-- | templates/yaboot/yaboot.conf | 6 |
19 files changed, 129 insertions, 652 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 17ddc164d..eb8b977d8 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -849,10 +849,6 @@ Set_defaults () amd64|i386) LB_BOOTLOADER="syslinux" ;; - - powerpc) - LB_BOOTLOADER="yaboot" - ;; esac fi @@ -1220,9 +1216,8 @@ Check_defaults () case "${LIVE_IMAGE_TYPE}" in hdd*) - # grub or yaboot + hdd case "${LB_BOOTLOADER}" in - grub|yaboot) + grub) Echo_error "You have selected a combination of bootloader and image type that is currently not supported by live-build. Please use either another bootloader or a different image type." exit 1 ;; diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index 8c14ed89a..ed8960020 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -44,7 +44,7 @@ .br [\fB\-\-bootappend\-live\fP \fIPARAMETER\fP|\fI"PARAMETERS"\fP] .br - [\fB\-\-bootloader\fP grub|syslinux|yaboot] + [\fB\-\-bootloader\fP grub|syslinux] .br [\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap] .br @@ -329,7 +329,7 @@ sets boot parameters specific to debian\-installer, if included. sets boot parameters specific to debian\-live. A complete list of boot parameters can be found in the \fIlive\-boot\fP(7) and \fIlive\-config\fP(7) manual pages. -.IP "\fB\-\-bootloader\fP grub|syslinux|yaboot" 4 +.IP "\fB\-\-bootloader\fP grub|syslinux" 4 defines which bootloader is beeing used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more @@ -337,7 +337,7 @@ precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fP will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and -i386, the default is syslinux. yaboot is only used on powerpc. +i386, the default is syslinux. .IP "\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap" 4 defines which program is used to bootstrap the debian chroot, default is debootstrap. @@ -381,12 +381,12 @@ defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non\-bootable images if the host systems version -of the required tools (mainly these are the bootloaders such as syslinux, -grub and yaboot, and the auxilliary tools such as dosfstools, xorriso, -squashfs\-tools and others) do not \fBexactely\fP match what is present at -build\-time in the target distribution. Never do disable this option unless -you are \fBexactely\fP sure what you are doing and have \fBcompletely\fP\fI -understood its consequences.\fP +of the required tools (mainly these are the bootloaders such as syslinux and +grub, and the auxilliary tools such as dosfstools, xorriso, squashfs\-tools +and others) do not \fBexactely\fP match what is present at build\-time in the +target distribution. Never do disable this option unless you are \fBexactely\fP +sure what you are doing and have \fBcompletely\fP\fI understood its +consequences.\fP .IP "\fB\-\-chroot\-filesystem\fP ext2|ext3|ext4|squashfs|jffs2|none" 4 defines which filesystem type should be used for the root filesystem image. If you use none, then no filesystem image is created and the root diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7 index 472cc121d..f7107a1b7 100644 --- a/manpages/de/live-build.de.7 +++ b/manpages/de/live-build.de.7 @@ -203,8 +203,6 @@ build harddisk binary image build binary hdd image .IP \fBlb_binary_win32\-loader\fP(1) 4 installs win32\-loader into binary -.IP \fBlb_binary_yaboot\fP(1) 4 -installs yaboot into binary .SS "Source commands" .IP \fBlb_source_debian\fP(1) 4 download sources diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index df60bb1d2..ca11f6e73 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -39,7 +39,7 @@ .br [\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR] .br - [\fB\-\-bootloader\fR grub|syslinux|yaboot] + [\fB\-\-bootloader\fR grub|syslinux] .br [\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap] .br @@ -273,8 +273,8 @@ defines the filesystem to be used in the image type. This only has an effect if sets boot parameters specific to debian\-installer, if included. .IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4 sets boot parameters specific to debian\-live. A complete list of boot parameters can be found in the \fIlive\-boot\fR(7) and \fIlive\-config\fR(7) manual pages. -.IP "\fB\-\-bootloader\fR grub|syslinux|yaboot" 4 -defines which bootloader is beeing used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and i386, the default is syslinux. yaboot is only used on powerpc. +.IP "\fB\-\-bootloader\fR grub|syslinux" 4 +defines which bootloader is beeing used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and i386, the default is syslinux. .IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap" 4 defines which program is used to bootstrap the debian chroot, default is debootstrap. .IP "\fB\-\-cache\fR true|false" 4 @@ -292,7 +292,7 @@ defines the compression program to be used to compress tarballs. Defaults to gzi .IP "\fB\-\-config\fR \fIGIT_URL\fR::\fIGIT_ID\fR" 4 allows to bootstrap a config tree from a git repositories, optionally appended by a Git Id (branch, commit, tag, etc.). .IP "\fB\-\-build\-with\-chroot\fR true|false" 4 -defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences. +defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux and grub, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences. .IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|jffs2|none" 4 defines which filesystem type should be used for the root filesystem image. If you use none, then no filesystem image is created and the root filesystem content is copied on the binary image filesystem as flat files. Depending on what binary filesystem you have choosen, it may not be possible to build with such a plain root filesystem, e.g. fat16/fat32 will not work as linux does not support to run directly on them. .IP "\fB\-\-clean\fR" 4 diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 440325350..0ca81dd0b 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -180,8 +180,6 @@ build harddisk binary image build binary hdd image .IP "\fBlb_binary_win32\-loader\fR(1)" 4 installs win32\-loader into binary -.IP "\fBlb_binary_yaboot\fR(1)" 4 -installs yaboot into binary .SS Source commands .IP "\fBlb_source_debian\fR(1)" 4 download sources diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index b64601ecc..1b008a023 100644 --- a/manpages/po/de/lb_config.1.po +++ b/manpages/po/de/lb_config.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 4.0~a10-1\n" -"POT-Creation-Date: 2013-02-15 08:59+0100\n" +"POT-Creation-Date: 2013-02-15 12:11+0100\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n" "Last-Translator: Daniel Baumann <daniel@debian.org>\n" "Language-Team: none\n" @@ -82,7 +82,7 @@ msgstr "" #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:482 en/lb_source.1:17 -#: en/lb_testroot.1:21 en/live-build.7:219 +#: en/lb_testroot.1:21 en/live-build.7:217 #, no-wrap msgid "FILES" msgstr "" @@ -90,7 +90,7 @@ msgstr "" #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:489 en/lb_source.1:20 -#: en/lb_testroot.1:24 en/live-build.7:223 +#: en/lb_testroot.1:24 en/live-build.7:221 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -105,14 +105,14 @@ msgstr "" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:497 en/lb_source.1:24 -#: en/lb_testroot.1:28 en/live-build.7:229 +#: en/lb_testroot.1:28 en/live-build.7:227 msgid "This program is a part of live-build." msgstr "" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:498 en/lb_source.1:25 -#: en/lb_testroot.1:29 en/live-build.7:230 +#: en/lb_testroot.1:29 en/live-build.7:228 #, no-wrap msgid "HOMEPAGE" msgstr "" @@ -120,7 +120,7 @@ msgstr "" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:500 en/lb_source.1:27 -#: en/lb_testroot.1:31 en/live-build.7:232 +#: en/lb_testroot.1:31 en/live-build.7:230 msgid "" "More information about live-build and the Debian Live project can be found " "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -130,7 +130,7 @@ msgstr "" #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:501 en/lb_source.1:28 -#: en/lb_testroot.1:32 en/live-build.7:233 +#: en/lb_testroot.1:32 en/live-build.7:231 #, no-wrap msgid "BUGS" msgstr "" @@ -138,7 +138,7 @@ msgstr "" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:503 en/lb_source.1:30 -#: en/lb_testroot.1:34 en/live-build.7:235 +#: en/lb_testroot.1:34 en/live-build.7:233 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -149,7 +149,7 @@ msgstr "" #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:504 en/lb_source.1:31 -#: en/lb_testroot.1:35 en/live-build.7:236 +#: en/lb_testroot.1:35 en/live-build.7:234 #, no-wrap msgid "AUTHOR" msgstr "" @@ -157,7 +157,7 @@ msgstr "" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:505 en/lb_source.1:32 -#: en/lb_testroot.1:36 en/live-build.7:237 +#: en/lb_testroot.1:36 en/live-build.7:235 msgid "" "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." @@ -256,7 +256,7 @@ msgstr "" #. type: Plain text #: en/lb_config.1:43 -msgid " [B<--bootloader> grub|syslinux|yaboot]" +msgid " [B<--bootloader> grub|syslinux]" msgstr "" #. type: Plain text @@ -991,7 +991,7 @@ msgstr "" #. type: IP #: en/lb_config.1:276 #, no-wrap -msgid "B<--bootloader> grub|syslinux|yaboot" +msgid "B<--bootloader> grub|syslinux" msgstr "" #. type: Plain text @@ -1004,7 +1004,7 @@ msgid "" "images types and bootloaders may be possible but live-build does not support " "them yet. B<lb config> will fail to create such a not yet supported " "configuration and give a explanation about it. For hdd images on amd64 and " -"i386, the default is syslinux. yaboot is only used on powerpc." +"i386, the default is syslinux." msgstr "" #. type: IP @@ -1137,12 +1137,11 @@ msgid "" "build the binary image or not by using and including the host systems tools. " "This is a very dangerous option, using the tools of the host system can lead " "to tainted and even non-bootable images if the host systems version of the " -"required tools (mainly these are the bootloaders such as syslinux, grub and " -"yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools " -"and others) do not B<exactely> match what is present at build-time in the " -"target distribution. Never do disable this option unless you are B<exactely> " -"sure what you are doing and have B<completely>I< understood its consequences." -">" +"required tools (mainly these are the bootloaders such as syslinux and grub, " +"and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and " +"others) do not B<exactely> match what is present at build-time in the target " +"distribution. Never do disable this option unless you are B<exactely> sure " +"what you are doing and have B<completely>I< understood its consequences.>" msgstr "" #. type: IP @@ -2402,11 +2401,11 @@ msgid "" msgstr "" #. type: Plain text -#: en/lb_config.1:493 en/live-build.7:225 +#: en/lb_config.1:493 en/live-build.7:223 msgid "I<live-boot>(7)" msgstr "" #. type: Plain text -#: en/lb_config.1:495 en/live-build.7:227 +#: en/lb_config.1:495 en/live-build.7:225 msgid "I<live-config>(7)" msgstr "" diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po index 7b47532df..f5e57c27c 100644 --- a/manpages/po/de/live-build.7.po +++ b/manpages/po/de/live-build.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build 4.0~a10-1\n" -"POT-Creation-Date: 2013-02-15 12:10+0100\n" +"POT-Creation-Date: 2013-02-15 12:12+0100\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n" "Last-Translator: Daniel Baumann <daniel@debian.org>\n" "Language-Team: none\n" @@ -82,7 +82,7 @@ msgstr "" #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:482 en/lb_source.1:17 -#: en/lb_testroot.1:21 en/live-build.7:217 +#: en/lb_testroot.1:21 en/live-build.7:215 #, no-wrap msgid "FILES" msgstr "" @@ -90,7 +90,7 @@ msgstr "" #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:489 en/lb_source.1:20 -#: en/lb_testroot.1:24 en/live-build.7:221 +#: en/lb_testroot.1:24 en/live-build.7:219 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -98,14 +98,14 @@ msgstr "" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:497 en/lb_source.1:24 -#: en/lb_testroot.1:28 en/live-build.7:227 +#: en/lb_testroot.1:28 en/live-build.7:225 msgid "This program is a part of live-build." msgstr "" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:498 en/lb_source.1:25 -#: en/lb_testroot.1:29 en/live-build.7:228 +#: en/lb_testroot.1:29 en/live-build.7:226 #, no-wrap msgid "HOMEPAGE" msgstr "" @@ -113,7 +113,7 @@ msgstr "" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:500 en/lb_source.1:27 -#: en/lb_testroot.1:31 en/live-build.7:230 +#: en/lb_testroot.1:31 en/live-build.7:228 msgid "" "More information about live-build and the Debian Live project can be found " "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -123,7 +123,7 @@ msgstr "" #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:501 en/lb_source.1:28 -#: en/lb_testroot.1:32 en/live-build.7:231 +#: en/lb_testroot.1:32 en/live-build.7:229 #, no-wrap msgid "BUGS" msgstr "" @@ -131,7 +131,7 @@ msgstr "" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:503 en/lb_source.1:30 -#: en/lb_testroot.1:34 en/live-build.7:233 +#: en/lb_testroot.1:34 en/live-build.7:231 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -142,7 +142,7 @@ msgstr "" #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:504 en/lb_source.1:31 -#: en/lb_testroot.1:35 en/live-build.7:234 +#: en/lb_testroot.1:35 en/live-build.7:232 #, no-wrap msgid "AUTHOR" msgstr "" @@ -150,7 +150,7 @@ msgstr "" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:505 en/lb_source.1:32 -#: en/lb_testroot.1:36 en/live-build.7:235 +#: en/lb_testroot.1:36 en/live-build.7:233 msgid "" "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." @@ -181,12 +181,12 @@ msgid "B<--verbose>" msgstr "" #. type: Plain text -#: en/lb_config.1:493 en/live-build.7:223 +#: en/lb_config.1:493 en/live-build.7:221 msgid "I<live-boot>(7)" msgstr "" #. type: Plain text -#: en/lb_config.1:495 en/live-build.7:225 +#: en/lb_config.1:495 en/live-build.7:223 msgid "I<live-config>(7)" msgstr "" @@ -1047,121 +1047,110 @@ msgstr "" msgid "installs win32-loader into binary" msgstr "" -#. type: IP -#: en/live-build.7:183 -#, no-wrap -msgid "B<lb_binary_yaboot>(1)" -msgstr "" - -#. type: Plain text -#: en/live-build.7:185 -msgid "installs yaboot into binary" -msgstr "" - #. type: SS -#: en/live-build.7:185 +#: en/live-build.7:183 #, no-wrap msgid "Source commands" msgstr "" #. type: IP -#: en/live-build.7:186 +#: en/live-build.7:184 #, no-wrap msgid "B<lb_source_debian>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:188 +#: en/live-build.7:186 msgid "download sources" msgstr "" #. type: IP -#: en/live-build.7:188 +#: en/live-build.7:186 #, no-wrap msgid "B<lb_source_debian-live>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:190 +#: en/live-build.7:188 msgid "copy debian-live config into source" msgstr "" #. type: IP -#: en/live-build.7:190 +#: en/live-build.7:188 #, no-wrap msgid "B<lb_source_disk>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:192 +#: en/live-build.7:190 msgid "install disk information into source" msgstr "" #. type: IP -#: en/live-build.7:192 +#: en/live-build.7:190 #, no-wrap msgid "B<lb_source_iso>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:194 +#: en/live-build.7:192 msgid "build iso source image" msgstr "" #. type: IP -#: en/live-build.7:194 +#: en/live-build.7:192 #, no-wrap msgid "B<lb_source_checksums>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:196 +#: en/live-build.7:194 msgid "create source checksums (md5, sha1, and/or sha256)" msgstr "" #. type: IP -#: en/live-build.7:196 +#: en/live-build.7:194 #, no-wrap msgid "B<lb_source_net>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:198 +#: en/live-build.7:196 msgid "build source net image" msgstr "" #. type: IP -#: en/live-build.7:198 +#: en/live-build.7:196 #, no-wrap msgid "B<lb_source_tar>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:200 +#: en/live-build.7:198 msgid "build source tarball" msgstr "" #. type: IP -#: en/live-build.7:200 +#: en/live-build.7:198 #, no-wrap msgid "B<lb_source_hdd>(1)" msgstr "" #. FIXME #. type: Plain text -#: en/live-build.7:203 +#: en/live-build.7:201 msgid "build source hdd image" msgstr "" #. type: SH -#: en/live-build.7:204 +#: en/live-build.7:202 #, no-wrap msgid "CONFIG FILES" msgstr "" #. FIXME #. type: Plain text -#: en/live-build.7:207 +#: en/live-build.7:205 msgid "" "Many live-build commands make use of files in the I<config/> directory to " "control what they do. Besides the common I<config/common>, which is used by " @@ -1173,7 +1162,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-build.7:209 +#: en/live-build.7:207 msgid "" "For example, lb_bootstrap_debootstrap uses files named config/bootstrap and " "config/bootstrap_debootstrap to read the options it will use. See the man " @@ -1184,7 +1173,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-build.7:211 +#: en/live-build.7:209 msgid "" "Note that live-build will respect environment variables which are present in " "the context of the shell it is running. If variables can be read from config " @@ -1195,7 +1184,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-build.7:213 +#: en/live-build.7:211 msgid "" "In some rare cases, you may want to have different versions of these files " "for different architectures or distributions. If files named config/stage." @@ -1208,7 +1197,7 @@ msgstr "" #. FIXME #. type: Plain text -#: en/live-build.7:216 +#: en/live-build.7:214 msgid "" "All config files are shell scripts which are sourced by a live-build " "program. That means they have to follow the normal shell syntax. You can " @@ -1216,13 +1205,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-build.7:218 +#: en/live-build.7:216 #, no-wrap msgid "B</etc/live/build.conf>" msgstr "" #. type: IP -#: en/live-build.7:219 +#: en/live-build.7:217 #, no-wrap msgid "B</etc/live/build/*>" msgstr "" diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot index 8269dcd08..ee6c6b4f9 100644 --- a/manpages/pot/lb_config.1.pot +++ b/manpages/pot/lb_config.1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2013-02-15 08:59+0100\n" +"POT-Creation-Date: 2013-02-15 12:11+0100\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" @@ -83,7 +83,7 @@ msgstr "" #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:482 en/lb_source.1:17 -#: en/lb_testroot.1:21 en/live-build.7:219 +#: en/lb_testroot.1:21 en/live-build.7:217 #, no-wrap msgid "FILES" msgstr "" @@ -91,7 +91,7 @@ msgstr "" #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:489 en/lb_source.1:20 -#: en/lb_testroot.1:24 en/live-build.7:223 +#: en/lb_testroot.1:24 en/live-build.7:221 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -106,14 +106,14 @@ msgstr "" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:497 en/lb_source.1:24 -#: en/lb_testroot.1:28 en/live-build.7:229 +#: en/lb_testroot.1:28 en/live-build.7:227 msgid "This program is a part of live-build." msgstr "" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:498 en/lb_source.1:25 -#: en/lb_testroot.1:29 en/live-build.7:230 +#: en/lb_testroot.1:29 en/live-build.7:228 #, no-wrap msgid "HOMEPAGE" msgstr "" @@ -121,7 +121,7 @@ msgstr "" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:500 en/lb_source.1:27 -#: en/lb_testroot.1:31 en/live-build.7:232 +#: en/lb_testroot.1:31 en/live-build.7:230 msgid "" "More information about live-build and the Debian Live project can be found " "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -131,7 +131,7 @@ msgstr "" #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:501 en/lb_source.1:28 -#: en/lb_testroot.1:32 en/live-build.7:233 +#: en/lb_testroot.1:32 en/live-build.7:231 #, no-wrap msgid "BUGS" msgstr "" @@ -139,7 +139,7 @@ msgstr "" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:503 en/lb_source.1:30 -#: en/lb_testroot.1:34 en/live-build.7:235 +#: en/lb_testroot.1:34 en/live-build.7:233 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -150,7 +150,7 @@ msgstr "" #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:504 en/lb_source.1:31 -#: en/lb_testroot.1:35 en/live-build.7:236 +#: en/lb_testroot.1:35 en/live-build.7:234 #, no-wrap msgid "AUTHOR" msgstr "" @@ -158,7 +158,7 @@ msgstr "" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:505 en/lb_source.1:32 -#: en/lb_testroot.1:36 en/live-build.7:237 +#: en/lb_testroot.1:36 en/live-build.7:235 msgid "" "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." @@ -257,7 +257,7 @@ msgstr "" #. type: Plain text #: en/lb_config.1:43 -msgid " [B<--bootloader> grub|syslinux|yaboot]" +msgid " [B<--bootloader> grub|syslinux]" msgstr "" #. type: Plain text @@ -992,7 +992,7 @@ msgstr "" #. type: IP #: en/lb_config.1:276 #, no-wrap -msgid "B<--bootloader> grub|syslinux|yaboot" +msgid "B<--bootloader> grub|syslinux" msgstr "" #. type: Plain text @@ -1005,7 +1005,7 @@ msgid "" "images types and bootloaders may be possible but live-build does not support " "them yet. B<lb config> will fail to create such a not yet supported " "configuration and give a explanation about it. For hdd images on amd64 and " -"i386, the default is syslinux. yaboot is only used on powerpc." +"i386, the default is syslinux." msgstr "" #. type: IP @@ -1138,12 +1138,11 @@ msgid "" "build the binary image or not by using and including the host systems tools. " "This is a very dangerous option, using the tools of the host system can lead " "to tainted and even non-bootable images if the host systems version of the " -"required tools (mainly these are the bootloaders such as syslinux, grub and " -"yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools " -"and others) do not B<exactely> match what is present at build-time in the " -"target distribution. Never do disable this option unless you are B<exactely> " -"sure what you are doing and have B<completely>I< understood its consequences." -">" +"required tools (mainly these are the bootloaders such as syslinux and grub, " +"and the auxilliary tools such as dosfstools, xorriso, squashfs-tools and " +"others) do not B<exactely> match what is present at build-time in the target " +"distribution. Never do disable this option unless you are B<exactely> sure " +"what you are doing and have B<completely>I< understood its consequences.>" msgstr "" #. type: IP @@ -2403,11 +2402,11 @@ msgid "" msgstr "" #. type: Plain text -#: en/lb_config.1:493 en/live-build.7:225 +#: en/lb_config.1:493 en/live-build.7:223 msgid "I<live-boot>(7)" msgstr "" #. type: Plain text -#: en/lb_config.1:495 en/live-build.7:227 +#: en/lb_config.1:495 en/live-build.7:225 msgid "I<live-config>(7)" msgstr "" diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot index 0f7d7354b..3daf99668 100644 --- a/manpages/pot/live-build.7.pot +++ b/manpages/pot/live-build.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build VERSION\n" -"POT-Creation-Date: 2013-02-15 12:10+0100\n" +"POT-Creation-Date: 2013-02-15 12:12+0100\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" @@ -83,7 +83,7 @@ msgstr "" #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 #: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:482 en/lb_source.1:17 -#: en/lb_testroot.1:21 en/live-build.7:217 +#: en/lb_testroot.1:21 en/live-build.7:215 #, no-wrap msgid "FILES" msgstr "" @@ -91,7 +91,7 @@ msgstr "" #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 #: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:489 en/lb_source.1:20 -#: en/lb_testroot.1:24 en/live-build.7:221 +#: en/lb_testroot.1:24 en/live-build.7:219 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -99,14 +99,14 @@ msgstr "" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 #: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:497 en/lb_source.1:24 -#: en/lb_testroot.1:28 en/live-build.7:227 +#: en/lb_testroot.1:28 en/live-build.7:225 msgid "This program is a part of live-build." msgstr "" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 #: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:498 en/lb_source.1:25 -#: en/lb_testroot.1:29 en/live-build.7:228 +#: en/lb_testroot.1:29 en/live-build.7:226 #, no-wrap msgid "HOMEPAGE" msgstr "" @@ -114,7 +114,7 @@ msgstr "" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 #: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:500 en/lb_source.1:27 -#: en/lb_testroot.1:31 en/live-build.7:230 +#: en/lb_testroot.1:31 en/live-build.7:228 msgid "" "More information about live-build and the Debian Live project can be found " "on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at " @@ -124,7 +124,7 @@ msgstr "" #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 #: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:501 en/lb_source.1:28 -#: en/lb_testroot.1:32 en/live-build.7:231 +#: en/lb_testroot.1:32 en/live-build.7:229 #, no-wrap msgid "BUGS" msgstr "" @@ -132,7 +132,7 @@ msgstr "" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 #: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:503 en/lb_source.1:30 -#: en/lb_testroot.1:34 en/live-build.7:233 +#: en/lb_testroot.1:34 en/live-build.7:231 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by " @@ -143,7 +143,7 @@ msgstr "" #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 #: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:504 en/lb_source.1:31 -#: en/lb_testroot.1:35 en/live-build.7:234 +#: en/lb_testroot.1:35 en/live-build.7:232 #, no-wrap msgid "AUTHOR" msgstr "" @@ -151,7 +151,7 @@ msgstr "" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 #: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:505 en/lb_source.1:32 -#: en/lb_testroot.1:36 en/live-build.7:235 +#: en/lb_testroot.1:36 en/live-build.7:233 msgid "" "live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for " "the Debian project." @@ -182,12 +182,12 @@ msgid "B<--verbose>" msgstr "" #. type: Plain text -#: en/lb_config.1:493 en/live-build.7:223 +#: en/lb_config.1:493 en/live-build.7:221 msgid "I<live-boot>(7)" msgstr "" #. type: Plain text -#: en/lb_config.1:495 en/live-build.7:225 +#: en/lb_config.1:495 en/live-build.7:223 msgid "I<live-config>(7)" msgstr "" @@ -1048,121 +1048,110 @@ msgstr "" msgid "installs win32-loader into binary" msgstr "" -#. type: IP -#: en/live-build.7:183 -#, no-wrap -msgid "B<lb_binary_yaboot>(1)" -msgstr "" - -#. type: Plain text -#: en/live-build.7:185 -msgid "installs yaboot into binary" -msgstr "" - #. type: SS -#: en/live-build.7:185 +#: en/live-build.7:183 #, no-wrap msgid "Source commands" msgstr "" #. type: IP -#: en/live-build.7:186 +#: en/live-build.7:184 #, no-wrap msgid "B<lb_source_debian>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:188 +#: en/live-build.7:186 msgid "download sources" msgstr "" #. type: IP -#: en/live-build.7:188 +#: en/live-build.7:186 #, no-wrap msgid "B<lb_source_debian-live>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:190 +#: en/live-build.7:188 msgid "copy debian-live config into source" msgstr "" #. type: IP -#: en/live-build.7:190 +#: en/live-build.7:188 #, no-wrap msgid "B<lb_source_disk>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:192 +#: en/live-build.7:190 msgid "install disk information into source" msgstr "" #. type: IP -#: en/live-build.7:192 +#: en/live-build.7:190 #, no-wrap msgid "B<lb_source_iso>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:194 +#: en/live-build.7:192 msgid "build iso source image" msgstr "" #. type: IP -#: en/live-build.7:194 +#: en/live-build.7:192 #, no-wrap msgid "B<lb_source_checksums>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:196 +#: en/live-build.7:194 msgid "create source checksums (md5, sha1, and/or sha256)" msgstr "" #. type: IP -#: en/live-build.7:196 +#: en/live-build.7:194 #, no-wrap msgid "B<lb_source_net>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:198 +#: en/live-build.7:196 msgid "build source net image" msgstr "" #. type: IP -#: en/live-build.7:198 +#: en/live-build.7:196 #, no-wrap msgid "B<lb_source_tar>(1)" msgstr "" #. type: Plain text -#: en/live-build.7:200 +#: en/live-build.7:198 msgid "build source tarball" msgstr "" #. type: IP -#: en/live-build.7:200 +#: en/live-build.7:198 #, no-wrap msgid "B<lb_source_hdd>(1)" msgstr "" #. FIXME #. type: Plain text -#: en/live-build.7:203 +#: en/live-build.7:201 msgid "build source hdd image" msgstr "" #. type: SH -#: en/live-build.7:204 +#: en/live-build.7:202 #, no-wrap msgid "CONFIG FILES" msgstr "" #. FIXME #. type: Plain text -#: en/live-build.7:207 +#: en/live-build.7:205 msgid "" "Many live-build commands make use of files in the I<config/> directory to " "control what they do. Besides the common I<config/common>, which is used by " @@ -1174,7 +1163,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-build.7:209 +#: en/live-build.7:207 msgid "" "For example, lb_bootstrap_debootstrap uses files named config/bootstrap and " "config/bootstrap_debootstrap to read the options it will use. See the man " @@ -1185,7 +1174,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-build.7:211 +#: en/live-build.7:209 msgid "" "Note that live-build will respect environment variables which are present in " "the context of the shell it is running. If variables can be read from config " @@ -1196,7 +1185,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-build.7:213 +#: en/live-build.7:211 msgid "" "In some rare cases, you may want to have different versions of these files " "for different architectures or distributions. If files named config/stage." @@ -1209,7 +1198,7 @@ msgstr "" #. FIXME #. type: Plain text -#: en/live-build.7:216 +#: en/live-build.7:214 msgid "" "All config files are shell scripts which are sourced by a live-build " "program. That means they have to follow the normal shell syntax. You can " @@ -1217,13 +1206,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-build.7:218 +#: en/live-build.7:216 #, no-wrap msgid "B</etc/live/build.conf>" msgstr "" #. type: IP -#: en/live-build.7:219 +#: en/live-build.7:217 #, no-wrap msgid "B</etc/live/build/*>" msgstr "" diff --git a/scripts/build/binary b/scripts/build/binary index 2d970c426..52125766d 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -65,7 +65,6 @@ lb binary_memtest ${@} lb binary_grub ${@} lb binary_grub2 ${@} lb binary_syslinux ${@} -lb binary_yaboot ${@} lb binary_disk ${@} lb binary_loadlin ${@} lb binary_win32-loader ${@} diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 5df1f3d6a..10755ebe1 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -141,13 +141,6 @@ case "${LB_BOOTLOADER}" in XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" ;; - yaboot) - XORRISO_OPTIONS="${XORRISO_OPTIONS} --iso-level 2 --netatalk -hfs -probe -map" - XORRISO_OPTIONS="${XORRISO_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop" - XORRISO_OPTIONS="${XORRISO_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc" - XORRISO_EXCLUDE="yaboot/hfs.map" - ;; - *) Echo_warning "Bootloader on your architecture not yet supported by live-build." Echo_warning "This will produce a most likely not bootable image (Continuing in 5 seconds)." diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot deleted file mode 100755 index 5ad1478db..000000000 --- a/scripts/build/binary_yaboot +++ /dev/null @@ -1,284 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2013 Daniel Baumann <daniel@debian.org> -## -## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. -## This is free software, and you are welcome to redistribute it -## under certain conditions; see COPYING for details. - - -set -e - -# Including common functions -[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'installs yaboot into binary')" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source -Set_defaults - -if [ "${LB_BOOTLOADER}" != "yaboot" ] -then - exit 0 -fi - -Echo_message "Begin installing yaboot..." - -# Requiring stage file -Require_stagefile .build/config .build/bootstrap - -# Checking stage file -Check_stagefile .build/binary_yaboot - -# Checking yaboot templates -Check_templates yaboot - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Check architecture -Check_architectures powerpc ppc64 -Check_crossarchitectures - -# Checking depends -Check_package chroot/usr/lib/yaboot/yaboot yaboot - -# Restoring cache -Restore_cache cache/packages.binary - -# Installing depends -Install_package - -# Local functions -Yaboot_live_entry () -{ - LABEL="${1}" - KERNEL="${2}" - INITRD="${3}" - APPEND="${4}" - - DIRECTORY="/$(basename ${DESTDIR_LIVE})" - - LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n" - LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n" - LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n" - LINUX_LIVE="${LINUX_LIVE}\tappend=\"${INITFS:+boot=${INITFS} }config LB_BOOTAPPEND_LIVE ${APPEND}\"\n" - LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n" -} - -Yaboot_install_entry () -{ - LABEL="${1}" - KERNEL="${2}" - INITRD="${3}" - APPEND="${4}" - - DIRECTORY="/$(basename ${DESTDIR_INSTALL})" - - QAPPEND="quiet" - - for TYPE in Install Expert Rescue Auto - do - case "${TYPE}" in - Install) - TAPPEND="${APPEND} ${QAPPEND}" - ;; - - Expert) - TAPPEND="priority=low ${APPEND}" - ;; - - Rescue) - TAPPEND="rescue/enable=true ${APPEND} ${QAPPEND}" - ;; - - Auto) - TAPPEND="auto=true priority=critical ${APPEND} ${QAPPEND}" - ;; - esac - - case "${LABEL}" in - Text) - TYPE_SUFFIX="" - ;; - GUI) - TYPE_SUFFIX="gui" - ;; - esac - - LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n" - LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${TYPE}${TYPE_SUFFIX}\n" - LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n" - LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"${TAPPEND} ${LB_BOOTAPPEND_INSTALL}\"\n" - LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n" - done -} - -case "${LB_INITRAMFS}" in - casper) - INITFS="casper" - ;; - - live-boot) - INITFS="live" - ;; - - *) - INITFS="" - ;; -esac - -# Setting destination directory -case "${LIVE_IMAGE_TYPE}" in - iso*) - case "${LB_INITRAMFS}" in - casper) - DESTDIR_LIVE="binary/casper" - ;; - - live-boot) - DESTDIR_LIVE="binary/live" - ;; - - *) - DESTDIR_LIVE="binary/boot" - ;; - esac - - DESTDIR_INSTALL="binary/install" - ;; - - hdd*|netboot|tar) - Echo_error "not yet supported, aborting (FIXME)." - exit 1 - ;; -esac - -Check_multiarchitectures - -# Creating directory -mkdir -p "${DESTDIR_LIVE}" - -# Setting boot parameters -if [ "${LB_UNION_FILESYSTEM}" != "aufs" ] -then - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}" -fi - -if [ -n "${LB_NET_COW_PATH}" ] -then - Echo_error "Net cow not yet supported on yaboot" - exit 1 -fi - -if [ "${LB_EXPOSED_ROOT}" != "false" ] -then - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} exposedroot" -fi - -LB_BOOTAPPEND_LIVE="$(echo ${LB_BOOTAPPEND_LIVE} | sed -e 's| ||')" - -# Assembling kernel configuration - -# Default entries -DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')" -DEFAULT_KERNEL="$(basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR})" -DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinux-||')" - -Yaboot_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" - -if [ "${LB_BOOTAPPEND_FAILSAFE}" != "none" ] -then - Yaboot_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${LB_BOOTAPPEND_FAILSAFE}" -fi - -if [ "$(echo ${LB_LINUX_FLAVOURS} | wc -w)" -gt "1" ] -then - for KERNEL in chroot/boot/vmlinux-* - do - KERNEL_IMAGE="$(basename ${KERNEL})" - KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinux-||')" - INITRD="initrd.img-${KERNEL_VERSION}" - - Yaboot_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}" - Yaboot_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${LB_BOOTAPPEND_FAILSAFE}" - done -fi - -LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')" - -# Assembling debian-installer configuration -if [ "${LB_DEBIAN_INSTALLER}" != "false" ] -then - VMLINUZ_DI="vmlinuz" - INITRD_DI="initrd.gz" - APPEND_DI="vga=normal" - - VMLINUZ_GI="gtk/vmlinuz" - INITRD_GI="gtk/initrd.gz" - APPEND_GI="video=vesa:ywrap,mtrr vga=788" - - if [ -f "binary/${DESTDIR_INSTALL}/${VMLINUZ_DI}" ] && [ -f "binary/${DESTDIR_INSTALL}/${INITRD_DI}" ] - then - Yaboot_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}" - fi - - if [ -f "binary/${DESTDIR_INSTALL}/${VMLINUZ_GI}" ] && [ -f "binary/${DESTDIR_INSTALL}/${INITRD_GI}" ] - then - Yaboot_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}" - fi -fi - -LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')" - -case "${LIVE_IMAGE_TYPE}" in - iso*|hdd*) - # Copying yaboot - mkdir -p binary/yaboot - - case "${LB_BUILD_WITH_CHROOT}" in - true) - cp chroot/usr/lib/yaboot/yaboot binary/yaboot - ;; - - false) - cp /usr/lib/yaboot/yaboot binary/yaboot - ;; - esac - - cp -r "${TEMPLATES}"/* binary/yaboot - - case "${LIVE_IMAGE_TYPE}" in - hdd*) - mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp - echo "root=/dev/ram" > binary/yaboot/yaboot.conf - cat binary/yaboot/yaboot.conf.tmp >> binary/yaboot/yaboot.conf - rm -f binary/yaboot/yaboot.conf.tmp - ;; - esac - - # Configure yaboot templates - sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" binary/yaboot/yaboot.conf - sed -i -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" binary/yaboot/yaboot.conf - sed -i -e "s|LB_DATE|$(date +%Y%m%d)|" -e "s|LB_VERSION|${VERSION}|" binary/yaboot/boot.msg - ;; -esac - -# Saving cache -Save_cache cache/packages.binary - -# Removing depends -Remove_package - -# Creating stage file -Create_stagefile .build/binary_yaboot diff --git a/scripts/build/config b/scripts/build/config index 9e2698779..cb2ed9eeb 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -32,7 +32,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\ \t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live-failsafe PARAMETER|\"PARAMETERS\"]\n\ -\t [--bootloader grub|syslinux|yaboot]\n\ +\t [--bootloader grub|syslinux]\n\ \t [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap]\n\ \t [--cache true|false]\n\ \t [--cache-indices true|false]\n\ diff --git a/scripts/build/source_debian b/scripts/build/source_debian index 44c610f7e..ad733c6d0 100755 --- a/scripts/build/source_debian +++ b/scripts/build/source_debian @@ -85,10 +85,6 @@ EOF echo "${LB_MEMTEST}" >> source-selection.txt fi ;; - - powerpc) - echo "yaboot" >> source-selection.txt - ;; esac if [ -n "${LB_TASKS}" ] diff --git a/templates/yaboot/boot.msg b/templates/yaboot/boot.msg deleted file mode 100644 index b183c67ae..000000000 --- a/templates/yaboot/boot.msg +++ /dev/null @@ -1,22 +0,0 @@ -Welcome to Debian GNU/Linux! - -This is a Debian Live CDROM, -built on LB_DATE. - -The default option is 'live'. - -If the system fails to boot at all (the typical -symptom is a white screen which doesn't go away), -append 'video=ofonly' or use 'live-failsafe'. - -The plain options are for the powerpc family of -processors (from 601 to G4). The *64 options are for -64bit powerpc processors, which include the IBM -Power3, Power4, Power5, ... boxes, as well as the -Apple G5 boxes. Press the tab key for a list of -options, or type 'help' for help. - -************************************ -If in doubt, just press enter, and if that -doesn't work, try 'live video=ofonly'. -************************************ diff --git a/templates/yaboot/hfs.map b/templates/yaboot/hfs.map deleted file mode 100644 index 0d8b4cfce..000000000 --- a/templates/yaboot/hfs.map +++ /dev/null @@ -1,12 +0,0 @@ -# ext. xlate creator type comment -.hqx Ascii 'BnHx' 'TEXT' "BinHex file" -.sit Raw 'SIT!' 'SITD' "StuffIT Expander" -.mov Raw 'TVOD' 'MooV' "QuickTime Movie" -.deb Raw 'Debn' 'bina' "Debian package" -.bin Raw 'ddsk' 'DDim' "Floppy or ramdisk image" -.img Raw 'ddsk' 'DDim' "Floppy or ramdisk image" -.b Raw 'UNIX' 'tbxi' "bootstrap" -yaboot Raw 'UNIX' 'boot' "bootstrap" -vmlinux Raw 'UNIX' 'boot' "bootstrap" -.conf Raw 'UNIX' 'conf' "bootstrap" -* Ascii '????' '????' "Text file" diff --git a/templates/yaboot/ofboot.b b/templates/yaboot/ofboot.b deleted file mode 100644 index 6aeb93d2d..000000000 --- a/templates/yaboot/ofboot.b +++ /dev/null @@ -1,64 +0,0 @@ -<CHRP-BOOT> -<COMPATIBLE> -MacRISC MacRISC3 MacRISC4 -</COMPATIBLE> -<DESCRIPTION> -GNU/Linux PPC bootloader -</DESCRIPTION> -<BOOT-SCRIPT> -" screen" output -load-base release-load-area -boot cd:,\yaboot\yaboot -</BOOT-SCRIPT> -<OS-BADGE-ICONS> -1010 -000000000000F8FEACF6000000000000 -0000000000F5FFFFFEFEF50000000000 -00000000002BFAFEFAFCF70000000000 -0000000000F65D5857812B0000000000 -0000000000F5350B2F88560000000000 -0000000000F6335708F8FE0000000000 -00000000005600F600F5FD8100000000 -00000000F9F8000000F5FAFFF8000000 -000000008100F5F50000F6FEFE000000 -000000F8F700F500F50000FCFFF70000 -00000088F70000F50000F5FCFF2B0000 -0000002F582A00F5000008ADE02C0000 -00090B0A35A62B0000002D3B350A0000 -000A0A0B0B3BF60000505E0B0A0B0A00 -002E350B0B2F87FAFCF45F0B2E090000 -00000007335FF82BF72B575907000000 -000000000000ACFFFF81000000000000 -000000000081FFFFFFFF810000000000 -0000000000FBFFFFFFFFAC0000000000 -000000000081DFDFDFFFFB0000000000 -000000000081DD5F83FFFD0000000000 -000000000081DDDF5EACFF0000000000 -0000000000FDF981F981FFFF00000000 -00000000FFACF9F9F981FFFFAC000000 -00000000FFF98181F9F981FFFF000000 -000000ACACF981F981F9F9FFFFAC0000 -000000FFACF9F981F9F981FFFFFB0000 -00000083DFFBF981F9F95EFFFFFC0000 -005F5F5FDDFFFBF9F9F983DDDD5F0000 -005F5F5F5FDD81F9F9E7DF5F5F5F5F00 -0083DD5F5F83FFFFFFFFDF5F835F0000 -000000FBDDDFACFBACFBDFDFFB000000 -000000000000FFFFFFFF000000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFF0000000000 -0000000000FFFFFFFFFFFFFF00000000 -00000000FFFFFFFFFFFFFFFFFF000000 -00000000FFFFFFFFFFFFFFFFFF000000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -00FFFFFFFFFFFFFFFFFFFFFFFFFFFF00 -00FFFFFFFFFFFFFFFFFFFFFFFFFF0000 -000000FFFFFFFFFFFFFFFFFFFF000000 -</OS-BADGE-ICONS> -</CHRP-BOOT> diff --git a/templates/yaboot/pegasos b/templates/yaboot/pegasos deleted file mode 100644 index a84396a42..000000000 --- a/templates/yaboot/pegasos +++ /dev/null @@ -1,90 +0,0 @@ -\ FORTH is identifed by a forth comment at first line -\ -\ terminal control stuff -\ -: TTY.CSI d# 27 EMIT ASCII [ EMIT ; -: TTY.HOME TTY.CSI ASCII H EMIT ; -: TTY.CLR_EOS TTY.CSI ASCII J EMIT ; -: TTY.HOME_CLR TTY.HOME TTY.CLR_EOS ; -\ -\ boot menu stuff -\ -: my-max-boot-num 4 ; -: my-boot-default 1 ; -: my-boot-delay d# 300 ; \ unit = 100 ms -: my-print-menu ( -- ) - TTY.HOME_CLR - ." " cr - ." Welcome to Debian GNU/Linux!" cr - ." " cr - ." This is a Debian Live CDROM," cr - ." built on LB_DATE." cr - ." " cr - ." The default option is 'live'." cr - ." " cr - ." ************************************" cr - ." If in doubt, just choose (1) 'live'" cr - ." ************************************" cr - ." " cr - ." 1: install" cr - ." 2: install" cr - ." 3: expert" cr - ." 4: rescue" cr - ." 5: return to OF prompt" cr - ." " cr -; -: my-boot-case ( num -- ) - ." " cr - case - 1 of " cd live/vmlinuz-chrp.initrd --" endof - 2 of " cd install/powerpc/vmlinuz-chrp.initrd --" endof - 3 of " cd install/powerpc/vmlinuz-chrp.initrd DEBCONF_PRIORITY=low --" endof - 4 of " cd install/powerpc/vmlinuz-chrp.initrd rescue/enable=true --" endof - 5 of " none" endof - endcase - $boot -; -: my-input-num ( wait-period max-boot-num default-num -- boot-num ) - 1 \ loop-inc = 1 - 3 pick 0 do - 0d emit - ." press 1-" - ( wait-period max-boot-num default-num loop-inc ) - 2 pick ascii 0 + emit - dup 1 = if - ." within " - 3 pick i - d# 10 / .d - ." seconds" - then - ." (default: " - over ascii 0 + emit - ." ) : " - d# 100 ms - key? if - key - ( wait-period max-boot-num default-num loop-inc key ) - dup 0d = if \ return pressed - drop leave - then - - ascii 0 - - ( wait-period max-boot-num default-num loop-inc num ) - dup 1 5 pick - ( wait-period max-boot-num default-num loop-inc num num 1 max-boot-num ) - between if - rot drop swap leave - then - - ( wait-period max-boot-num default-num loop-inc num ) - 2drop 0 \ loop-inc = 0 - then - dup +loop - drop - ( wait-period max-boot-num boot-num ) - nip nip -; - - -my-print-menu -my-boot-delay my-max-boot-num my-boot-default my-input-num -my-boot-case diff --git a/templates/yaboot/yaboot.conf b/templates/yaboot/yaboot.conf deleted file mode 100644 index 2755d8905..000000000 --- a/templates/yaboot/yaboot.conf +++ /dev/null @@ -1,6 +0,0 @@ -default=live -message=/yaboot/boot.msg - -LINUX_LIVE - -LINUX_INSTALL |