Commit af92cc7c authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~alpha28.

parent e422a68c
4.0~alpha27-1
4.0~alpha28-1
......@@ -154,18 +154,10 @@ EOF
cat "${_TEMPDIR}"/"${_BUILD}"/"${_BUILD}".build >> "${_DESTDIR}"/"${_BUILD}"/mail
# Moving binary image
#if ls "${_TEMPDIR}"/"${_BUILD}"/binary*.* > /dev/null 2>&1
if Find_files ${_BUILD_PATH}/binary*.*
# Moving live-image-* files
if Find_files ${_BUILD_PATH}/live-image-*
then
mv "${_BUILD_PATH}"/binary*.* "${_DESTDIR}"/"${_BUILD}"
fi
# Moving source image
#if ls "${_TEMPDIR}"/"${_BUILD}"/source.* > /dev/null 2>&1
if Find_files ${_BUILD_PATH}/source.*
then
mv "${_BUILD_PATH}"/source.* "${_DESTDIR}"/"${_BUILD}"
mv "${_BUILD_PATH}"/live-image-* "${_DESTDIR}"/"${_BUILD}"
fi
# Moving build
......
......@@ -498,9 +498,6 @@ Set_defaults ()
# Setting chroot filesystem
LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM:-squashfs}"
# Setting whether to expose root filesystem as read only
LB_EXPOSED_ROOT="${LB_EXPOSED_ROOT:-false}"
# Setting union filesystem
LB_UNION_FILESYSTEM="${LB_UNION_FILESYSTEM:-aufs}"
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 18.10.2013 4.0~alpha27\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 28.10.2013 4.0~alpha27\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 18.10.2013 4.0~alpha27\-1 "Live Systems Projekt"
.TH LIVE\-BUILD 1 28.10.2013 4.0~alpha27\-1 "Live Systems Projekt"
.SH NAME
\fBlive\-build\fP \- System Build Skripte
......
......@@ -216,8 +216,6 @@
[\fB\-\-updates\fR true|false]
.br
[\fB\-\-backports\fR true|false]
.br
[\fB\-\-exposed\-root\fR true|false]
.br
[\fB\-\-verbose\fR]
.br
......@@ -454,8 +452,6 @@ defines what size the hdd image should be. Note that although the default is set
defines if debian updates package archives should be included in the image or not.
.IP "\fB\-\-backports\fR true|false" 4
defines if debian backports package archives should be included in the image or not.
.IP "\fB\-\-exposed\-root\fR true|false" 4
defines whether to expose the root filesystem as read only and not covered by the union filesystem. This has useful implications for certain speciality setups such as LTSP. By default, this option is false.
.IP "\fB\-\-verbose\fR" 4
increases the verbosity of messages output by \fBlb build\fR.
.IP "\fB\-\-win32\-loader true|false" 4
......
......@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-10\-18 4.0~alpha27-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-10\-28 4.0~alpha28-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
......
......@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details.
.\"
.\"
.TH LIVE\-BUILD 1 2013\-10\-18 4.0~alpha27-1 "Live Systems Project"
.TH LIVE\-BUILD 1 2013\-10\-28 4.0~alpha28-1 "Live Systems Project"
.SH NAME
\fBlive\-build\fR \- System Build Scripts
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 18.10.2013 4.0~alpha27\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1 28.10.2013 4.0~alpha27\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
......
......@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 18.10.2013 4.0~alpha27\-1 "Proyecto Live Systems"
.TH LIVE\-BUILD 1 28.10.2013 4.0~alpha27\-1 "Proyecto Live Systems"
.SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema
......
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha27-1\n"
"POT-Creation-Date: 2013-10-18 09:45+0300\n"
"POT-Creation-Date: 2013-10-28 08:35+0100\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n"
......@@ -24,13 +24,13 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-10-18"
msgstr "18.10.2013"
msgid "2013-10-28"
msgstr "28.10.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha27-1"
msgid "4.0~alpha28-1"
msgstr "4.0~alpha27-1"
#. type: TH
......
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha27-1\n"
"POT-Creation-Date: 2013-10-18 09:45+0300\n"
"POT-Creation-Date: 2013-10-28 08:35+0100\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n"
......@@ -24,13 +24,13 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-10-18"
msgstr "18.10.2013"
msgid "2013-10-28"
msgstr "28.10.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha27-1"
msgid "4.0~alpha28-1"
msgstr "4.0~alpha27-1"
#. type: TH
......
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha27-1\n"
"POT-Creation-Date: 2013-10-18 09:45+0300\n"
"POT-Creation-Date: 2013-10-28 08:35+0100\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
......@@ -23,13 +23,13 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-10-18"
msgstr "18.10.2013"
msgid "2013-10-28"
msgstr "28.10.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha27-1"
msgid "4.0~alpha28-1"
msgstr "4.0~alpha27-1"
#. type: TH
......
......@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha27-1\n"
"POT-Creation-Date: 2013-10-18 09:45+0300\n"
"POT-Creation-Date: 2013-10-28 08:35+0100\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n"
......@@ -23,13 +23,13 @@ msgstr "LIVE-BUILD"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-10-18"
msgstr "18.10.2013"
msgid "2013-10-28"
msgstr "28.10.2013"
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha27-1"
msgid "4.0~alpha28-1"
msgstr "4.0~alpha27-1"
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-10-18 09:45+0300\n"
"POT-Creation-Date: 2013-10-28 08:35+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"
......@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-10-18"
msgid "2013-10-28"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha27-1"
msgid "4.0~alpha28-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-10-18 09:45+0300\n"
"POT-Creation-Date: 2013-10-28 08:35+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"
......@@ -25,13 +25,13 @@ msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "2013-10-18"
msgid "2013-10-28"
msgstr ""
#. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap
msgid "4.0~alpha27-1"
msgid "4.0~alpha28-1"
msgstr ""
#. type: TH
......
......@@ -175,11 +175,6 @@ then
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
......
......@@ -149,11 +149,6 @@ then
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
......
......@@ -105,7 +105,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
then
Check_package chroot/usr/bin/rsvg librsvg2-bin
Check_package chroot/usr/bin/rsvg-convert librsvg2-bin
fi
;;
......@@ -126,10 +126,10 @@ case "${LB_BUILD_WITH_CHROOT}" in
if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
then
if [ ! -e /usr/bin/rsvg ]
if [ ! -e /usr/bin/rsvg-convert ]
then
# librsvg2-bin
Echo_error "/usr/bin/rsvg - no such file"
Echo_error "/usr/bin/rsvg-convert - no such file"
exit 1
fi
fi
......@@ -273,13 +273,13 @@ then
case "${LB_BUILD_WITH_CHROOT}" in
true)
cp "${_TARGET}/splash.svg" chroot
Chroot chroot "rsvg --format png --height 480 --width 640 splash.svg splash.png"
Chroot chroot "rsvg-convert --format png --height 480 --width 640 splash.svg -o splash.png"
mv chroot/splash.png "${_TARGET}"
rm -f chroot/splash.svg
;;
false)
rsvg --format png --height 480 --width 640 "${_TARGET}/splash.svg" "${_TARGET}/splash.png"
rsvg-convert --format png --height 480 --width 640 "${_TARGET}/splash.svg" -o "${_TARGET}/splash.png"
;;
esac
......
#!/usr/bin/python
#!/usr/bin/python3
## live-build(7) - Live System Build Components
## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment