diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 07:39:58 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2014-12-10 07:39:58 +0100 |
| commit | 1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034 (patch) | |
| tree | b98ff62505af2e1d3b2e0e394ffb92f81239cfec | |
| parent | 7b6dfd9d167b5ef09c6c1812f17e6df302f45897 (diff) | |
| download | vyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.tar.gz vyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.zip | |
Cleaning up from python removal (LIVE_IMAGE_ARCHITECTURE).
30 files changed, 136 insertions, 136 deletions
diff --git a/frontend/cgi/live-build-cgi b/frontend/cgi/live-build-cgi index c2b56ce1b..556eb1c5f 100755 --- a/frontend/cgi/live-build-cgi +++ b/frontend/cgi/live-build-cgi @@ -81,7 +81,7 @@ else 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) + LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) LIVE_IMAGE_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1) # Advanced chroot options @@ -139,7 +139,7 @@ else -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/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \ -e "s/LIVE_IMAGE_ARCHIVE_AREAS/${LIVE_IMAGE_ARCHIVE_AREAS}/" \ -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \ -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \ @@ -185,7 +185,7 @@ LB_DISTRIBUTION="${LB_DISTRIBUTION}" LB_APT="${LB_APT}" # Advanced bootstrap options -LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}" +LB_ARCHITECTURES="${LB_ARCHITECTURES}" LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS}" # Advanced chroot options @@ -214,7 +214,7 @@ LB_SOURCE="${LB_SOURCE}" 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 ${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 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 b5e81c6cd..4f6a0f84f 100755 --- a/frontend/cgi/live-build-cgi.cron +++ b/frontend/cgi/live-build-cgi.cron @@ -102,7 +102,7 @@ then 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 "${LIVE_IMAGE_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}" _ERRORCONFIG="${?}" else echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" >> "${_BUILD_PATH}"/log @@ -129,10 +129,10 @@ then 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 df145c147..4d253c2d4 100755 --- a/functions/architectures.sh +++ b/functions/architectures.sh @@ -15,7 +15,7 @@ Check_architectures () 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 @@ Check_crossarchitectures () ;; 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_crossarchitectures () 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 055c91367..136e51b2e 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -16,7 +16,7 @@ Get_conffiles () 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}" diff --git a/functions/defaults.sh b/functions/defaults.sh index aa9c3dd8e..0a4e68e09 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -46,9 +46,9 @@ New_configuration () 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)}" @@ -330,7 +330,7 @@ Set_defaults () 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 +383,7 @@ Set_defaults () ;; 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 +413,7 @@ Set_defaults () ;; 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 +440,7 @@ Set_defaults () ;; 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 +467,7 @@ Set_defaults () ;; 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 +516,7 @@ Set_defaults () esac # Setting linux flavour string - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in armel) case "${LB_MODE}" in ubuntu) @@ -589,7 +589,7 @@ Set_defaults () 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 ;; @@ -602,7 +602,7 @@ Set_defaults () 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 ;; @@ -619,7 +619,7 @@ Set_defaults () 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 ;; @@ -632,7 +632,7 @@ Set_defaults () 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 ;; @@ -643,7 +643,7 @@ Set_defaults () ;; *) - Echo_error "Architecture(s) ${LIVE_IMAGE_ARCHITECTURE} not yet supported (FIXME)" + Echo_error "Architecture(s) ${LB_ARCHITECTURES} not yet supported (FIXME)" exit 1 ;; esac @@ -684,7 +684,7 @@ Set_defaults () ## config/binary # Setting image filesystem - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in sparc) LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext4}" ;; @@ -695,7 +695,7 @@ Set_defaults () esac # Setting image type - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" ;; @@ -719,7 +719,7 @@ Set_defaults () # Setting bootloader if [ -z "${LB_BOOTLOADER}" ] then - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) LB_BOOTLOADER="syslinux" ;; @@ -916,7 +916,7 @@ Set_defaults () ;; *) - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then @@ -940,7 +940,7 @@ Set_defaults () ;; *) - case "${LIVE_IMAGE_ARCHITECTURE}" in + case "${LB_ARCHITECTURES}" in amd64|i386) if [ "${LB_DEBIAN_INSTALLER}" != "false" ] then diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums index 542c28c3b..f7d5e46aa 100755 --- a/scripts/build/binary_checksums +++ b/scripts/build/binary_checksums @@ -89,7 +89,7 @@ done # 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 2184a3f9b..a784049f6 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -48,7 +48,7 @@ Create_lockfile .lock 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 @@ case "${LB_DEBIAN_INSTALLER}" in 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 @@ case "${LB_DEBIAN_INSTALLER}" in 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 @@ case "${LB_DEBIAN_INSTALLER}" in 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 1868d9d9b..90cd3e9d0 100755 --- a/scripts/build/binary_hdd +++ b/scripts/build/binary_hdd @@ -57,7 +57,7 @@ esac 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 @@ fi 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 @@ then 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 7abfc697a..ddb3e64a4 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -26,11 +26,11 @@ Set_defaults 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 e8e8ce735..e2aa7c0f7 100755 --- a/scripts/build/binary_linux-image +++ b/scripts/build/binary_linux-image @@ -57,7 +57,7 @@ case "${LB_INITRAMFS}" in ;; 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 c2e2a76d9..e771c2931 100755 --- a/scripts/build/binary_loadlin +++ b/scripts/build/binary_loadlin @@ -43,7 +43,7 @@ Check_lockfile .lock # 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 3f6bad863..664a4ac81 100755 --- a/scripts/build/binary_manifest +++ b/scripts/build/binary_manifest @@ -65,9 +65,9 @@ cp chroot.packages.live "binary/${INITFS}/filesystem.${SUFFIX}" 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 1656b9a9c..5e8d1752b 100755 --- a/scripts/build/binary_memtest +++ b/scripts/build/binary_memtest @@ -43,7 +43,7 @@ Check_lockfile .lock # 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 00a0233b9..2290ac10d 100755 --- a/scripts/build/binary_netboot +++ b/scripts/build/binary_netboot @@ -48,7 +48,7 @@ Check_lockfile .lock # 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 @@ then 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 @@ cd binary.tmp 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 496d63159..ff19c3c6c 100755 --- a/scripts/build/binary_package-lists +++ b/scripts/build/binary_package-lists @@ -155,9 +155,9 @@ then 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 4c13346d6..e950505fb 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -38,7 +38,7 @@ Check_lockfile .lock # 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 f0dba0e32..568b3f757 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -286,7 +286,7 @@ fi 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 b973aa18a..2dc77d875 100755 --- a/scripts/build/binary_tar +++ b/scripts/build/binary_tar @@ -44,24 +44,24 @@ Check_lockfile .lock 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 e93e31a60..401144687 100755 --- a/scripts/build/binary_win32-loader +++ b/scripts/build/binary_win32-loader @@ -43,7 +43,7 @@ Check_lockfile .lock # 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 @@ EOF 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 9b3d85afb..fd2fe01a7 100755 --- a/scripts/build/binary_zsync +++ b/scripts/build/binary_zsync @@ -59,23 +59,23 @@ Install_package 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_cdebootstrap b/scripts/build/bootstrap_cdebootstrap index 7663ed981..490352b45 100755 --- a/scripts/build/bootstrap_cdebootstrap +++ b/scripts/build/bootstrap_cdebootstrap @@ -58,9 +58,9 @@ Create_lockfile .lock 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 @@ then 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 414678846..263f6783d 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -58,9 +58,9 @@ Create_lockfile .lock 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" ] @@ -105,7 +105,7 @@ then 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 9c3cf4f9c..cf0bf7be9 100755 --- a/scripts/build/build +++ b/scripts/build/build @@ -65,7 +65,7 @@ Set_defaults 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 457d60e7b..0e1af8880 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -231,9 +231,9 @@ EOF fi # Copy packages - if Find_files config/packages.chroot/*_"${LIVE_IMAGE_ARCHITECTURE}".deb || Find_files 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/*_"${LIVE_IMAGE_ARCHITECTURE}".deb config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb + for FILE in config/packages.chroot/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb do if [ -L "${FILE}" ] then diff --git a/scripts/build/chroot_firmware b/scripts/build/chroot_firmware index e810bec86..8ff289c12 100755 --- a/scripts/build/chroot_firmware +++ b/scripts/build/chroot_firmware @@ -56,15 +56,15 @@ mkdir -p cache/contents.chroot 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,15 +78,15 @@ if [ "${LB_DERIVATIVE}" = "true" ] 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 ${LIVE_IMAGE_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 diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists index ba808bd92..414f2e51e 100755 --- a/scripts/build/chroot_package-lists +++ b/scripts/build/chroot_package-lists @@ -93,9 +93,9 @@ done 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 diff --git a/scripts/build/config b/scripts/build/config index e3b1e5170..a49154ec1 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -347,7 +347,7 @@ Local_arguments () # config/bootstrap -a|--architectures) - LIVE_IMAGE_ARCHITECTURE="${2}" + LB_ARCHITECTURES="${2}" shift 2 ;; @@ -883,10 +883,10 @@ Check_defaults 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 @@ -1373,7 +1373,7 @@ fi cat > config/build << EOF [Image] -Architecture: ${LIVE_IMAGE_ARCHITECTURE} +Architecture: ${LB_ARCHITECTURES} Archive-Areas: ${LIVE_IMAGE_ARCHIVE_AREAS} Distribution: ${LB_DISTRIBUTION} Mirror-Bootstrap: ${LB_MIRROR_BOOTSTRAP} diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 6415ffffd..40011a054 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -76,7 +76,7 @@ Install_package # 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,7 +107,7 @@ case "${LB_DEBIAN_INSTALLER}" in esac # Set architecture-specific variables -case "${LIVE_IMAGE_ARCHITECTURE}" in +case "${LB_ARCHITECTURES}" in armel) DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')" case "${DI_IMAGE_TYPE}" in @@ -127,11 +127,11 @@ case "${LIVE_IMAGE_ARCHITECTURE}" in 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 "${LIVE_IMAGE_ARCHITECTURE}" in *) 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 @@ case "${LB_DERIVATIVE}" in 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 @@ case "${LB_DERIVATIVE}" in 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 @@ else 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 @@ then 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 @@ then 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" @@ -441,15 +441,15 @@ then 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 ${LIVE_IMAGE_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 @@ -523,9 +523,9 @@ then fi # Including local debs - if Find_files config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".deb || Find_files 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/*_"${LIVE_IMAGE_ARCHITECTURE}".deb config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb + for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb do if [ -e "${FILE}" ] then @@ -548,18 +548,18 @@ then # 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 @@ then 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 @@ then 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 + if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURES}".udeb then - for FILE in ../config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb + for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb ../config/packages/*_"${LB_ARCHITECTURES}".udeb do if [ -e "${FILE}" ] then @@ -665,7 +665,7 @@ then 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 @@ then 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 @@ cd /root/binary && apt-ftparchive \ -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 365e6e010..961070aa6 100755 --- a/scripts/build/source_debian +++ b/scripts/build/source_debian @@ -83,7 +83,7 @@ case "${LB_BINARY_FILESYSTEM}" in ;; esac -case "${LIVE_IMAGE_ARCHITECTURE}" in +case "${LB_ARCHITECTURES}" in amd64|i386) cat >> source-selection.txt << EOF diff --git a/templates/cgi/debian/build.html b/templates/cgi/debian/build.html index b16e35a9e..fcfeb51f0 100644 --- a/templates/cgi/debian/build.html +++ b/templates/cgi/debian/build.html @@ -22,7 +22,7 @@ <b>Advanced bootstrap options</b> <table> - <tr><td>--architectures: </td><td>LIVE_IMAGE_ARCHITECTURE</td></tr> + <tr><td>--architectures: </td><td>LB_ARCHITECTURES</td></tr> <tr><td>--archive-areas: </td><td>LIVE_IMAGE_ARCHIVE_AREAS</td></tr> </table> |