Commit 3dfdecde authored by Raphaël Hertzog's avatar Raphaël Hertzog
Browse files

Imported Upstream version 4.0.4

parent b6004d1c
...@@ -81,8 +81,8 @@ else ...@@ -81,8 +81,8 @@ else
LB_APT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt=[a-u]+' | cut -f 2 -d '=' | head -n1) LB_APT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt=[a-u]+' | cut -f 2 -d '=' | head -n1)
# Advanced bootstrap options # Advanced bootstrap options
LIVE_IMAGE_ARCHITECTURE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
LIVE_IMAGE_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1) LB_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Advanced chroot options # Advanced chroot options
LB_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) LB_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1)
...@@ -139,8 +139,8 @@ else ...@@ -139,8 +139,8 @@ else
-e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \ -e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \
-e "s/LB_APT/${LB_APT}/" \ -e "s/LB_APT/${LB_APT}/" \
-e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \ -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \
-e "s/LIVE_IMAGE_ARCHITECTURE/${LIVE_IMAGE_ARCHITECTURE}/" \ -e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \
-e "s/LIVE_IMAGE_ARCHIVE_AREAS/${LIVE_IMAGE_ARCHIVE_AREAS}/" \ -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \
-e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \ -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \
-e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \ -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \
-e "s/LB_SECURITY/${LB_SECURITY}/" \ -e "s/LB_SECURITY/${LB_SECURITY}/" \
...@@ -185,8 +185,8 @@ LB_DISTRIBUTION="${LB_DISTRIBUTION}" ...@@ -185,8 +185,8 @@ LB_DISTRIBUTION="${LB_DISTRIBUTION}"
LB_APT="${LB_APT}" LB_APT="${LB_APT}"
# Advanced bootstrap options # Advanced bootstrap options
LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}" LB_ARCHITECTURES="${LB_ARCHITECTURES}"
LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}"
# Advanced chroot options # Advanced chroot options
LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}" LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}"
...@@ -214,7 +214,7 @@ LB_SOURCE="${LB_SOURCE}" ...@@ -214,7 +214,7 @@ LB_SOURCE="${LB_SOURCE}"
EOF EOF
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live/live-build-request echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live/live-build-request
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LIVE_IMAGE_TYPE}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|apt ${LB_APT}|cgipackages ${_LB_CGIPACKAGES}|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_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live/live-build-request echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LIVE_IMAGE_TYPE}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|apt ${LB_APT}|cgipackages ${_LB_CGIPACKAGES}|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_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live/live-build-request
fi fi
sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html
...@@ -102,7 +102,7 @@ then ...@@ -102,7 +102,7 @@ then
then then
cd "${_BUILD_PATH}" cd "${_BUILD_PATH}"
# Do config with git and stack on config file params to build # Do config with git and stack on config file params to build
lb config ${_CGI_CONFIG_APPEND} --apt "${LB_APT}" --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}" lb config ${_CGI_CONFIG_APPEND} --apt "${LB_APT}" --distribution "${LB_DISTRIBUTION}" --binary-images "${LB_BINARY_IMAGES}" --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="${?}" _ERRORCONFIG="${?}"
else 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
...@@ -129,10 +129,10 @@ then ...@@ -129,10 +129,10 @@ then
if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ] if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ]
then then
_STATUS="maybe-successful" _STATUS="maybe-successful"
echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live/live-build-cgi-status echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live/live-build-cgi-status
else else
_STATUS="maybe-failed" _STATUS="maybe-failed"
echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live/live-build-cgi-status echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live/live-build-cgi-status
fi fi
sed -e "s/BUILD/${_BUILD}/g" \ sed -e "s/BUILD/${_BUILD}/g" \
......
...@@ -15,7 +15,7 @@ Check_architectures () ...@@ -15,7 +15,7 @@ Check_architectures ()
for ARCHITECTURE in ${ARCHITECTURES} for ARCHITECTURE in ${ARCHITECTURES}
do do
if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | grep ${ARCHITECTURE})" ] if [ "$(echo ${LB_ARCHITECTURES} | grep ${ARCHITECTURE})" ]
then then
VALID="true" VALID="true"
break break
...@@ -70,7 +70,7 @@ Check_crossarchitectures () ...@@ -70,7 +70,7 @@ Check_crossarchitectures ()
;; ;;
esac esac
if [ "${LIVE_IMAGE_ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ] if [ "${LB_ARCHITECTURES}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ]
then then
if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ] if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ]
...@@ -93,7 +93,7 @@ Check_crossarchitectures () ...@@ -93,7 +93,7 @@ Check_crossarchitectures ()
Check_multiarchitectures () Check_multiarchitectures ()
{ {
if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | wc -w)" -gt "1" ] if [ "$(echo ${LB_ARCHITECTURES} | wc -w)" -gt "1" ]
then then
# First, only support multiarch on iso # First, only support multiarch on iso
case "${LIVE_IMAGE_TYPE}" in case "${LIVE_IMAGE_TYPE}" in
......
...@@ -16,7 +16,7 @@ Get_conffiles () ...@@ -16,7 +16,7 @@ Get_conffiles ()
else else
for FILE in ${@} for FILE in ${@}
do do
FILES="${FILES} ${FILE} ${FILE}.${LIVE_IMAGE_ARCHITECTURE} ${FILE}.${DISTRIBUTION}" FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURES} ${FILE}.${DISTRIBUTION}"
FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||')" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||')"
FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${ARCHITECTURE}" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${ARCHITECTURE}"
FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}"
...@@ -28,7 +28,7 @@ Get_conffiles () ...@@ -28,7 +28,7 @@ Get_conffiles ()
Read_conffiles () Read_conffiles ()
{ {
for CONFFILE in Get_conffiles "${@}" for CONFFILE in $(Get_conffiles "${@}")
do do
if [ -f "${CONFFILE}" ] if [ -f "${CONFFILE}" ]
then then
...@@ -45,7 +45,7 @@ Read_conffiles () ...@@ -45,7 +45,7 @@ Read_conffiles ()
Print_conffiles () Print_conffiles ()
{ {
for CONFFILE in Get_conffiles "${@}" for CONFFILE in $(Get_conffiles "${@}")
do do
if [ -f "${CONFFILE}" ] if [ -f "${CONFFILE}" ]
then then
......
...@@ -46,32 +46,32 @@ New_configuration () ...@@ -46,32 +46,32 @@ New_configuration ()
export LIVE_IMAGE_NAME export LIVE_IMAGE_NAME
# Image: Architecture (FIXME: Support and default to 'any') # Image: Architecture (FIXME: Support and default to 'any')
LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build Architecture)}" LB_ARCHITECTURES="${LB_ARCHITECTURES:-$(Get_configuration config/build Architecture)}"
LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}" LB_ARCHITECTURES="${LB_ARCHITECTURES:-${CURRENT_IMAGE_ARCHITECTURE}}"
export LIVE_IMAGE_ARCHITECTURE export LB_ARCHITECTURES
# Image: Archive Areas # Image: Archive Areas
LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}"
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux) progress-linux)
LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main contrib non-free}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}"
;; ;;
ubuntu) ubuntu)
LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main restricted}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}"
;; ;;
*) *)
LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}"
;; ;;
esac esac
export LIVE_IMAGE_ARCHIVE_AREAS export LB_ARCHIVE_AREAS
# Image: Archive Areas # Image: Archive Areas
LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build Parent-Archive-Areas)}" LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build Parent-Archive-Areas)}"
LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
export LIVE_IMAGE_PARENT_ARCHIVE_AREAS export LIVE_IMAGE_PARENT_ARCHIVE_AREAS
# Image: Type # Image: Type
...@@ -288,7 +288,15 @@ Set_defaults () ...@@ -288,7 +288,15 @@ Set_defaults ()
*) *)
case "${LB_SYSTEM}" in case "${LB_SYSTEM}" in
live) live)
LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}" case "${LB_PARENT_DISTRIBUTION}" in
wheezy)
LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
;;
*)
LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
;;
esac
;; ;;
normal) normal)
...@@ -330,7 +338,7 @@ Set_defaults () ...@@ -330,7 +338,7 @@ Set_defaults ()
fi fi
fi fi
if [ "${LIVE_IMAGE_ARCHITECTURE}" = "i386" ] && [ "${CURRENT_IMAGE_ARCHITECTURE}" = "amd64" ] if [ "${LB_ARCHITECTURES}" = "i386" ] && [ "${CURRENT_IMAGE_ARCHITECTURE}" = "amd64" ]
then then
# Use linux32 when building amd64 images on i386 # Use linux32 when building amd64 images on i386
_LINUX32="linux32" _LINUX32="linux32"
...@@ -383,7 +391,7 @@ Set_defaults () ...@@ -383,7 +391,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
amd64|i386) amd64|i386)
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}" LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}"
;; ;;
...@@ -413,7 +421,7 @@ Set_defaults () ...@@ -413,7 +421,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
amd64|i386) amd64|i386)
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}" LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}"
;; ;;
...@@ -440,7 +448,7 @@ Set_defaults () ...@@ -440,7 +448,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
amd64|i386) amd64|i386)
LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}" LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}"
;; ;;
...@@ -467,7 +475,7 @@ Set_defaults () ...@@ -467,7 +475,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
amd64|i386) amd64|i386)
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}" LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}"
;; ;;
...@@ -516,7 +524,7 @@ Set_defaults () ...@@ -516,7 +524,7 @@ Set_defaults ()
esac esac
# Setting linux flavour string # Setting linux flavour string
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
armel) armel)
case "${LB_MODE}" in case "${LB_MODE}" in
ubuntu) ubuntu)
...@@ -525,15 +533,29 @@ Set_defaults () ...@@ -525,15 +533,29 @@ Set_defaults ()
*) *)
# armel will have special images: one rootfs image and many additional kernel images. # armel will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armel flavours # therefore we default to all available armel flavours
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}" case "${LB_DISTRIBUTION}" in
wheezy)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}"
;;
esac
;; ;;
esac esac
;; ;;
armhf) armhf)
# armhf will have special images: one rootfs image and many additional kernel images. # armhf will have special images: one rootfs image and many additional kernel images.
# therefore we default to all available armel flavours # therefore we default to all available armhf flavours
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}" case "${LB_DISTRIBUTION}" in
wheezy)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}"
;;
esac
;; ;;
amd64) amd64)
...@@ -575,7 +597,7 @@ Set_defaults () ...@@ -575,7 +597,7 @@ Set_defaults ()
ia64) ia64)
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux) progress-linux)
Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode." Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1 exit 1
;; ;;
...@@ -588,7 +610,7 @@ Set_defaults () ...@@ -588,7 +610,7 @@ Set_defaults ()
powerpc) powerpc)
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux) progress-linux)
Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode." Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1 exit 1
;; ;;
...@@ -605,7 +627,7 @@ Set_defaults () ...@@ -605,7 +627,7 @@ Set_defaults ()
s390x) s390x)
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux|ubuntu) progress-linux|ubuntu)
Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode." Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1 exit 1
;; ;;
...@@ -618,7 +640,7 @@ Set_defaults () ...@@ -618,7 +640,7 @@ Set_defaults ()
sparc) sparc)
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux) progress-linux)
Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode." Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1 exit 1
;; ;;
...@@ -629,7 +651,7 @@ Set_defaults () ...@@ -629,7 +651,7 @@ Set_defaults ()
;; ;;
*) *)
Echo_error "Architecture(s) ${LIVE_IMAGE_ARCHITECTURE} not yet supported (FIXME)" Echo_error "Architecture(s) ${LB_ARCHITECTURES} not yet supported (FIXME)"
exit 1 exit 1
;; ;;
esac esac
...@@ -670,7 +692,7 @@ Set_defaults () ...@@ -670,7 +692,7 @@ Set_defaults ()
## config/binary ## config/binary
# Setting image filesystem # Setting image filesystem
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
sparc) sparc)
LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext4}" LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext4}"
;; ;;
...@@ -681,7 +703,7 @@ Set_defaults () ...@@ -681,7 +703,7 @@ Set_defaults ()
esac esac
# Setting image type # Setting image type
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
amd64|i386) amd64|i386)
LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}"
;; ;;
...@@ -705,7 +727,7 @@ Set_defaults () ...@@ -705,7 +727,7 @@ Set_defaults ()
# Setting bootloader # Setting bootloader
if [ -z "${LB_BOOTLOADER}" ] if [ -z "${LB_BOOTLOADER}" ]
then then
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
amd64|i386) amd64|i386)
LB_BOOTLOADER="syslinux" LB_BOOTLOADER="syslinux"
;; ;;
...@@ -902,7 +924,7 @@ Set_defaults () ...@@ -902,7 +924,7 @@ Set_defaults ()
;; ;;
*) *)
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
amd64|i386) amd64|i386)
if [ "${LB_DEBIAN_INSTALLER}" != "false" ] if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then then
...@@ -926,7 +948,7 @@ Set_defaults () ...@@ -926,7 +948,7 @@ Set_defaults ()
;; ;;
*) *)
case "${LIVE_IMAGE_ARCHITECTURE}" in case "${LB_ARCHITECTURES}" in
amd64|i386) amd64|i386)
if [ "${LB_DEBIAN_INSTALLER}" != "false" ] if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then then
......
.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" .TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlb\fR \- wrapper for live\-build programs \fBlb\fR \- wrapper for live\-build programs
......
.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" .TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlb binary\fR \- Complete the binary stage \fBlb binary\fR \- Complete the binary stage
......
.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" .TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage \fBlb bootstrap\fR \- Complete the bootstrap stage
......
.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" .TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
......
.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" .TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlb chroot\fR \- Complete the chroot stage \fBlb chroot\fR \- Complete the chroot stage
......
.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" .TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlb clean\fR \- Clean build directory \fBlb clean\fR \- Clean build directory
......
.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" .TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlb config\fR \- Create config directory \fBlb config\fR \- Create config directory
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
.br .br
[\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR] [\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR]
.br .br
[\fB\-\-bootloader\fR grub|syslinux] [\fB\-\-bootloader\fR grub|grub2|syslinux]
.br .br
[\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap] [\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap]
.br .br
...@@ -265,7 +265,7 @@ defines the filesystem to be used in the image type. This only has an effect if ...@@ -265,7 +265,7 @@ defines the filesystem to be used in the image type. This only has an effect if
sets boot parameters specific to debian\-installer, if included. sets boot parameters specific to debian\-installer, if included.
.IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4 .IP "\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|""\fIPARAMETERS\fR""" 4
sets boot parameters specific to debian\-live. A complete list of boot parameters can be found in the \fIlive\-boot\fR(7) and \fIlive\-config\fR(7) manual pages. sets boot parameters specific to debian\-live. A complete list of boot parameters can be found in the \fIlive\-boot\fR(7) and \fIlive\-config\fR(7) manual pages.
.IP "\fB\-\-bootloader\fR grub|syslinux" 4 .IP "\fB\-\-bootloader\fR grub|grub2|syslinux" 4
defines which bootloader is being used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and i386, the default is syslinux. defines which bootloader is being used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and i386, the default is syslinux.
.IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap" 4 .IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap" 4
defines which program is used to bootstrap the debian chroot, default is debootstrap. defines which program is used to bootstrap the debian chroot, default is debootstrap.
......
.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3-1 "Live Systems Project" .TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlb source\fR \- Complete the source stage \fBlb source\fR \- Complete the source stage
......
.TH LIVE\-BUILD 7 2014\-10\-25 4.0.3-1 "Live Systems Project" .TH LIVE\-BUILD 7 2014\-12\-10 4.0.4-1 "Live Systems Project"