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

Adding upstream version 4.0~a2.

parent 21cb43c0
......@@ -683,6 +683,7 @@ Set_defaults ()
precise)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
;;
......@@ -690,15 +691,7 @@ Set_defaults ()
;;
*)
case "${LIST}" in
stripped|minimal)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
;;
esac
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486 686-pae}"
;;
esac
;;
......@@ -724,27 +717,11 @@ Set_defaults ()
;;
ubuntu|kubuntu)
case "${LIST}" in
stripped|minimal)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp}"
;;
esac
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp e500 powerpc-e500mc}"
;;
*)
case "${LIST}" in
stripped|minimal)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc}"
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64}"
;;
esac
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64}"
;;
esac
;;
......@@ -1199,21 +1176,20 @@ Check_defaults ()
# except when bootstrapping the functions/defaults etc.).
CURRENT_CONFIG_VERSION="$(echo ${LB_CONFIG_VERSION} | awk -F. '{ print $1 }')"
if [ ${CURRENT_CONFIG_VERSION} -ge 4 ]
if [ ${CURRENT_CONFIG_VERSION} -ge 5 ]
then
Echo_error "This config tree is too new for this version of live-build (${VERSION})."
Echo_error "Aborting build, please get a new version of live-build."
exit 1
elif [ ${CURRENT_CONFIG_VERSION} -eq 2 ]
elif [ ${CURRENT_CONFIG_VERSION} -eq 3 ]
then
Echo_error "This config tree is too old for this version of live-build (${VERSION})."
Echo_error "Aborting build, please repopulate the config tree."
Echo_error "Aborting build, please regenerate the config tree."
exit 1
elif [ ${CURRENT_CONFIG_VERSION} -lt 1 ]
then
else
Echo_warning "This config tree does not specify a format version or has an unknown version number."
Echo_warning "Continuing build, but it could lead to errors or different results. Please repopulate the config tree."
Echo_warning "Continuing build, but it could lead to errors or different results. Please regenerate the config tree."
fi
fi
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2\-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\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2\-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\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2\-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\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2\-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\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2\-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\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2\-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\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2\-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 2012\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2\-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\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2\-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\-11\-30 4.0~a1\-1 "Debian Live Project"
.TH LIVE\-BUILD 7 2012\-12\-06 4.0~a2\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
......
.TH LIVE\-BUILD 1 2012\-11\-30 4.0~a1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
......
.TH LIVE\-BUILD 1 2012\-11\-30 4.0~a1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
......
.TH LIVE\-BUILD 1 2012\-11\-30 4.0~a1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage
......
.TH LIVE\-BUILD 1 2012\-11\-30 4.0~a1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
......
.TH LIVE\-BUILD 1 2012\-11\-30 4.0~a1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fR \- Complete the chroot stage
......
.TH LIVE\-BUILD 1 2012\-11\-30 4.0~a1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlb clean\fR \- Clean build directory
......
.TH LIVE\-BUILD 1 2012\-11\-30 4.0~a1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlb config\fR \- Create config directory
......
.TH LIVE\-BUILD 1 2012\-11\-30 4.0~a1-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-12\-06 4.0~a2-1 "Debian Live Project"
.SH NAME
\fBlb source\fR \- Complete the source 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