Commit 1f7f6dd8 authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Cleaning up from python removal (LIVE_IMAGE_ARCHITECTURE).

parent 7b6dfd9d
......@@ -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
......@@ -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" \
......
......@@ -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
......
......@@ -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}"
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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"
;;
*)
......
......@@ -57,7 +57,7 @@ case "${LB_INITRAMFS}" in
;;
esac
case "${LIVE_IMAGE_ARCHITECTURE}" in
case "${LB_ARCHITECTURES}" in
powerpc)
LINUX="vmlinux"
;;
......
......@@ -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)
......
......@@ -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
......@@ -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
......
......@@ -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)
......
......@@ -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}"
......
......@@ -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"
;;
......
......@@ -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)"
......
......@@ -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)
......
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment