manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switching from genisoimage to xorriso.

This commit is contained in:
Daniel Baumann 2012-12-16 21:06:25 +01:00 committed by Daniel Baumann
parent 960d954aeb
commit 0d7322500b
45 changed files with 124 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/control vendored
View File

@ -16,7 +16,7 @@ Recommends:
live-boot-doc, live-config-doc, live-manual-html | live-manual, cpio, live-boot-doc, live-config-doc, live-manual-html | live-manual, cpio,
gnu-fdisk gnu-fdisk
Suggests: Suggests:
dosfstools, genisoimage, git, loadlin, memtest86+ | memtest86, mtools, parted, dosfstools, xorriso, git, loadlin, memtest86+ | memtest86, mtools, parted,
squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub, squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
uuid-runtime, win32-loader uuid-runtime, win32-loader
Description: Live System Build Scripts Description: Live System Build Scripts

2
debian/live-build.bug-script vendored
View File

@ -6,7 +6,7 @@ DEFAULT_SETTINGS="/etc/live/build.conf"
dpkg -l debootstrap cdebootstrap dpkg -l debootstrap cdebootstrap
# Checking suggests # Checking suggests
dpkg -l dosfstools genisoimage loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader dpkg -l dosfstools xorriso loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader
if [ -e "${DEFAULT_SETTINGS}" ]; then if [ -e "${DEFAULT_SETTINGS}" ]; then
echo "Contents of ${DEFAULT_SETTINGS}:" echo "Contents of ${DEFAULT_SETTINGS}:"

2
manpages/de/lb.de.1
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb\fP \- wrapper for live\-build programs \fBlb\fP \- wrapper for live\-build programs

2
manpages/de/lb_binary.de.1
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb binary\fP \- Complete the binary stage \fBlb binary\fP \- Complete the binary stage

2
manpages/de/lb_bootstrap.de.1
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage \fBlb bootstrap\fP \- Complete the bootstrap stage

2
manpages/de/lb_build.de.1
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages \fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages

2
manpages/de/lb_chroot.de.1
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb chroot\fP \- Complete the chroot stage \fBlb chroot\fP \- Complete the chroot stage

2
manpages/de/lb_clean.de.1
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb clean\fP \- Clean build directory \fBlb clean\fP \- Clean build directory

4
manpages/de/lb_config.de.1
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb config\fP \- Create config directory \fBlb config\fP \- Create config directory
@ -386,7 +386,7 @@ 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 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 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, of the required tools (mainly these are the bootloaders such as syslinux,
grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage, grub and yaboot, and the auxilliary tools such as dosfstools, xorriso,
squashfs\-tools and others) do not \fBexactely\fP match what is present at 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 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 you are \fBexactely\fP sure what you are doing and have \fBcompletely\fP\fI

2
manpages/de/lb_source.de.1
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb source\fP \- Complete the source stage \fBlb source\fP \- Complete the source stage

2
manpages/de/lb_testroot.de.1
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root \fBlb testroot\fP \- Ensure that a system is built as root

2
manpages/de/live-build.de.7
View File

@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 7 2012\-12\-10 4.0~a3\-1 "Debian Live Project" .TH LIVE\-BUILD 7 2012\-12\-16 4.0~a3\-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlive\-build\fP \- the Debian Live tool suite \fBlive\-build\fP \- the Debian Live tool suite

2
manpages/en/lb.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb\fR \- wrapper for live\-build programs \fBlb\fR \- wrapper for live\-build programs

2
manpages/en/lb_binary.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb binary\fR \- Complete the binary stage \fBlb binary\fR \- Complete the binary stage

2
manpages/en/lb_bootstrap.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage \fBlb bootstrap\fR \- Complete the bootstrap stage

2
manpages/en/lb_build.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages

2
manpages/en/lb_chroot.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb chroot\fR \- Complete the chroot stage \fBlb chroot\fR \- Complete the chroot stage

2
manpages/en/lb_clean.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb clean\fR \- Clean build directory \fBlb clean\fR \- Clean build directory

4
manpages/en/lb_config.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb config\fR \- Create config directory \fBlb config\fR \- Create config directory
@ -296,7 +296,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 .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.). 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 .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, genisoimage, 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, 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.
.IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|jffs2|none" 4 .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. 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 .IP "\fB\-\-clean\fR" 4

2
manpages/en/lb_source.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb source\fR \- Complete the source stage \fBlb source\fR \- Complete the source stage

2
manpages/en/lb_testroot.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 1 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlb testroot\fR \- Ensure that a system is built as root \fBlb testroot\fR \- Ensure that a system is built as root

2
manpages/en/live-build.7
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 7 2012\-12\-10 4.0~a3-1 "Debian Live Project" .TH LIVE\-BUILD 7 2012\-12\-16 4.0~a3-1 "Debian Live Project"
.SH NAME .SH NAME
\fBlive\-build\fR \- the Debian Live tool suite \fBlive\-build\fR \- the Debian Live tool suite

