Commit 65d9bb93 authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~a14.

parent 79b59459
4.0~a13-1
4.0~a14-1
......@@ -63,15 +63,25 @@ then
# Pull in variables from the build file.
. "${_FILE}"
# Drop out some build data for information if something goes wrong.
echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
# Clone the git config to target build directory
git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
_ERRORGIT="${?}"
# Sanity check to default to something since we are going to build from git clone.
if [ -z "${_LB_CONFIG}" ]
then
_LB_CONFIG="standard"
fi
# Now set a variable for the correct build path
_BUILD_PATH="${_TEMPDIR}/${_BUILD}/images/${_LB_CONFIG}"
# Drop out some build data for information if something goes wrong.
echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live
_DATE_START="`date -R`"
echo "Begin live-build-cgi: ${_DATE_START}" > "${_BUILD_PATH}"/log
echo "Info live-build-cgi: Config tree cloned from ${_LB_GIT} for build ${_BUILD}" >> "${_BUILD_PATH}"/log
# Creating directory for the config/package-lists
mkdir -p "${_BUILD_PATH}"/config/package-lists
......@@ -82,18 +92,15 @@ then
echo "${_LB_CGIPACKAGES}" > "${_BUILD_PATH}"/config/package-lists/cgipackages.list.chroot
fi
_DATE_START="`date -R`"
echo "Begin: ${_DATE_START}" > "${_BUILD_PATH}"/log
# Generating config here
if [ "${_ERRORGIT}" -eq "0" ]
then
cd "${_BUILD_PATH}"
# Do config with git and stack on config file params to build
lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LIVE_IMAGE_ARCHITECTURE}" --archive-areas "${LIVE_IMAGE_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
lb config ${_CGI_CONFIG_APPEND} --distribution "${LB_DISTRIBUTION}" --binary-images "${LB_BINARY_IMAGES}" --architectures "${LIVE_IMAGE_ARCHITECTURE}" --archive-areas "${LIVE_IMAGE_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
_ERRORCONFIG="${?}"
else
echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_BUILD_PATH}"/log
echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" >> "${_BUILD_PATH}"/log
fi
# Run build if config went ok
......@@ -102,7 +109,7 @@ then
lb build >> "${_BUILD_PATH}"/log 2>&1
_ERRORBUILD="${?}"
else
echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" > "${_BUILD_PATH}"/log
echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" >> "${_BUILD_PATH}"/log
fi
_DATE_END="`date -R`"
......
......@@ -13,3 +13,5 @@ _TEMPDIR="/srv/debian-live/build/tmp"
_SERVER="http://live.debian.net/build"
_LB_GIT="git://live-systems.org/git/live-images.git"
_CGI_CONFIG_APPEND=""
......@@ -23,7 +23,7 @@ build: po4a.cfg
@if [ ! -x "$$(which po4a 2>/dev/null)" ]; \
then \
echo "E: po4a - command not found"; \
echo "I: po4a can be optained from http://po4a.alioth.debian.org/"; \
echo "I: po4a can be obtained from http://po4a.alioth.debian.org/"; \
echo "I: On Debian based systems, po4a can be installed with 'apt-get install po4a'."; \
exit 1; \
fi
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 10.03.2013 4.0~a14\-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 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 10.03.2013 4.0~a14\-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 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 10.03.2013 4.0~a14\-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 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 10.03.2013 4.0~a14\-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 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 10.03.2013 4.0~a14\-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 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 10.03.2013 4.0~a14\-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 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 10.03.2013 4.0~a14\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 10.03.2013 4.0~a14\-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 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 10.03.2013 4.0~a14\-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 21.02.2013 4.0~a13\-1 "Debian Live Project"
.TH LIVE\-BUILD 7 10.03.2013 4.0~a14\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
......
.TH LIVE\-BUILD 1 2013\-02\-21 4.0~a13-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-03\-10 4.0~a14-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
......
.TH LIVE\-BUILD 1 2013\-02\-21 4.0~a13-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-03\-10 4.0~a14-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
......
.TH LIVE\-BUILD 1 2013\-02\-21 4.0~a13-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-03\-10 4.0~a14-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage
......
.TH LIVE\-BUILD 1 2013\-02\-21 4.0~a13-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-03\-10 4.0~a14-1 "Debian Live Project"
.SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
......
.TH LIVE\-BUILD 1 2013\-02\-21 4.0~a13-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-03\-10 4.0~a14-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fR \- Complete the chroot stage
......
.TH LIVE\-BUILD 1 2013\-02\-21 4.0~a13-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2013\-03\-10 4.0~a14-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