diff --git a/VERSION b/VERSION index 032a24b..0a5cf79 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.3-1 +4.0.4-1 diff --git a/frontend/cgi/live-build-cgi b/frontend/cgi/live-build-cgi index c2b56ce..68267cf 100755 --- a/frontend/cgi/live-build-cgi +++ b/frontend/cgi/live-build-cgi @@ -81,8 +81,8 @@ LB_APT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt=[a-u]+' | cut -f 2 -d '=' | head -n1) # Advanced bootstrap options - LIVE_IMAGE_ARCHITECTURE=$(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_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-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 LB_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) @@ -139,8 +139,8 @@ -e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \ -e "s/LB_APT/${LB_APT}/" \ -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \ - -e "s/LIVE_IMAGE_ARCHITECTURE/${LIVE_IMAGE_ARCHITECTURE}/" \ - -e "s/LIVE_IMAGE_ARCHIVE_AREAS/${LIVE_IMAGE_ARCHIVE_AREAS}/" \ + -e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \ + -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \ -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \ -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \ -e "s/LB_SECURITY/${LB_SECURITY}/" \ @@ -185,8 +185,8 @@ LB_APT="${LB_APT}" # Advanced bootstrap options -LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}" -LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS}" +LB_ARCHITECTURES="${LB_ARCHITECTURES}" +LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}" # Advanced chroot options LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}" @@ -214,7 +214,7 @@ 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: 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 sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html diff --git a/frontend/cgi/live-build-cgi.cron b/frontend/cgi/live-build-cgi.cron index b5e81c6..e340751 100755 --- a/frontend/cgi/live-build-cgi.cron +++ b/frontend/cgi/live-build-cgi.cron @@ -102,7 +102,7 @@ then cd "${_BUILD_PATH}" # 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="${?}" else echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" >> "${_BUILD_PATH}"/log @@ -129,10 +129,10 @@ if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ] then _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 _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 sed -e "s/BUILD/${_BUILD}/g" \ diff --git a/functions/architectures.sh b/functions/architectures.sh index df145c1..4d253c2 100755 --- a/functions/architectures.sh +++ b/functions/architectures.sh @@ -15,7 +15,7 @@ for ARCHITECTURE in ${ARCHITECTURES} do - if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | grep ${ARCHITECTURE})" ] + if [ "$(echo ${LB_ARCHITECTURES} | grep ${ARCHITECTURE})" ] then VALID="true" break @@ -70,7 +70,7 @@ ;; esac - if [ "${LIVE_IMAGE_ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ] + if [ "${LB_ARCHITECTURES}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ] then if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ] @@ -93,7 +93,7 @@ Check_multiarchitectures () { - if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | wc -w)" -gt "1" ] + if [ "$(echo ${LB_ARCHITECTURES} | wc -w)" -gt "1" ] then # First, only support multiarch on iso case "${LIVE_IMAGE_TYPE}" in diff --git a/functions/conffile.sh b/functions/conffile.sh index 055c913..c4fe191 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -16,7 +16,7 @@ else for FILE in ${@} 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_||').${ARCHITECTURE}" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}" @@ -28,7 +28,7 @@ Read_conffiles () { - for CONFFILE in Get_conffiles "${@}" + for CONFFILE in $(Get_conffiles "${@}") do if [ -f "${CONFFILE}" ] then @@ -45,7 +45,7 @@ Print_conffiles () { - for CONFFILE in Get_conffiles "${@}" + for CONFFILE in $(Get_conffiles "${@}") do if [ -f "${CONFFILE}" ] then diff --git a/functions/defaults.sh b/functions/defaults.sh index feebdee..b419232 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -46,32 +46,32 @@ export LIVE_IMAGE_NAME # Image: Architecture (FIXME: Support and default to 'any') - LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build Architecture)}" - LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}" - export LIVE_IMAGE_ARCHITECTURE + LB_ARCHITECTURES="${LB_ARCHITECTURES:-$(Get_configuration config/build Architecture)}" + LB_ARCHITECTURES="${LB_ARCHITECTURES:-${CURRENT_IMAGE_ARCHITECTURE}}" + export LB_ARCHITECTURES # Image: Archive Areas - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}" - - case "${LB_MODE}" in - progress-linux) - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main contrib non-free}" - ;; - - ubuntu) - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main restricted}" - ;; - - *) - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-main}" - ;; - esac - - export LIVE_IMAGE_ARCHIVE_AREAS + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}" + + case "${LB_MODE}" in + progress-linux) + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}" + ;; + + ubuntu) + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}" + ;; + + *) + LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}" + ;; + esac + + export LB_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:-${LIVE_IMAGE_ARCHIVE_AREAS}}" + LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" export LIVE_IMAGE_PARENT_ARCHIVE_AREAS # Image: Type @@ -288,7 +288,15 @@ *) case "${LB_SYSTEM}" in live) - LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}" + case "${LB_PARENT_DISTRIBUTION}" in + wheezy) + LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}" + ;; + + *) + LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}" + ;; + esac ;; normal) @@ -330,7 +338,7 @@ fi fi - if [ "${LIVE_IMAGE_ARCHITECTURE}" = "i386" ] && [ "${CURRENT_IMAGE_ARCHITECTURE}" = "amd64" ] + if [ "${LB_ARCHITECTURES}" = "i386" ] && [ "${CURRENT_IMAGE_ARCHITECTURE}" = "amd64" ] then # Use linux32 when building amd64 images on i386 _LINUX32="linux32" @@ -383,7 +391,7 @@ ;; ubuntu) - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}" ;; @@ -413,7 +421,7 @@ ;; ubuntu) - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}" ;; @@ -440,7 +448,7 @@ ;; ubuntu) - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}" ;; @@ -467,7 +475,7 @@ ;; ubuntu) - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}" ;; @@ -516,7 +524,7 @@ esac # Setting linux flavour string - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in armel) case "${LB_MODE}" in ubuntu) @@ -525,15 +533,29 @@ *) # armel will have special images: one rootfs image and many additional kernel images. # 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 ;; armhf) # armhf will have special images: one rootfs image and many additional kernel images. - # therefore we default to all available armel flavours - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}" + # therefore we default to all available armhf flavours + case "${LB_DISTRIBUTION}" in + wheezy) + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}" + ;; + *) + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}" + ;; + esac ;; amd64) @@ -575,7 +597,7 @@ ia64) case "${LB_MODE}" in 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 ;; @@ -588,7 +610,7 @@ powerpc) case "${LB_MODE}" in 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 ;; @@ -605,7 +627,7 @@ s390x) case "${LB_MODE}" in 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 ;; @@ -618,7 +640,7 @@ sparc) case "${LB_MODE}" in 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 ;; @@ -629,7 +651,7 @@ ;; *) - Echo_error "Architecture(s) ${LIVE_IMAGE_ARCHITECTURE} not yet supported (FIXME)" + Echo_error "Architecture(s) ${LB_ARCHITECTURES} not yet supported (FIXME)" exit 1 ;; esac @@ -670,7 +692,7 @@ ## config/binary # Setting image filesystem - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in sparc) LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext4}" ;; @@ -681,7 +703,7 @@ esac # Setting image type - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" ;; @@ -705,7 +727,7 @@ # Setting bootloader if [ -z "${LB_BOOTLOADER}" ] then - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_BOOTLOADER="syslinux" ;; @@ -902,7 +924,7 @@ ;; *) - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then @@ -926,7 +948,7 @@ ;; *) - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then diff --git a/manpages/en/lb.1 b/manpages/en/lb.1 index 94fdc25..bd43e2d 100644 --- a/manpages/en/lb.1 +++ b/manpages/en/lb.1 @@ -1,4 +1,4 @@ -.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 \fBlb\fR \- wrapper for live\-build programs diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1 index 70669f4..7197bd8 100644 --- a/manpages/en/lb_binary.1 +++ b/manpages/en/lb_binary.1 @@ -1,4 +1,4 @@ -.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 \fBlb binary\fR \- Complete the binary stage diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1 index 9d41a4d..b47d801 100644 --- a/manpages/en/lb_bootstrap.1 +++ b/manpages/en/lb_bootstrap.1 @@ -1,4 +1,4 @@ -.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 \fBlb bootstrap\fR \- Complete the bootstrap stage diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1 index f30113e..842117b 100644 --- a/manpages/en/lb_build.1 +++ b/manpages/en/lb_build.1 @@ -1,4 +1,4 @@ -.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 \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1 index ea6c278..ba049ba 100644 --- a/manpages/en/lb_chroot.1 +++ b/manpages/en/lb_chroot.1 @@ -1,4 +1,4 @@ -.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 \fBlb chroot\fR \- Complete the chroot stage diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1 index 01b0a33..ccf7ade 100644 --- a/manpages/en/lb_clean.1 +++ b/manpages/en/lb_clean.1 @@ -1,4 +1,4 @@ -.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 \fBlb clean\fR \- Clean build directory diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 3cb8c6b..b612f87 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -1,4 +1,4 @@ -.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 \fBlb config\fR \- Create config directory @@ -39,7 +39,7 @@ .br [\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR] .br - [\fB\-\-bootloader\fR grub|syslinux] + [\fB\-\-bootloader\fR grub|grub2|syslinux] .br [\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap] .br @@ -265,7 +265,7 @@ sets boot parameters specific to debian\-installer, if included. .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. -.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. .IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap" 4 defines which program is used to bootstrap the debian chroot, default is debootstrap. diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1 index 100b278..6137ec5 100644 --- a/manpages/en/lb_source.1 +++ b/manpages/en/lb_source.1 @@ -1,4 +1,4 @@ -.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 \fBlb source\fR \- Complete the source stage diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 4db19b4..fec5869 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -1,4 +1,4 @@ -.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" .SH NAME \fBlive\-build\fR \- the live systems tool suite diff --git a/manpages/ja/lb.ja.1 b/manpages/ja/lb.ja.1 index f680669..eadd263 100644 --- a/manpages/ja/lb.ja.1 +++ b/manpages/ja/lb.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb\fP \- live\-build プログラムのラッパー diff --git a/manpages/ja/lb_binary.ja.1 b/manpages/ja/lb_binary.ja.1 index 04bb604..4702455 100644 --- a/manpages/ja/lb_binary.ja.1 +++ b/manpages/ja/lb_binary.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb binary\fP \- バイナリ段階を完了させます diff --git a/manpages/ja/lb_bootstrap.ja.1 b/manpages/ja/lb_bootstrap.ja.1 index 89b624e..9aaeb1b 100644 --- a/manpages/ja/lb_bootstrap.ja.1 +++ b/manpages/ja/lb_bootstrap.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb bootstrap\fP \- パッケージ収集段階を完了させます diff --git a/manpages/ja/lb_build.ja.1 b/manpages/ja/lb_build.ja.1 index f5b0f8e..c0ed7bd 100644 --- a/manpages/ja/lb_build.ja.1 +++ b/manpages/ja/lb_build.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb build\fP \- パッケージ収集、chroot、バイナリ、ソース段階を完了させます diff --git a/manpages/ja/lb_chroot.ja.1 b/manpages/ja/lb_chroot.ja.1 index d4afca2..e4f6fe3 100644 --- a/manpages/ja/lb_chroot.ja.1 +++ b/manpages/ja/lb_chroot.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb chroot\fP \- chroot 段階を完了させます diff --git a/manpages/ja/lb_clean.ja.1 b/manpages/ja/lb_clean.ja.1 index e144d0c..bb0a06d 100644 --- a/manpages/ja/lb_clean.ja.1 +++ b/manpages/ja/lb_clean.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb clean\fP \- 設定ディレクトリを掃除します diff --git a/manpages/ja/lb_config.ja.1 b/manpages/ja/lb_config.ja.1 index b741d79..70e5eeb 100644 --- a/manpages/ja/lb_config.ja.1 +++ b/manpages/ja/lb_config.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb config\fP \- 設定ディレクトリを作成します @@ -44,7 +44,7 @@ .br [\fB\-\-bootappend\-live\fP \fIパラメータ\fP|\fI"パラメータ"\fP] .br - [\fB\-\-bootloader\fP grub|syslinux] + [\fB\-\-bootloader\fP grub|grub2|syslinux] .br [\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap] .br @@ -297,7 +297,7 @@ .IP "\fB\-\-bootappend\-live\fP \fIパラメータ\fP|\(dq\fIパラメータ\fP\(dq" 4 debian\-live 特有のブートパラメータをセットします。ブートパラメータの全容は \fIlive\-boot\fP(7) 及び \fIlive\-config\fP(7) マニュアルページにあります。 -.IP "\fB\-\-bootloader\fP grub|syslinux" 4 +.IP "\fB\-\-bootloader\fP grub|grub2|syslinux" 4 生成されたイメージで利用するブートローダを選択します。これは選択した種類のバイナリイメージでブートローダを選択できる場合にのみ効果があります。例えば iso をビルドする場合は常に syslinux (さらに言えば isolinux) が利用されます。また、バイナリイメージの種類とブートローダの組み合わせの中には、可能ではあるものの live\-build diff --git a/manpages/ja/lb_source.ja.1 b/manpages/ja/lb_source.ja.1 index a6e969c..843452b 100644 --- a/manpages/ja/lb_source.ja.1 +++ b/manpages/ja/lb_source.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlb source\fP \- ソース段階を完了させます diff --git a/manpages/ja/live-build.ja.7 b/manpages/ja/live-build.ja.7 index 220b42f..3d65b90 100644 --- a/manpages/ja/live-build.ja.7 +++ b/manpages/ja/live-build.ja.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 7 2014\-10\-25 4.0.3\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 7 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" .SH 名前 \fBlive\-build\fP \- Live システムツール集 diff --git a/manpages/po/ja/lb.1.po b/manpages/po/ja/lb.1.po index 5c34cd7..1763e25 100644 --- a/manpages/po/ja/lb.1.po +++ b/manpages/po/ja/lb.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -27,15 +27,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_binary.1.po b/manpages/po/ja/lb_binary.1.po index 4cc4bca..28a87db 100644 --- a/manpages/po/ja/lb_binary.1.po +++ b/manpages/po/ja/lb_binary.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -27,15 +27,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_bootstrap.1.po b/manpages/po/ja/lb_bootstrap.1.po index b1a3d7a..02103b9 100644 --- a/manpages/po/ja/lb_bootstrap.1.po +++ b/manpages/po/ja/lb_bootstrap.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-29 06:25+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -27,15 +27,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_build.1.po b/manpages/po/ja/lb_build.1.po index 114c335..06faa09 100644 --- a/manpages/po/ja/lb_build.1.po +++ b/manpages/po/ja/lb_build.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -27,15 +27,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_chroot.1.po b/manpages/po/ja/lb_chroot.1.po index c356c85..0471d17 100644 --- a/manpages/po/ja/lb_chroot.1.po +++ b/manpages/po/ja/lb_chroot.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -27,15 +27,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_clean.1.po b/manpages/po/ja/lb_clean.1.po index 41fd5b2..e2e63e7 100644 --- a/manpages/po/ja/lb_clean.1.po +++ b/manpages/po/ja/lb_clean.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -27,7 +27,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/lb_config.1.po b/manpages/po/ja/lb_config.1.po index 485858b..575001e 100644 --- a/manpages/po/ja/lb_config.1.po +++ b/manpages/po/ja/lb_config.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-09-07 13:13+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -27,7 +27,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH @@ -262,7 +262,9 @@ #. type: Plain text #: en/lb_config.1:43 -msgid " [B<--bootloader> grub|syslinux]" +#, fuzzy +#| msgid " [B<--bootloader> grub|syslinux]" +msgid " [B<--bootloader> grub|grub2|syslinux]" msgstr " [B<--bootloader> grub|syslinux]" #. type: Plain text @@ -1048,8 +1050,9 @@ #. type: IP #: en/lb_config.1:268 -#, no-wrap -msgid "B<--bootloader> grub|syslinux" +#, fuzzy, no-wrap +#| msgid "B<--bootloader> grub|syslinux" +msgid "B<--bootloader> grub|grub2|syslinux" msgstr "B<--bootloader> grub|syslinux" #. type: Plain text diff --git a/manpages/po/ja/lb_source.1.po b/manpages/po/ja/lb_source.1.po index 0f3b4d9..22e5694 100644 --- a/manpages/po/ja/lb_source.1.po +++ b/manpages/po/ja/lb_source.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -27,15 +27,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/po/ja/live-build.7.po b/manpages/po/ja/live-build.7.po index 6161fa7..d39befb 100644 --- a/manpages/po/ja/live-build.7.po +++ b/manpages/po/ja/live-build.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -27,7 +27,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -35,7 +35,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot index 01caf0a..eab6c1a 100644 --- a/manpages/pot/lb.1.pot +++ b/manpages/pot/lb.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot index 0250b9b..6307d4a 100644 --- a/manpages/pot/lb_binary.1.pot +++ b/manpages/pot/lb_binary.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot index 45ff39f..0921246 100644 --- a/manpages/pot/lb_bootstrap.1.pot +++ b/manpages/pot/lb_bootstrap.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot index 6163122..7e71ed1 100644 --- a/manpages/pot/lb_build.1.pot +++ b/manpages/pot/lb_build.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot index 0bca67b..2ff4665 100644 --- a/manpages/pot/lb_chroot.1.pot +++ b/manpages/pot/lb_chroot.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot index cea254e..5c3e10a 100644 --- a/manpages/pot/lb_clean.1.pot +++ b/manpages/pot/lb_clean.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot index 2a67ae2..68414db 100644 --- a/manpages/pot/lb_config.1.pot +++ b/manpages/pot/lb_config.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH @@ -255,7 +255,7 @@ #. type: Plain text #: en/lb_config.1:43 -msgid " [B<--bootloader> grub|syslinux]" +msgid " [B<--bootloader> grub|grub2|syslinux]" msgstr "" #. type: Plain text @@ -970,7 +970,7 @@ #. type: IP #: en/lb_config.1:268 #, no-wrap -msgid "B<--bootloader> grub|syslinux" +msgid "B<--bootloader> grub|grub2|syslinux" msgstr "" #. type: Plain text diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot index 87c346f..e22eb85 100644 --- a/manpages/pot/lb_source.1.pot +++ b/manpages/pot/lb_source.1.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,15 +29,15 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.3-1" +msgid "2014-12-10" +msgstr "" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, no-wrap +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot index efbb2d6..bc9a1a5 100644 --- a/manpages/pot/live-build.7.pot +++ b/manpages/pot/live-build.7.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: live-build 4.0.3-1\n" -"POT-Creation-Date: 2014-10-25 14:34+0200\n" +"Project-Id-Version: live-build 4.0.4-1\n" +"POT-Creation-Date: 2014-12-10 08:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -29,7 +29,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "2014-10-25" +msgid "2014-12-10" msgstr "" #. type: TH @@ -37,7 +37,7 @@ #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 #, no-wrap -msgid "4.0.3-1" +msgid "4.0.4-1" msgstr "" #. type: TH diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums index 542c28c..f7d5e46 100755 --- a/scripts/build/binary_checksums +++ b/scripts/build/binary_checksums @@ -89,7 +89,7 @@ # File list cd binary -find . | sed -e 's|^.||g' | grep "^/" | sort > ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.contents +find . | sed -e 's|^.||g' | grep "^/" | sort > ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.contents cd "${OLDPWD}" # Creating stage file diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index 2184a3f..a784049 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -48,7 +48,7 @@ mkdir -p binary/.disk -ARCHITECTURE="$(echo ${LIVE_IMAGE_ARCHITECTURE} | sed -e 's| |/|g')" +ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')" DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)" eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`" @@ -133,7 +133,7 @@ do if [ -e "${LOCATION}" ] then - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include continue fi @@ -158,7 +158,7 @@ do if [ -e "${LOCATION}" ] then - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_netinst_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include continue fi @@ -181,7 +181,7 @@ do if [ -e "${LOCATION}" ] then - cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_businesscard_udeb_include" binary/.disk/udeb_include + cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include continue fi diff --git a/scripts/build/binary_hdd b/scripts/build/binary_hdd index 1868d9d..90cd3e9 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -57,7 +57,7 @@ Check_package chroot/usr/share/doc/mtools mtools Check_package chroot/sbin/parted parted -if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ] +if [ "${LB_ARCHITECTURES}" = "sparc" ] then case "${LB_BINARY_FILESYSTEM}" in ext2|ext3|ext4) @@ -154,7 +154,7 @@ echo "!!! The following error/warning messages can be ignored !!!" Losetup $FREELO chroot/binary.img 0 -case "${LIVE_IMAGE_ARCHITECTURE}" in +case "${LB_ARCHITECTURES}" in sparc) PARTITION_TABLE_TYPE="sun" ;; @@ -333,7 +333,7 @@ mv chroot/dev.tmp chroot/dev fi -mv chroot/binary.img ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE} +mv chroot/binary.img ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES} # Saving cache Save_cache cache/packages.binary diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index 7abfc69..ddb3e64 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -26,11 +26,11 @@ case "${LIVE_IMAGE_TYPE}" in iso) - IMAGE="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.iso" + IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.iso" ;; iso-hybrid) - IMAGE="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.hybrid.iso" + IMAGE="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.hybrid.iso" ;; *) diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image index e8e8ce7..e2aa7c0 100755 --- a/scripts/build/binary_linux-image +++ b/scripts/build/binary_linux-image @@ -57,7 +57,7 @@ ;; esac -case "${LIVE_IMAGE_ARCHITECTURE}" in +case "${LB_ARCHITECTURES}" in powerpc) LINUX="vmlinux" ;; diff --git a/scripts/build/binary_loadlin b/scripts/build/binary_loadlin index c2e2a76..e771c29 100755 --- a/scripts/build/binary_loadlin +++ b/scripts/build/binary_loadlin @@ -43,7 +43,7 @@ # Creating lock file Create_lockfile .lock -case "${LIVE_IMAGE_ARCHITECTURE}" in +case "${LB_ARCHITECTURES}" in amd64|i386) case "${LB_BUILD_WITH_CHROOT}" in true) diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest index 3f6bad8..664a4ac 100755 --- a/scripts/build/binary_manifest +++ b/scripts/build/binary_manifest @@ -65,9 +65,9 @@ echo "$(diff chroot.packages.live chroot.packages.install | awk '/^< / { print $2 }')" \ > "binary/${INITFS}/filesystem.${SUFFIX}-remove" -cp chroot.packages.live ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.packages +cp chroot.packages.live ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.packages -cp chroot.files ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.files +cp chroot.files ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.files # Creating stage file Create_stagefile .build/binary_manifest diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest index 1656b9a..5e8d175 100755 --- a/scripts/build/binary_memtest +++ b/scripts/build/binary_memtest @@ -43,7 +43,7 @@ # Creating lock file Create_lockfile .lock -if [ "${LIVE_IMAGE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_IMAGE_ARCHITECTURE}" != "i386" ] +if [ "${LB_ARCHITECTURES}" != "amd64" ] && [ "${LB_ARCHITECTURES}" != "i386" ] then Echo_warning "skipping binary_memtest, foreign architecture." exit 0 diff --git a/scripts/build/binary_netboot b/scripts/build/binary_netboot index 00a0233..2290ac1 100755 --- a/scripts/build/binary_netboot +++ b/scripts/build/binary_netboot @@ -48,7 +48,7 @@ # Creating lock file Create_lockfile .lock -if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ] +if [ "${LB_ARCHITECTURES}" = "sparc" ] then # Checking depends Check_package chroot/usr/bin/elftoaout sparc-utils @@ -119,7 +119,7 @@ fi # Remove old binary -rm -f ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar.xz +rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.xz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar.xz # Creating image file ROOT_DIR=$(basename ${LB_NET_ROOT_PATH}) @@ -142,23 +142,23 @@ mkdir tftpboot/live mv */live/vmlinuz* */live/initrd* tftpboot/live -tar cf ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar * +tar cf ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar * case "${LB_COMPRESSION}" in bzip2) - bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar + bzip2 ${BZIP2_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ;; gzip) - gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar + gzip ${GZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ;; lzip) - lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar + lzip ${LZIP_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ;; xz) - xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar + xz ${XZ_OPTIONS} ../${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar ;; none) diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists index 0584c59..ff19c3c 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -101,7 +101,7 @@ Expand_packagelist "${LIST}" "config/package-lists" > chroot/root/"$(basename ${LIST})" # Downloading additional packages - Chroot chroot "xargs --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install" + Chroot chroot "xargs --no-run-if-empty --arg-file=/root/$(basename ${LIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install" # Remove package list rm chroot/root/"$(basename ${LIST})" @@ -110,6 +110,10 @@ for FILE in chroot/binary.deb/archives/*.deb do + if [ ! -e ${FILE} ]; then + break # Do nothing if the package lists were empty... + fi + SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')" SECTION="$(dpkg -f ${FILE} Section | awk '{ print $1 }')" @@ -151,9 +155,9 @@ do SECTION="$(basename ${SECTION})" - mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE} - apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages - gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz + mkdir -p ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES} + apt-ftparchive packages ${POOL}/${SECTION} > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages + gzip -9 -c ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > ${DISTS}/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz done cd "${OLDPWD}" diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index 4c13346..e950505 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -38,7 +38,7 @@ # Creating lock file Create_lockfile .lock -case "${LIVE_IMAGE_ARCHITECTURE}" in +case "${LB_ARCHITECTURES}" in amd64|i386) LINUX="vmlinuz" ;; diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index abd900a..568b3f7 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -143,7 +143,7 @@ ;; *) - Check_package chroot/share/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER} + Check_package chroot/usr/lib/$(echo ${_BOOTLOADER} | tr [a-z] [A-Z]) ${_BOOTLOADER} Check_package chroot/usr/lib/syslinux syslinux-common ;; esac @@ -286,7 +286,7 @@ eval _VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`" _DISTRIBUTION="${LB_DISTRIBUTION}" -_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}" +_ARCHITECTURE="${LB_ARCHITECTURES}" _DATE=$(date -R) _YEAR="$(date +%Y)" diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar index b973aa1..2dc77d8 100755 --- a/scripts/build/binary_tar +++ b/scripts/build/binary_tar @@ -44,24 +44,24 @@ Create_lockfile .lock # Remove old binary -rm -f ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.bz2 ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.gz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.lz ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar +rm -f ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.bz2 ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.gz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.lz ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar -tar cf ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}. +tar cf ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}. case "${LB_COMPRESSION}" in bzip2) - bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar + bzip2 ${BZIP2_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar ;; gzip) - gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar + gzip ${GZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar ;; lzip) - lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar + lzip ${LZIP_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar ;; xz) - xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar.tar + xz ${XZ_OPTIONS} ${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar.tar ;; none) diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader index e93e31a..4011446 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -43,7 +43,7 @@ # Creating lock file Create_lockfile .lock -case "${LIVE_IMAGE_ARCHITECTURE}" in +case "${LB_ARCHITECTURES}" in amd64|i386) if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then @@ -77,18 +77,18 @@ cat > binary/win32-loader.ini << EOF [installer] kernel=linux -arch=${LIVE_IMAGE_ARCHITECTURE} +arch=${LB_ARCHITECTURES} default_desktop=gnome -${LIVE_IMAGE_ARCHITECTURE}/linux=install/vmlinuz -${LIVE_IMAGE_ARCHITECTURE}/initrd=install/initrd.gz +${LB_ARCHITECTURES}/linux=install/vmlinuz +${LB_ARCHITECTURES}/initrd=install/initrd.gz EOF if [ -e binary/install/gtk ] then cat >> binary/win32-loader.ini << EOF -${LIVE_IMAGE_ARCHITECTURE}/gtk/linux=install/vmlinuz -${LIVE_IMAGE_ARCHITECTURE}/gtk/initrd=install/gtk/initrd.gz +${LB_ARCHITECTURES}/gtk/linux=install/vmlinuz +${LB_ARCHITECTURES}/gtk/initrd=install/gtk/initrd.gz EOF fi diff --git a/scripts/build/binary_zsync b/scripts/build/binary_zsync index 9b3d85a..fd2fe01 100755 --- a/scripts/build/binary_zsync +++ b/scripts/build/binary_zsync @@ -59,23 +59,23 @@ case "${LIVE_IMAGE_TYPE}" in iso) - _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.iso" + _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.iso" ;; iso-hybrid) - _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.hybrid.iso" + _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.hybrid.iso" ;; hdd) - _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.img" + _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.img" ;; net) - _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.netboot.tar*" + _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.netboot.tar*" ;; tar) - _IMAGES="${LIVE_IMAGE_NAME}-${LIVE_IMAGE_ARCHITECTURE}.tar*" + _IMAGES="${LIVE_IMAGE_NAME}-${LB_ARCHITECTURES}.tar*" ;; esac diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives index f5816e2..c2e37db 100755 --- a/scripts/build/bootstrap_archives +++ b/scripts/build/bootstrap_archives @@ -74,11 +74,11 @@ _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" - echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi @@ -103,20 +103,20 @@ if [ "${LB_MODE}" = progress-linux ] then - echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi else if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}/updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}/updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -144,11 +144,11 @@ if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -171,11 +171,11 @@ if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -187,7 +187,7 @@ then sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ - -e "s|@ARCHIVE_AREAS@|${LIVE_IMAGE_ARCHIVE_AREAS}|g" \ + -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" @@ -204,7 +204,7 @@ do if [ -e "${FILE}" ] then - cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .chroot) + cp ${FILE} chroot/etc/apt/apt.conf.d/$(basename ${FILE} .chroot) fi done @@ -244,8 +244,8 @@ done fi -# Installing aptitude (FIXME) -if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ] +# Installing aptitude +if [ "${LB_APT}" = "aptitude" ] && [ ! -x chroot/usr/bin/aptitude ] then Chroot chroot "apt-get ${APT_OPTIONS} update" Chroot chroot "apt-get ${APT_OPTIONS} install aptitude" diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap index 7663ed9..490352b 100755 --- a/scripts/build/bootstrap_cdebootstrap +++ b/scripts/build/bootstrap_cdebootstrap @@ -58,9 +58,9 @@ mkdir -p chroot # Setting cdebootstrap options -if [ -n "${LIVE_IMAGE_ARCHITECTURE}" ] +if [ -n "${LB_ARCHITECTURES}" ] then - CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LIVE_IMAGE_ARCHITECTURE}" + CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}" fi if [ "${_DEBUG}" = "true" ] @@ -107,7 +107,7 @@ Echo_breakage "Running ${LB_BOOTSTRAP}... " # Run appropriate bootstrap, i.e. foreign or regular bootstrap - if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LIVE_IMAGE_ARCHITECTURE}" ]; then + if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURES}" ]; then if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ] then diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 4146788..76fe32e 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -58,15 +58,15 @@ mkdir -p chroot # Setting debootstrap options -if [ -n "${LIVE_IMAGE_ARCHITECTURE}" ] +if [ -n "${LB_ARCHITECTURES}" ] then - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LIVE_IMAGE_ARCHITECTURE}" + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}" fi -if [ "${LIVE_IMAGE_ARCHIVE_AREAS}" != "main" ] +if [ "${LB_ARCHIVE_AREAS}" != "main" ] then # Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas - DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LIVE_IMAGE_ARCHIVE_AREAS} | sed -e 's| |,|g')" + DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')" fi if [ "${_VERBOSE}" = "true" ] @@ -105,7 +105,7 @@ Echo_breakage "Running debootstrap... " # Run appropriate bootstrap, i.e. foreign or regular bootstrap - if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LIVE_IMAGE_ARCHITECTURE}" ]; then + if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURES}" ]; then if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ] then diff --git a/scripts/build/build b/scripts/build/build index 9c3cf4f..cf0bf7b 100755 --- a/scripts/build/build +++ b/scripts/build/build @@ -65,7 +65,7 @@ Check_defaults Echo_message "live-build ${LIVE_BUILD_VERSION}" -Echo_message "Building config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE} system" +Echo_message "Building config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system" # Bootstrapping system lb bootstrap ${@} diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index bae7439..4448320 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -75,11 +75,11 @@ _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" - echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi @@ -104,20 +104,20 @@ if [ "${LB_MODE}" = progress-linux ] then - echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi else if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}/updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}/updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -145,11 +145,11 @@ if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -172,11 +172,11 @@ if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_CHROOT} ${_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -188,7 +188,7 @@ then sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ - -e "s|@ARCHIVE_AREAS@|${LIVE_IMAGE_ARCHIVE_AREAS}|g" \ + -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot)" @@ -205,7 +205,7 @@ do if [ -e "${FILE}" ] then - cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .chroot) + cp ${FILE} chroot/etc/apt/apt.conf.d/$(basename ${FILE} .chroot) fi done @@ -231,9 +231,9 @@ fi # Copy packages - if Find_files config/packages.chroot/*_"${LIVE_IMAGE_ARCHITECTURE}".deb || Find_files config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb - then - for FILE in config/packages.chroot/*_"${LIVE_IMAGE_ARCHITECTURE}".deb config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb + if Find_files config/packages.chroot/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb + then + for FILE in config/packages.chroot/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb do if [ -L "${FILE}" ] then @@ -456,8 +456,8 @@ done fi - # Installing aptitude (FIXME) - if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ] + # Installing aptitude + if [ "${LB_APT}" = "aptitude" ] && [ ! -x /chroot/usr/bin/aptitude ] then Chroot chroot "apt-get ${APT_OPTIONS} update" Chroot chroot "apt-get ${APT_OPTIONS} install aptitude" @@ -567,11 +567,11 @@ _DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')" - echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION} ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi @@ -596,20 +596,20 @@ if [ "${LB_MODE}" = progress-linux ] then - echo "deb ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}-security ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}-security ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi else if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}/updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}/updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}/updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -637,11 +637,11 @@ if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-updates ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-updates ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -664,11 +664,11 @@ if [ "${LB_DERIVATIVE}" = "true" ] then - echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list if [ "${_PASS}" = "source" ] || [ "${LB_APT_SOURCE_ARCHIVES}" = "true" ] then - echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-backports ${LIVE_IMAGE_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list + echo "deb-src ${LB_MIRROR_BINARY} ${_DISTRIBUTION}-backports ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list fi fi fi @@ -687,7 +687,7 @@ do if [ -e "${FILE}" ] then - rm -f "chroot/etc/apt/conf.d/$(basename ${FILE} .chroot)" + rm -f "chroot/etc/apt/apt.conf.d/$(basename ${FILE} .chroot)" fi done @@ -707,7 +707,7 @@ then sed -e "s|@DISTRIBUTION@|${LB_DISTRIBUTION}|g" \ -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ - -e "s|@ARCHIVE_AREAS@|${LIVE_IMAGE_ARCHIVE_AREAS}|g" \ + -e "s|@ARCHIVE_AREAS@|${LB_ARCHIVE_AREAS}|g" \ -e "s|@PARENT_ARCHIVE_AREAS@|${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}|g" \ "${FILE}" > "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary)" @@ -724,7 +724,7 @@ do if [ -e "${FILE}" ] then - cp ${FILE} chroot/etc/apt/conf.d/$(basename ${FILE} .binary) + cp ${FILE} chroot/etc/apt/apt.conf.d/$(basename ${FILE} .binary) fi done diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware index b2446f7..7c90911 100755 --- a/scripts/build/chroot_firmware +++ b/scripts/build/chroot_firmware @@ -56,15 +56,15 @@ FIRMWARE_PACKAGES="" -_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)" +_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" -rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} +rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} for _CONTENT in ${_CONTENTS} do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} + wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)" + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" done if echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" @@ -78,17 +78,20 @@ then # FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). - _CONTENTS="$(for _ARCHIVE_AREA in ${LIVE_IMAGE_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)" + _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" - rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} + rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} for _CONTENT in ${_CONTENTS} do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} + wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)" + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" done fi + +# Remove broken packages +FIRMWARE_PACKAGES="$(echo ${FIRMWARE_PACKAGES} | grep -v prism2-usb-firmware-installer || true)" # Drop section and keep package names only for _PACKAGE in ${FIRMWARE_PACKAGES} diff --git a/scripts/build/chroot_includes b/scripts/build/chroot_includes index 78a4166..51408c7 100755 --- a/scripts/build/chroot_includes +++ b/scripts/build/chroot_includes @@ -46,5 +46,5 @@ cd "${OLDPWD}" # Creating stage file - Create_stagefile .build/chroot_includes + Create_stagefile .build/includs.chroot fi diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists index ba808bd..072343c 100755 --- a/scripts/build/chroot_package-lists +++ b/scripts/build/chroot_package-lists @@ -93,9 +93,9 @@ for _PACKAGE_ARCHITECTURE in $(Discover_package_architectures "chroot/root/packages.chroot") do # If this is a foreign architecture, append to packages.foreign-architectures - if [ "${_PACKAGE_ARCHITECTURE}" != "${LIVE_IMAGE_ARCHITECTURE}" ] + if [ "${_PACKAGE_ARCHITECTURE}" != "${LB_ARCHITECTURES}" ] then - Echo_message "Accepting foreign architecture: ${_PACKAGE_ARCHITECTURE}, live image architecture is: ${LIVE_IMAGE_ARCHITECTURE}" + Echo_message "Accepting foreign architecture: ${_PACKAGE_ARCHITECTURE}, live image architecture is: ${LB_ARCHITECTURES}" echo "${_PACKAGE_ARCHITECTURE}" >> chroot/root/packages.foreign-architectures fi done @@ -112,7 +112,7 @@ fi # Saving cache - Save_cache cache/packages.binary + Save_cache cache/packages.chroot ;; esac diff --git a/scripts/build/config b/scripts/build/config index e3b1e51..0cf42ab 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -32,7 +32,7 @@ \t [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\ \t [--bootappend-live-failsafe PARAMETER|\"PARAMETERS\"]\n\ -\t [--bootloader grub|syslinux]\n\ +\t [--bootloader grub|grub2|syslinux]\n\ \t [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap]\n\ \t [--cache true|false]\n\ \t [--cache-indices true|false]\n\ @@ -64,7 +64,7 @@ \t [--ignore-system-defaults]\n\ \t [--initramfs auto|none|live-boot|casper]\n\ \t [--initramfs-compression bzip2|gzip|lzma]\n\ -\t [--initsystem sysvinit|runit|systemd|upstart|none]\n\ +\t [--initsystem sysvinit|systemd|upstart|none]\n\ \t [--image-name [NAME]\n\ \t [--interactive shell]\n\ \t [--isohybrid-options OPTION|\"OPTIONS\"]\n\ @@ -347,7 +347,7 @@ # config/bootstrap -a|--architectures) - LIVE_IMAGE_ARCHITECTURE="${2}" + LB_ARCHITECTURES="${2}" shift 2 ;; @@ -422,7 +422,7 @@ ;; --archive-areas) - LIVE_IMAGE_ARCHIVE_AREAS="${2}" + LB_ARCHIVE_AREAS="${2}" shift 2 ;; @@ -883,10 +883,10 @@ if [ ! -e config ] then - Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE} system" + Echo_message "Creating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system" mkdir config else - Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE} system" + Echo_message "Updating config tree for a ${LB_MODE}/${LB_DISTRIBUTION}/${LB_ARCHITECTURES} system" fi # Creating live-build configuration @@ -1353,28 +1353,52 @@ if [ ! -e config/package-lists/live.list.chroot ] then - -cat > config/package-lists/live.list.chroot << EOF -live-boot -live-config -EOF - -case "${LB_PARENT_DISTRIBUTION}" in - wheezy) - echo "live-config-sysvinit" >> config/package-lists/live.list.chroot - ;; - - *) - echo "live-config-systemd" >> config/package-lists/live.list.chroot - ;; + mkdir -p config/package-lists + + case "${LB_INITRAMFS}" in + live-boot) + echo "live-boot" > config/package-lists/live.list.chroot + echo "live-config" >> config/package-lists/live.list.chroot + + case "${LB_PARENT_DISTRIBUTION}" in + wheezy) + echo "live-config-sysvinit" >> config/package-lists/live.list.chroot + ;; + + *) + case "${LB_INITSYSTEM}" in + none) + # do nothing + ;; + + systemd) + echo "live-config-systemd" >> config/package-lists/live.list.chroot + echo "dbus" >> config/package-lists/live.list.chroot + ;; + + sysvinit|upstart) + echo "live-config-${LB_INITSYSTEM}" >> config/package-lists/live.list.chroot + echo "sysvinit-core" >> config/package-lists/live.list.chroot + ;; + esac + ;; + esac + ;; + + casper) + echo "casper" > config/package-lists/live.list.chroot + ;; + + *) + ;; esac fi cat > config/build << EOF [Image] -Architecture: ${LIVE_IMAGE_ARCHITECTURE} -Archive-Areas: ${LIVE_IMAGE_ARCHIVE_AREAS} +Architecture: ${LB_ARCHITECTURES} +Archive-Areas: ${LB_ARCHIVE_AREAS} Distribution: ${LB_DISTRIBUTION} Mirror-Bootstrap: ${LB_MIRROR_BOOTSTRAP} EOF @@ -1384,7 +1408,7 @@ cat >> config/build << EOF -Parent-Archive-Areas: ${LIVE_IMAGE_ARCHIVE_AREAS} +Parent-Archive-Areas: ${LB_ARCHIVE_AREAS} Parent-Distribution: ${LB_PARENT_DISTRIBUTION} Parent-Mirror-Bootstrap: ${LB_PARENT_MIRROR_BOOTSTRAP} EOF diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 6415fff..5f6b3ca 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -76,7 +76,7 @@ # Setting destination directory case "${LIVE_IMAGE_TYPE}" in netboot) - DESTDIR="tftpboot/debian-install/${LIVE_IMAGE_ARCHITECTURE}" + DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}" ;; hdd*|tar) @@ -107,9 +107,9 @@ esac # Set architecture-specific variables -case "${LIVE_IMAGE_ARCHITECTURE}" in +case "${LB_ARCHITECTURES}" in armel) - DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')" + DEFAULT_FLAVOUR="$(echo ${LB_LINUX_FLAVOURS} | awk '{ print $1 }')" case "${DI_IMAGE_TYPE}" in cdrom) DI_REMOTE_BASE="${DEFAULT_FLAVOUR}/cdrom" @@ -127,11 +127,11 @@ powerpc) case "${DI_IMAGE_TYPE}" in cdrom) - DI_REMOTE_BASE="${LIVE_IMAGE_ARCHITECTURE}/cdrom" + DI_REMOTE_BASE="${LB_ARCHITECTURES}/cdrom" ;; netboot) - DI_REMOTE_BASE="${LIVE_IMAGE_ARCHITECTURE}/netboot" + DI_REMOTE_BASE="${LB_ARCHITECTURES}/netboot" ;; esac @@ -149,8 +149,8 @@ *) case "${DI_IMAGE_TYPE}" in netboot) - DI_REMOTE_BASE="netboot/debian-installer/${LIVE_IMAGE_ARCHITECTURE}" - DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LIVE_IMAGE_ARCHITECTURE}" + DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURES}" + DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURES}" DI_REMOTE_KERNEL="linux" ;; @@ -255,9 +255,9 @@ LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" # Debian Installer daily builds - URL="http://d-i.debian.org/daily-images/${LIVE_IMAGE_ARCHITECTURE}/daily/" + URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" else - URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LIVE_IMAGE_ARCHITECTURE}/current/images/" + URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" fi ;; @@ -267,23 +267,23 @@ LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" # Debian Installer daily builds - URL="http://d-i.debian.org/daily-images/${LIVE_IMAGE_ARCHITECTURE}/daily/" + URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" else - URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LIVE_IMAGE_ARCHITECTURE}/current/images/" + URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" fi if [ "${LB_MODE}" = "progress-linux" ] then # FIXME: normal derivatives probably don't rebuild d-i, # but progress-linux does. - URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LIVE_IMAGE_ARCHITECTURE}/current/images/" + URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" fi ;; esac mkdir -p "${DESTDIR_DI}" -if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ] +if [ "${LB_ARCHITECTURES}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ] then # There are no prepared kernel/initrd pairs for sparc netboot so we # must unpack them from a mini.iso @@ -306,7 +306,7 @@ DOWNLOAD_GTK_INSTALLER=0 if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ] then - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) DOWNLOAD_GTK_INSTALLER=1 ;; @@ -337,7 +337,7 @@ mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp touch chroot/var/lib/dpkg/status - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64) DI_REQ_PACKAGES="lilo grub-pc" @@ -419,15 +419,15 @@ FIRMWARE_PACKAGES="" - _CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)" - - rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} + _CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" + + rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} for _CONTENT in ${_CONTENTS} do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} - - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)" + wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} + + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" done if echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" @@ -441,15 +441,15 @@ then # FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). - _CONTENTS="$(for _ARCHIVE_AREA in ${LIVE_IMAGE_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LIVE_IMAGE_ARCHITECTURE}.gz; done)" - - rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} + _CONTENTS="$(for _ARCHIVE_AREA in ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" + + rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} for _CONTENT in ${_CONTENTS} do - wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} - - FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)" + wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} + + FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} | sort -u)" done fi @@ -493,7 +493,7 @@ mv chroot/binary.deb ./ - for _ARCHIVE_AREA in $(echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} ${LIVE_IMAGE_ARCHIVE_AREAS}) + for _ARCHIVE_AREA in $(echo ${LIVE_IMAGE_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS}) do mkdir -p binary/pool/${_ARCHIVE_AREA} done @@ -523,9 +523,9 @@ fi # Including local debs - if Find_files config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".deb || Find_files config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb - then - for FILE in config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".deb config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb + if Find_files config/packages.binary/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb + then + for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb do if [ -e "${FILE}" ] then @@ -548,18 +548,18 @@ # Generating deb indices for _ARCHIVE_AREA in $(cd binary/pool && ls) do - mkdir -p binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE} + mkdir -p binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES} mv binary chroot/root - echo "cd /root/binary && apt-ftparchive packages pool/${_ARCHIVE_AREA} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages" > chroot/binary.sh + echo "cd /root/binary && apt-ftparchive packages pool/${_ARCHIVE_AREA} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh Chroot chroot "sh binary.sh" rm -f chroot/binary.sh mv chroot/root/binary ./ - gzip -9 -c binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz + gzip -9 -c binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages > binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Packages.gz # Fetching release - Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Release + Download_file binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES}/Release "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/${_ARCHIVE_AREA}/binary-"${LB_ARCHITECTURES}"/Release done # Symlink firmware packages to /firmware @@ -584,12 +584,12 @@ cd binary.udeb # Downloading udeb indices - Download_file Packages.gz "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Packages.gz + Download_file Packages.gz "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz gunzip -c Packages.gz > Packages if [ "${LB_DERIVATIVE}" = "true" ] then - Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Packages.gz + Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz gunzip -c Packages.derivative.gz > Packages.derivative fi @@ -630,9 +630,9 @@ cp *.udeb ../cache/packages.installer_debian-installer.udeb # Including local udebs - if Find_files ../config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb || Find_files ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb - then - for FILE in ../config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb + if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURES}".udeb + then + for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb ../config/packages/*_"${LB_ARCHITECTURES}".udeb do if [ -e "${FILE}" ] then @@ -665,7 +665,7 @@ then grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/udeb_exclude" > exclude || true grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs" >> exclude || true - grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LIVE_IMAGE_ARCHITECTURE}" >> exclude || true + grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LB_ARCHITECTURES}" >> exclude || true continue fi @@ -701,17 +701,17 @@ done # Creating udeb indices - mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}" + mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}" cd "${OLDPWD}" mv binary.udeb chroot/root - echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages" > chroot/binary.sh + echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh Chroot chroot "sh binary.sh" rm -f chroot/binary.sh mv chroot/root/binary.udeb ./ cd binary.udeb - gzip -9 -c dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz + gzip -9 -c dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LB_ARCHITECTURES}/Packages.gz rm -f Packages* exclude find . | cpio -dmpu "${OLDPWD}"/binary @@ -743,7 +743,7 @@ -o APT::FTPArchive::Release::Version="${_VERSION}" \ -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \ -o APT::FTPArchive::Release::Date="$(date -R)" \ - -o APT::FTPArchive::Release::Architectures="${LIVE_IMAGE_ARCHITECTURE}" \ + -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ -o APT::FTPArchive::Release::Components="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" \ -o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \ release dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/Release diff --git a/scripts/build/source_debian b/scripts/build/source_debian index 365e6e0..961070a 100755 --- a/scripts/build/source_debian +++ b/scripts/build/source_debian @@ -83,7 +83,7 @@ ;; esac -case "${LIVE_IMAGE_ARCHITECTURE}" in +case "${LB_ARCHITECTURES}" in amd64|i386) cat >> source-selection.txt << EOF diff --git a/share/hooks/0030-enable-cryptsetup.hook.chroot b/share/hooks/0030-enable-cryptsetup.hook.chroot new file mode 100755 index 0000000..54c2978 --- /dev/null +++ b/share/hooks/0030-enable-cryptsetup.hook.chroot @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +# Enable cryptsetup + +if [ -e /sbin/cryptsetup ] +then + if [ ! -e /etc/initramfs-tools/conf.d/cryptsetup ] + then + mkdir -p /etc/initramfs-tools/conf.d + +cat > /etc/initramfs-tools/conf.d/cryptsetup << EOF +# /etc/initramfs-tools/conf.d/cryptsetup + +CRYPTSETUP=yes +export CRYPTSETUP +EOF + + fi +fi diff --git a/templates/cgi/debian/build.html b/templates/cgi/debian/build.html index b16e35a..e3dffbd 100644 --- a/templates/cgi/debian/build.html +++ b/templates/cgi/debian/build.html @@ -22,8 +22,8 @@ Advanced bootstrap options - - + +
--architectures: LIVE_IMAGE_ARCHITECTURE
--archive-areas: LIVE_IMAGE_ARCHIVE_AREAS
--architectures: LB_ARCHITECTURES
--archive-areas: LB_ARCHIVE_AREAS
Advanced chroot options diff --git a/templates/cgi/debian/form.html b/templates/cgi/debian/form.html index d8c76e8..94f760d 100644 --- a/templates/cgi/debian/form.html +++ b/templates/cgi/debian/form.html @@ -173,6 +173,7 @@