4
manpages/po/de/lb.1.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/po/de/lb_binary.1.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/po/de/lb_bootstrap.1.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/po/de/lb_build.1.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/po/de/lb_chroot.1.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/po/de/lb_clean.1.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

14
manpages/po/de/lb_config.1.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH
@ -1149,11 +1149,11 @@ msgid ""
"This is a very dangerous option, using the tools of the host system can lead " "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 " "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 " "required tools (mainly these are the bootloaders such as syslinux, grub and "
"yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-" "yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools "
"tools and others) do not B<exactely> match what is present at build-time in " "and others) do not B<exactely> match what is present at build-time in the "
"the target distribution. Never do disable this option unless you are " "target distribution. Never do disable this option unless you are B<exactely> "
"B<exactely> sure what you are doing and have B<completely>I< understood its " "sure what you are doing and have B<completely>I< understood its consequences."
"consequences.>" ">"
msgstr "" msgstr ""
#. type: IP #. type: IP

4
manpages/po/de/lb_source.1.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/po/de/lb_testroot.1.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/po/de/live-build.7.po
View File

@ -6,7 +6,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n" "PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language-Team: none\n" "Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/pot/lb.1.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/pot/lb_binary.1.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/pot/lb_bootstrap.1.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/pot/lb_build.1.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/pot/lb_chroot.1.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/pot/lb_clean.1.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

14
manpages/pot/lb_config.1.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH
@ -1149,11 +1149,11 @@ msgid ""
"This is a very dangerous option, using the tools of the host system can lead " "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 " "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 " "required tools (mainly these are the bootloaders such as syslinux, grub and "
"yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-" "yaboot, and the auxilliary tools such as dosfstools, xorriso, squashfs-tools "
"tools and others) do not B<exactely> match what is present at build-time in " "and others) do not B<exactely> match what is present at build-time in the "
"the target distribution. Never do disable this option unless you are " "target distribution. Never do disable this option unless you are B<exactely> "
"B<exactely> sure what you are doing and have B<completely>I< understood its " "sure what you are doing and have B<completely>I< understood its consequences."
"consequences.>" ">"
msgstr "" msgstr ""
#. type: IP #. type: IP

4
manpages/pot/lb_source.1.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/pot/lb_testroot.1.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

4
manpages/pot/live-build.7.pot
View File

@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-12-10 20:39+0100\n" "POT-Creation-Date: 2012-12-16 21:03+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1 #: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap #, no-wrap
msgid "2012-12-10" msgid "2012-12-16"
msgstr "" msgstr ""
#. type: TH #. type: TH

78
scripts/build/binary_iso
View File

@ -53,11 +53,11 @@ Check_lockfile .lock
Create_lockfile .lock Create_lockfile .lock
# Checking depends # Checking depends
Check_package chroot/usr/bin/genisoimage genisoimage Check_package chroot/usr/bin/xorriso xorriso
if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ] if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
then then
Check_package chroot/usr/bin/isohybrid syslinux Check_package chroot/usr/lib/syslinux/isohdpfx.bin syslinux-common
fi fi
# Restoring cache # Restoring cache
@ -72,79 +72,85 @@ then
rm -f ${IMAGE} rm -f ${IMAGE}
fi fi
# Handle genisoimage generic options # Handle xorriso generic options
GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot" XORRISO_OPTIONS="-as mkisofs -r -J -joliet-long -l -cache-inodes"
# Handle xorriso live-build specific options
if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
then
XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin -partition_offset 16"
fi
# Handle genisoimage live-build specific options
if [ "${_QUIET}" = "true" ] if [ "${_QUIET}" = "true" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet" XORRISO_OPTIONS="${XORRISO_OPTIONS} -quiet"
fi fi
if [ "${_VERBOSE}" = "true" ] if [ "${_VERBOSE}" = "true" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v" XORRISO_OPTIONS="${XORRISO_OPTIONS} -v"
fi fi
if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ] if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LB_ISO_APPLICATION}\"" XORRISO_OPTIONS="${XORRISO_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
fi fi
if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ] if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LB_ISO_PREPARER}\"" XORRISO_OPTIONS="${XORRISO_OPTIONS} -p \"${LB_ISO_PREPARER}\""
fi fi
if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ] if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\"" XORRISO_OPTIONS="${XORRISO_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
fi fi
if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ] if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LB_ISO_VOLUME}\"" XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
fi fi
# Handle genisoimage architecture specific options # Handle xorriso architecture specific options
case "${LB_BOOTLOADER}" in case "${LB_BOOTLOADER}" in
grub) grub)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito" XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/stage2_eltorito"
GENISOIMAGE_EXCLUDE="boot/grub/stage2_eltorito" XORRISO_EXCLUDE="boot/grub/stage2_eltorito"
;; ;;
grub2) grub2)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table" XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/grub_eltorito -J" XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/grub/grub_eltorito -J"
GENISOIMAGE_EXCLUDE="boot/grub/grub_eltorito" XORRISO_EXCLUDE="boot/grub/grub_eltorito"
;; ;;
silo) silo)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -G boot/isofs.b -B ..." XORRISO_OPTIONS="${XORRISO_OPTIONS} -G boot/isofs.b -B ..."
GENISOIMAGE_EXCLUDE="boot/isofs.b" XORRISO_EXCLUDE="boot/isofs.b"
;; ;;
syslinux) syslinux)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux) progress-linux)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/boot.bin -c boot/boot.cat" XORRISO_OPTIONS="${XORRISO_OPTIONS} -b boot/boot.bin -c boot/boot.cat"
GENISOIMAGE_EXCLUDE="boot/boot.bin" XORRISO_EXCLUDE="boot/boot.bin"
;; ;;
*) *)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat" XORRISO_OPTIONS="${XORRISO_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin" XORRISO_EXCLUDE="isolinux/isolinux.bin"
;; ;;
esac esac
XORRISO_OPTIONS="${XORRISO_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
;; ;;
yaboot) yaboot)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map" XORRISO_OPTIONS="${XORRISO_OPTIONS} --iso-level 2 --netatalk -hfs -probe -map"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop" XORRISO_OPTIONS="${XORRISO_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc" XORRISO_OPTIONS="${XORRISO_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
GENISOIMAGE_EXCLUDE="yaboot/hfs.map" XORRISO_EXCLUDE="yaboot/hfs.map"
;; ;;
*) *)
@ -156,7 +162,7 @@ esac
#if [ "${LB_DEBIAN_INSTALLER}" != "live" ] #if [ "${LB_DEBIAN_INSTALLER}" != "live" ]
#then #then
# GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}" # XORRISO_OPTIONS="${XORRISO_OPTIONS} -m ${XORRISO_EXCLUDE}"
#fi #fi
if [ "${LB_BOOTLOADER}" = "grub2" ] if [ "${LB_BOOTLOADER}" = "grub2" ]
@ -193,19 +199,9 @@ fi
cat >> binary.sh << EOF cat >> binary.sh << EOF
genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary xorriso ${XORRISO_OPTIONS} -o ${IMAGE} binary
EOF EOF
if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
then
cat >> binary.sh << EOF
isohybrid ${ISOHYBRID_OPTIONS} ${IMAGE}
EOF
fi
case "${LB_BUILD_WITH_CHROOT}" in case "${LB_BUILD_WITH_CHROOT}" in
true) true)
# Moving image # Moving image

