Commit 3ad6a401 authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~alpha37.

parent b61de56c
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-04-28 19:51+0200\n"
"POT-Creation-Date: 2014-05-07 07:00+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-04-28"
msgid "2014-05-07"
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~alpha36-1"
msgid "4.0~alpha37-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-04-28 19:51+0200\n"
"POT-Creation-Date: 2014-05-07 07:00+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-04-28"
msgid "2014-05-07"
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~alpha36-1"
msgid "4.0~alpha37-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-04-28 19:51+0200\n"
"POT-Creation-Date: 2014-05-07 07:00+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-04-28"
msgid "2014-05-07"
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~alpha36-1"
msgid "4.0~alpha37-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-04-28 19:51+0200\n"
"POT-Creation-Date: 2014-05-07 07:00+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-04-28"
msgid "2014-05-07"
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~alpha36-1"
msgid "4.0~alpha37-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-04-28 19:51+0200\n"
"POT-Creation-Date: 2014-05-07 07:00+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-04-28"
msgid "2014-05-07"
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~alpha36-1"
msgid "4.0~alpha37-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-04-28 19:51+0200\n"
"POT-Creation-Date: 2014-05-07 07:00+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-04-28"
msgid "2014-05-07"
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~alpha36-1"
msgid "4.0~alpha37-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-04-28 19:51+0200\n"
"POT-Creation-Date: 2014-05-07 07:00+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-04-28"
msgid "2014-05-07"
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~alpha36-1"
msgid "4.0~alpha37-1"
msgstr ""
#. type: TH
......
......@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2014-04-28 19:51+0200\n"
"POT-Creation-Date: 2014-05-07 07:00+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-04-28"
msgid "2014-05-07"
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~alpha36-1"
msgid "4.0~alpha37-1"
msgstr ""
#. type: TH
......
......@@ -123,7 +123,24 @@ fi
# Checking depends
case "${LB_BUILD_WITH_CHROOT}" in
true)
Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
case "${LB_PARENT_DISTRIBUTION}" in
wheezy|jessie|sid)
case "${_BOOTLOADER}" in
syslinux|extlinux)
Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
;;
*)
Check_package chroot/usr/lib/syslinux syslinux-common
;;
esac
;;
*)
Check_package chroot/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER}
;;
esac
Check_package chroot/usr/lib/syslinux syslinux-common
if ls "${_SOURCE}"/*.svg* > /dev/null 2>&1
......@@ -133,12 +150,37 @@ case "${LB_BUILD_WITH_CHROOT}" in
;;
false)
if [ ! -e /usr/bin/${_BOOTLOADER} ]
then
# syslinux or extlinux
Echo_error "/usr/bin/${_BOOTLOADER} - no such file."
exit 1
fi
case "${LB_PARENT_DISTRIBUTION}" in
wheezy|jessie|sid)
case "${_BOOTLOADER}" in
syslinux|extlinux)
if [ ! -e /usr/bin/${_BOOTLOADER} ]
then
# syslinux or extlinux
Echo_error "/usr/bin/${_BOOTLOADER} - no such file."
exit 1
fi
;;
*)
if ! ls /usr/lib/syslinux/${_BOOTLOADER}* > /dev/null 2>&1
then
Echo_error "/usr/lib/syslinux/${_BOOTLOADER}* - no such files."
exit 1
fi
;;
esac
;;
*)
if [ ! -e "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])" ]
then
Echo_error "/usr/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z])"
exit 1
fi
;;
esac
if [ ! -e /usr/lib/syslinux ]
then
......
......@@ -129,7 +129,7 @@ do
;;
--stage)
rm -rf .build
rm -rf .build/*
;;
--source)
......
#!/bin/sh
set -e
# Create /etc/mtab symlink
if [ ! -L /etc/mtab ]
then
ln -s /proc/mtab /etc/mtab
fi
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