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

Adding upstream version 3.0~b2.

parent ea417c63
#!/bin/sh
# This is a hook for live-build(7) to install localepurge.
# To enable it, copy or symlink this hook into your config/chroot_local-hooks
# directory.
#
_PURGE=""
if [ ! -x "$(which symlinks 2>/dev/null)" ]
then
_PURGE="true"
apt-get install symlinks
fi
symlinks -c -r -s /
if [ "${_PURGE}" = "true" ]
then
apt-get remove --purge symlinks
fi
......@@ -64,8 +64,7 @@ else
_LB_CGIPACKAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])cgipackages=[-0-9a-zA-Z. _+]+' | cut -f 2 -d '=' | head -n1)
# CGI Config for git
_LB_CONFIG=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])config=[-a-z.]+' | cut -f 2 -d '=' | head -n1)
_LB_CONFIG="git://live.debian.net/git/${_LB_CONFIG}"
_LB_CONFIG=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])config=[-a-z]+' | cut -f 2 -d '=' | head -n1)
# Standard options
LB_BINARY_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1)
......
......@@ -64,46 +64,49 @@ then
. "${_FILE}"
# Clone the git config to target build directory
git clone ${_LB_CONFIG} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live
_ERRORGIT="${?}"
# 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
# Creating directory for the config/package-lists
mkdir -p "${_TEMPDIR}"/"${_BUILD}"/config/package-lists
mkdir -p "${_BUILD_PATH}"/config/package-lists
# Add cgipackages.list.chroot
if [ -n "${_LB_CGIPACKAGES}" ]
then
echo "${_LB_CGIPACKAGES}" > "${_TEMPDIR}"/"${_BUILD}"/config/package-lists/cgipackages.list.chroot
echo "${_LB_CGIPACKAGES}" > "${_BUILD_PATH}"/config/package-lists/cgipackages.list.chroot
fi
_DATE_START="`date -R`"
echo "Begin: ${_DATE_START}" > "${_TEMPDIR}"/"${_BUILD}"/log
echo "Begin: ${_DATE_START}" > "${_BUILD_PATH}"/log
# Generating config here
if [ "${_ERRORGIT}" -eq "0" ]
then
cd "${_TEMPDIR}"/"${_BUILD}"
cd "${_BUILD_PATH}"
# Do config with git and stack on config file params to build
lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_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}" > "${_TEMPDIR}"/"${_BUILD}"/log
echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_BUILD_PATH}"/log
fi
# Run build if config went ok
if [ "${_ERRORCONFIG}" -eq "0" ]
then
lb build >> "${_TEMPDIR}"/"${_BUILD}"/log 2>&1
lb build >> "${_BUILD_PATH}"/log 2>&1
_ERRORBUILD="${?}"
else
echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" > "${_TEMPDIR}"/"${_BUILD}"/log
echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" > "${_BUILD_PATH}"/log
fi
_DATE_END="`date -R`"
echo "End: ${_DATE_END}" >> "${_TEMPDIR}"/"${_BUILD}"/log
echo "End: ${_DATE_END}" >> "${_BUILD_PATH}"/log
# Creating image directory
mkdir -p "${_DESTDIR}"/"${_BUILD}"
......@@ -139,23 +142,23 @@ EOF
# Moving binary image
#if ls "${_TEMPDIR}"/"${_BUILD}"/binary*.* > /dev/null 2>&1
if Find_files ${_TEMPDIR}/${_BUILD}/binary*.*
if Find_files ${_BUILD_PATH}/binary*.*
then
mv "${_TEMPDIR}"/"${_BUILD}"/binary*.* "${_DESTDIR}"/"${_BUILD}"
mv "${_BUILD_PATH}"/binary*.* "${_DESTDIR}"/"${_BUILD}"
fi
# Moving source image
#if ls "${_TEMPDIR}"/"${_BUILD}"/source.* > /dev/null 2>&1
if Find_files ${_TEMPDIR}/${_BUILD}/source.*
if Find_files ${_BUILD_PATH}/source.*
then
mv "${_TEMPDIR}"/"${_BUILD}"/source.* "${_DESTDIR}"/"${_BUILD}"
mv "${_BUILD_PATH}"/source.* "${_DESTDIR}"/"${_BUILD}"
fi
# Moving build
mv "${_TEMPDIR}"/"${_BUILD}".build "${_DESTDIR}"/"${_BUILD}"/build
# Moving log
mv "${_TEMPDIR}"/"${_BUILD}"/log "${_DESTDIR}"/"${_BUILD}"
mv "${_BUILD_PATH}"/log "${_DESTDIR}"/"${_BUILD}"
# Generating md5sum
cd "${_DESTDIR}"/"${_BUILD}"
......@@ -167,21 +170,21 @@ EOF
# Unmounting devpts-live
#if ls "${_TEMPDIR}"/"${_BUILD}"/chroot/dev/pts/* > /dev/null 2>&1
if Find_files ${_TEMPDIR}/${_BUILD}/chroot/dev/pts/*
if Find_files ${_BUILD_PATH}/chroot/dev/pts/*
then
umount "${_TEMPDIR}"/${_BUILD}/chroot/dev/pts
umount "${_BUILD_PATH}"/chroot/dev/pts
fi
# Unmounting proc
if [ -f "${_TEMPDIR}"/"${_BUILD}"/chroot/proc/version ]
if [ -f "${_BUILD_PATH}"/chroot/proc/version ]
then
umount "${_TEMPDIR}"/"${_BUILD}"/chroot/proc
umount "${_BUILD_PATH}"/chroot/proc
fi
# Unmounting sysfs
if [ -d "${_TEMPDIR}"/"${_BUILD}"/chroot/sys/kernel ]
if [ -d "${_BUILD_PATH}"/chroot/sys/kernel ]
then
umount "${_TEMPDIR}"/${_BUILD}/chroot/sys
umount "${_BUILD_PATH}"/chroot/sys
fi
# Removing build directory
......
......@@ -11,3 +11,5 @@ _TEMPLATES="/usr/share/live/build/templates/cgi/${_MODE}"
_TEMPDIR="/srv/debian-live/build/tmp"
_SERVER="http://live.debian.net/build"
_LB_GIT="git://live-systems.org/git/live-images.git"
......@@ -630,7 +630,9 @@ Set_defaults ()
remove-openssh-server-host-keys \
remove-python-py \
remove-udev-persistent-rules \
remove-linux-image-backups}"
remove-linux-image-backups \
remove-mdadm-configuration \
remote-adjtime-configuration}"
;;
kubuntu)
......@@ -642,7 +644,9 @@ Set_defaults ()
remove-openssh-server-host-keys \
remove-python-py \
remove-udev-persistent-rules \
remove-linux-image-backups}"
remove-linux-image-backups \
remove-mdadm-configuration \
remove-adjtime-configuration}"
;;
esac
......
......@@ -10,7 +10,7 @@
# Debian releases
RELEASE_squeeze="6.0.6"
RELEASE_wheezy="7.0~a2"
RELEASE_wheezy="7.0~b2"
RELEASE_jessie="8"
RELEASE_sid="unstable"
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-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 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-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 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-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 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-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 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-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 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-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 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
......@@ -386,7 +386,7 @@ build the binary image or not by using and including the host systems
tools. This is a very dangerous option, using the tools of the host system
can lead to tainted and even non\-bootable images if the host systems version
of the required tools (mainly these are the bootloaders such as syslinux,
grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage,
grub and yaboot, and the auxilliary tools such as dosfstools, xorriso,
squashfs\-tools and others) do not \fBexactely\fP match what is present at
build\-time in the target distribution. Never do disable this option unless
you are \fBexactely\fP sure what you are doing and have \fBcompletely\fP\fI
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-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 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2\-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 2012\-12\-10 3.0~b1\-1 "Debian Live Project"
.TH LIVE\-BUILD 7 2012\-12\-16 3.0~b2\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
......
.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
......
.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
......
.TH LIVE\-BUILD 1 2012\-12\-10 3.0~b1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-16 3.0~b2-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage
......
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