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

Adding upstream version 4.0~a8.

parent d403dcee
......@@ -20,6 +20,8 @@ config/chroot
config/common
config/source
config/control
source/
source*.iso
source*.img
......
......@@ -36,22 +36,22 @@ New_configuration ()
## Configuration
# Configuration-Version
LIVE_CONFIGURATION_VERSION="$(Get_configuration config/control Configuration-Version)"
LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/control Configuration-Version)}"
LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}"
export LIVE_CONFIGURATION_VERSION
# Image: Name
LIVE_IMAGE_NAME="$(Get_configuration config/control Name)"
LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/control Name)}"
LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live-image}"
export LIVE_IMAGE_NAME
# Image: Architecture (FIXME: Support and default to 'any')
LIVE_IMAGE_ARCHITECTURE="$(Get_configuration config/control Architecture)"
LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/control Architecture)}"
LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}"
export LIVE_IMAGE_ARCHITECTURE
# Image: Archive Areas
LIVE_IMAGE_ARCHIVE_AREAS="$(Get_configuration config/control Archive-Areas)"
LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/control Archive-Areas)}"
case "${LB_MODE}" in
progress-linux)
......@@ -70,12 +70,12 @@ New_configuration ()
export LIVE_IMAGE_ARCHIVE_AREAS
# Image: Archive Areas
LIVE_IMAGE_PARENT_ARCHIVE_AREAS="$(Get_configuration config/control Parent-Archive-Areas)"
LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/control Parent-Archive-Areas)}"
LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}"
export LIVE_IMAGE_PARENT_ARCHIVE_AREAS
# Image: Type
LIVE_IMAGE_TYPE="$(Get_configuration config/control Type)"
LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/control Type)}"
LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}"
export LIVE_IMAGE_TYPE
}
......@@ -358,7 +358,7 @@ Set_defaults ()
esac
# Setting templates
if [ -n "${LIVE_BUID}" ]
if [ -n "${LIVE_BUILD}" ]
then
LB_TEMPLATES="${LB_TEMPLATES:-${LIVE_BUILD}/templates}"
else
......
#!/bin/sh
## live-build(7) - System Build Scripts
## Copyright (C) 2006-2012 Daniel Baumann <daniel@debian.org>
## 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
......@@ -35,7 +35,9 @@ do
then
for _FILE in po/${_LANGUAGE}/*.po
do
sed -i -e "s|^msgstr .*.2012\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" "${_FILE}"
sed -i -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
-e "s|^msgstr .*.2013\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \
"${_FILE}"
done
fi
done
......@@ -45,6 +47,8 @@ if ls po/pt_BR/*.po > /dev/null 2>&1
then
for _FILE in po/pt_BR/*.po
do
sed -i -e "s|^msgstr .*-2012\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" "${_FILE}"
sed -i -e "s|^msgstr .*.2013-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
-e "s|^msgstr .*-2013\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \
"${_FILE}"
done
fi
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlb\fP \- wrapper for live\-build programs
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlb binary\fP \- Complete the binary stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fP \- Complete the chroot stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlb clean\fP \- Clean build directory
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
......@@ -199,8 +199,6 @@
[\fB\-\-net\-cow\-server\fP \fIIP\fP|\fIHOSTNAME\fP]
.br
[\fB\-\-net\-tarball\fP true|false]
.br
[\-p|\fB\-\-package\-lists\fP \fILIST\fP|\fI"LISTS"\fP]
.br
[\fB\-\-quiet\fP]
.br
......@@ -671,12 +669,6 @@ by default empty.
defines if a compressed tarball should be created. Disabling this options
leads to no tarball at all, the plain binary directory is considered the
output in this case. Default is true.
.IP "\-p|\fB\-\-package\-lists\fP \fILIST\fP|\(dq\fILISTS\fP\(dq" 4
defines which lists available in /usr/share/live/build/package\-lists should
be used. By default, this is set to standard. Note that in case you have
local package lists, you don't need to list them here. Putting them into
config/package\-lists is enough (the filename needs to have the .list suffix
though).
.IP \fB\-\-quiet\fP 4
reduces the verbosity of messages output by \fBlb build\fP.
.IP "\fB\-\-archives\fP \fIARCHIVE\fP|\(dq\fIARCHIVES\fP\(dq" 4
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlb source\fP \- Complete the source stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 7 2013\-01\-02 4.0~a7\-1 "Debian Live Project"
.TH LIVE\-BUILD 7 20.01.2013 4.0~a8\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
......
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
......
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
......
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage
......
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
.SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
......
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fR \- Complete the chroot stage
......
.TH LIVE\-BUILD 1 2013\-01\-02 4.0~a7-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-01\-20 4.0~a8-1 "Debian Live Project"
.SH NAME
\fBlb clean\fR \- Clean build directory
......
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