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

Adding upstream version 4.0~alpha39.

parent 34221488
......@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha38-1\n"
"POT-Creation-Date: 2014-06-25 21:07+0200\n"
"Project-Id-Version: live-build 4.0~alpha39-1\n"
"POT-Creation-Date: 2014-07-24 05:02+0200\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"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-06-25"
msgid "2014-07-24"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha38-1"
msgid "4.0~alpha39-1"
msgstr ""
#. type: TH
......
......@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha38-1\n"
"POT-Creation-Date: 2014-06-25 21:07+0200\n"
"Project-Id-Version: live-build 4.0~alpha39-1\n"
"POT-Creation-Date: 2014-07-24 05:02+0200\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"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-06-25"
msgid "2014-07-24"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha38-1"
msgid "4.0~alpha39-1"
msgstr ""
#. type: TH
......
......@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha38-1\n"
"POT-Creation-Date: 2014-06-25 21:07+0200\n"
"Project-Id-Version: live-build 4.0~alpha39-1\n"
"POT-Creation-Date: 2014-07-24 05:02+0200\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"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-06-25"
msgid "2014-07-24"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha38-1"
msgid "4.0~alpha39-1"
msgstr ""
#. type: TH
......
......@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha38-1\n"
"POT-Creation-Date: 2014-06-25 21:07+0200\n"
"Project-Id-Version: live-build 4.0~alpha39-1\n"
"POT-Creation-Date: 2014-07-24 05:02+0200\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"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-06-25"
msgid "2014-07-24"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha38-1"
msgid "4.0~alpha39-1"
msgstr ""
#. type: TH
......
......@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha38-1\n"
"POT-Creation-Date: 2014-06-25 21:07+0200\n"
"Project-Id-Version: live-build 4.0~alpha39-1\n"
"POT-Creation-Date: 2014-07-24 05:02+0200\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"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-06-25"
msgid "2014-07-24"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha38-1"
msgid "4.0~alpha39-1"
msgstr ""
#. type: TH
......
......@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha38-1\n"
"POT-Creation-Date: 2014-06-25 21:07+0200\n"
"Project-Id-Version: live-build 4.0~alpha39-1\n"
"POT-Creation-Date: 2014-07-24 05:02+0200\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"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-06-25"
msgid "2014-07-24"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha38-1"
msgid "4.0~alpha39-1"
msgstr ""
#. type: TH
......
......@@ -6,8 +6,8 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: live-build 4.0~alpha38-1\n"
"POT-Creation-Date: 2014-06-25 21:07+0200\n"
"Project-Id-Version: live-build 4.0~alpha39-1\n"
"POT-Creation-Date: 2014-07-24 05:02+0200\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"
......@@ -33,7 +33,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "2014-06-25"
msgid "2014-07-24"
msgstr ""
#. type: TH
......@@ -43,7 +43,7 @@ msgstr ""
#: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
#: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
#, no-wrap
msgid "4.0~alpha38-1"
msgid "4.0~alpha39-1"
msgstr ""
#. type: TH
......
......@@ -55,10 +55,17 @@ Create_lockfile .lock
# Checking depends
Check_package chroot/usr/bin/xorriso xorriso
if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
then
Check_package chroot/usr/lib/syslinux/isohdpfx.bin syslinux-common
fi
case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
_ISOHDPFX="/usr/lib/syslinux/isohdpfx.bin"
Check_package chroot/${_ISOHDPFX} syslinux-common
;;
*)
_ISOHDPFX="/usr/lib/ISOLINUX/isohdpfx.bin"
Check_package chroot/${_ISOHDPFX} isolinux
;;
esac
# Restoring cache
Restore_cache cache/packages.binary
......@@ -78,7 +85,7 @@ XORRISO_OPTIONS="-R -r -J -joliet-long -l -cache-inodes"
# Handle xorriso live-build specific options
if [ "${LIVE_IMAGE_TYPE}" = "iso-hybrid" ]
then
XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr /usr/lib/syslinux/isohdpfx.bin -partition_offset 16"
XORRISO_OPTIONS="${XORRISO_OPTIONS} -isohybrid-mbr ${_ISOHDPFX} -partition_offset 16"
fi
if [ "${_QUIET}" = "true" ]
......
......@@ -120,11 +120,17 @@ else
fi
fi
# legacy compatibility for wheezy
if [ -e "${_SOURCE}.${LB_PARENT_DISTRIBUTION}" ]
then
_SOURCE="${_SOURCE}.${LB_PARENT_DISTRIBUTION}"
fi
# Checking depends
case "${LB_BUILD_WITH_CHROOT}" in
true)
case "${LB_PARENT_DISTRIBUTION}" in
wheezy|jessie)
wheezy)
case "${_BOOTLOADER}" in
syslinux|extlinux)
Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
......@@ -138,6 +144,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
*)
Check_package chroot/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
Check_package chroot/usr/lib/syslinux syslinux-common
;;
esac
......@@ -151,7 +158,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
false)
case "${LB_PARENT_DISTRIBUTION}" in
wheezy|jessie)
wheezy)
case "${_BOOTLOADER}" in
syslinux|extlinux)
if [ ! -e /usr/bin/${_BOOTLOADER} ]
......
label hdt
menu label ^Hardware Detection Tool (HDT)
com32 hdt.c32
label memtest
menu label ^Memory Diagnostic Tool (memtest86+)
linux /live/memtest
include menu.cfg
default vesamenu.c32
prompt 0
timeout 0
/usr/lib/syslinux/hdt.c32
\ No newline at end of file
label install
menu label ^Install
linux /install/vmlinuz
initrd /install/initrd.gz
append vga=788 @APPEND_INSTALL@ -- quiet
label installgui
menu label ^Graphical install
linux /install/gtk/vmlinuz
initrd /install/gtk/initrd.gz
append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ -- quiet
/usr/lib/syslinux/ldlinux.c32
\ No newline at end of file
/usr/lib/syslinux/libcom32.c32
\ No newline at end of file
/usr/lib/syslinux/libutil.c32
\ No newline at end of file
label live-@FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE@
label live-@FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
linux @LINUX@
initrd @INITRD@
append @APPEND_LIVE_FAILSAFE@
menu hshift 0
menu width 82
menu title Boot menu
include stdmenu.cfg
include live.cfg
include install.cfg
menu begin advanced
menu title Advanced options
include stdmenu.cfg
label mainmenu
menu label ^Back..
menu exit
include advanced.cfg
menu end
menu clear
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="640"
height="480"
id="svg3320"
version="1.1"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="splash.svg.in">
<defs
id="defs3322">
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.402663,0,0,1.115648,-6.237984,0.0533075)"
r="18.370251"
fy="10.943316"
fx="15.491823"
cy="10.943316"
cx="15.491823"
id="radialGradient2813"
xlink:href="#linearGradient2807"
inkscape:collect="always" />
<radialGradient
r="35.934704"
fy="424.15677"
fx="131.23691"
cy="424.15677"
cx="131.23691"
gradientTransform="matrix(0.101953,-0.04272301,0.09621296,0.229599,-48.67227,-64.24148)"
gradientUnits="userSpaceOnUse"
id="radialGradient2798"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.415385,0,26.70146)"
r="30.365856"
fy="45.673546"
fx="29.898689"
cy="45.673546"
cx="29.898689"
id="radialGradient18290"
xlink:href="#linearGradient18284"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.105628,-0.04514018,0.06692574,0.156607,-46.01605,-24.35485)"
r="103.26014"
fy="409.83737"
fx="340.35886"
cy="409.83737"
cx="340.35886"
id="radialGradient13895"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.08174351,0.01024998,-0.04335971,0.345793,6.123413,-84.50421)"
r="38.451698"
fy="270.67969"
fx="424.99243"
cy="270.67969"
cx="424.99243"
id="radialGradient11208"
xlink:href="#linearGradient11202"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.272962,-0.071724,0.05616202,0.213737,-78.54657,-24.30491)"
r="48.782982"
fy="243.06874"
fx="293.81989"
cy="243.06874"
cx="293.81989"
id="radialGradient10317"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.224796,0.01017229,-0.00975947,0.215674,-73.87964,-54.89804)"
r="40.975471"
fy="286.46918"
fx="500.97794"
cy="286.46918"
cx="500.97794"
id="radialGradient9434"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.163532,-0.01065754,0.01078108,0.165425,-46.18187,-65.65506)"
r="235.88632"
fy="685.99139"
fx="420.87839"
cy="685.99139"
cx="420.87839"
id="radialGradient8549"
xlink:href="#linearGradient8543"
inkscape:collect="always" />
<radialGradient
r="297.21338"
fy="-72.420044"
fx="336.73767"
cy="-72.420044"
cx="336.73767"
gradientTransform="matrix(0.136507,0,-4.484926e-5,0.07137743,-23.39816,12.31028)"
gradientUnits="userSpaceOnUse"
id="radialGradient7666"
xlink:href="#linearGradient5012"
inkscape:collect="always" />
<linearGradient
id="linearGradient5012">
<stop
id="stop5014"
offset="0"
style="stop-color:#fdf188;stop-opacity:1;" />
<stop
id="stop5016"
offset="1"
style="stop-color:#d3bc00;stop-opacity:1;" />
</linearGradient>
<linearGradient
id="linearGradient8543">
<stop
id="stop8545"
offset="0"
style="stop-color:#fffef5;stop-opacity:0.94117647;" />
<stop
id="stop8547"
offset="1"
style="stop-color:#fce94f;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient11202">
<stop
id="stop11204"
offset="0"
style="stop-color:#c4a000;stop-opacity:1;" />
<stop
id="stop11206"
offset="1"
style="stop-color:#c4a000;stop-opacity:0;" />
</linearGradient>
<linearGradient
id="linearGradient18284">
<stop
id="stop18286"
offset="0"
style="stop-color:#000000;stop-opacity:1;" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0.5"
id="stop20913" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop19165" />
</linearGradient>
<linearGradient
id="linearGradient2807"
inkscape:collect="always">
<stop
id="stop2809"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop2811"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<inkscape:perspective
id="perspective47"
inkscape:persp3d-origin="24 : 16 : 1"
inkscape:vp_z="48 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 24 : 1"
sodipodi:type="inkscape:persp3d" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.775"
inkscape:cx="574.36733"
inkscape:cy="250.84337"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1016"
inkscape:window-height="570"
inkscape:window-x="0"
inkscape:window-y="1"
inkscape:window-maximized="0" />
<metadata
id="metadata3325">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-572.3622)">
<rect
style="fill:#000000;fill-opacity:1;stroke:none"
id="rect3328"
width="640"
height="480"
x="0"
y="572.36218" />
<text
transform="scale(1.0000015,0.99999849)"
sodipodi:linespacing="100%"
id="text3002"
y="619.20685"
x="190.68135"
style="font-size:35.65467453px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:DejaVu Sans;-inkscape-font-specification:DejaVu Sans Bold"
xml:space="preserve"><tspan
y="619.20685"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3045">@PROJECT@ @VERSION@ (@DISTRIBUTION@)</tspan><tspan
y="639.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3041">@ARCHITECTURE@</tspan><tspan
y="659.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3037" /><tspan
y="679.20679"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3039">Build: @YEAR@-@MONTH@-@DAY@ @HOUR@:@MINUTE@:@SECOND@</tspan><tspan
y="699.20673"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:bold;-inkscape-font-specification:DejaVu Sans Bold"
id="tspan3098" /><tspan
y="719.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3102">linux: @LINUX_VERSIONS@</tspan><tspan
y="739.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3076">live-build: @LIVE_BUILD_VERSION@</tspan><tspan
y="759.20667"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3068">live-boot: @LIVE_BOOT_VERSION@</tspan><tspan
y="779.2066"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3070">live-config: @LIVE_CONFIG_VERSION@</tspan><tspan
y="799.20654"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3012">live-tools: @LIVE_TOOLS_VERSION@</tspan><tspan
y="819.20654"
x="190.68135"
sodipodi:role="line"
style="font-size:19.99996948px;font-style:normal;font-weight:normal;-inkscape-font-specification:DejaVu Sans"
id="tspan3066" /></text>