2
scripts/build/source_debian
View File

@ -55,7 +55,7 @@ Chroot chroot "dpkg --get-selections" | awk '{ print $1 }' > source-selection.tx
cat >> source-selection.txt << EOF cat >> source-selection.txt << EOF
${LB_BOOTLOADER} ${LB_BOOTLOADER}
live-build live-build
genisoimage xorriso
parted parted
squashfs-tools squashfs-tools
mtd-tools mtd-tools

20
scripts/build/source_iso
View File

@ -53,7 +53,7 @@ Check_lockfile .lock
Create_lockfile .lock Create_lockfile .lock
# Checking depends # Checking depends
Check_package chroot/usr/bin/genisoimage genisoimage Check_package chroot/usr/bin/xorriso xorriso
# Installing depends # Installing depends
Install_package Install_package
@ -64,41 +64,45 @@ then
rm -f source.iso rm -f source.iso
fi fi
# Handle xorriso generic options
XORRISO_OPTIONS="-as mkisofs -r -J -joliet-long -l -cache-inodes"
# Handle xorriso live-build specific options
if [ "${_QUIET}" = "true" ] if [ "${_QUIET}" = "true" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet" XORRISO_OPTIONS="${XORRISO_OPTIONS} -quiet"
fi fi
if [ "${_VERBOSE}" = "true" ] if [ "${_VERBOSE}" = "true" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v" XORRISO_OPTIONS="${XORRISO_OPTIONS} -v"
fi fi
if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ] if [ -n "${LB_ISO_APPLICATION}" ] && [ "${LB_ISO_APPLICATION}" != "none" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LB_ISO_APPLICATION}\"" XORRISO_OPTIONS="${XORRISO_OPTIONS} -A \"${LB_ISO_APPLICATION}\""
fi fi
if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ] if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LB_ISO_PREPARER}\"" XORRISO_OPTIONS="${XORRISO_OPTIONS} -p \"${LB_ISO_PREPARER}\""
fi fi
if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ] if [ -n "${LB_ISO_PUBLISHER}" ] && [ "${LB_ISO_PUBLISHER}" != "none" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\"" XORRISO_OPTIONS="${XORRISO_OPTIONS} -publisher \"${LB_ISO_PUBLISHER}\""
fi fi
if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ] if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
then then
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LB_ISO_VOLUME}\"" XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
fi fi
# Moving image # Moving image
mv source chroot mv source chroot
cat >> chroot/source.sh << EOF cat >> chroot/source.sh << EOF
genisoimage ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source xorriso ${XORRISO_OPTIONS} -o source.iso source
EOF EOF
Chroot chroot "sh source.sh" Chroot chroot "sh source.sh"