manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving off binary image architecture into new config tree format.

This commit is contained in:
Daniel Baumann 2012-12-19 11:16:57 +01:00
parent ec8aff4f49
commit 9949a3a912
23 changed files with 112 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontends/cgi/live-build-cgi
View File

@ -71,7 +71,7 @@ else
LB_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1) LB_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Advanced bootstrap options # Advanced bootstrap options
LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) LIVE_IMAGE_ARCHITECTURE=$(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) LB_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1)
# Advanced chroot options # Advanced chroot options
@ -127,7 +127,7 @@ else
-e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \ -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \
-e "s#_LB_CONFIG#${_LB_CONFIG}#" \ -e "s#_LB_CONFIG#${_LB_CONFIG}#" \
-e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \ -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \
-e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \ -e "s/LIVE_IMAGE_ARCHITECTURE/${LIVE_IMAGE_ARCHITECTURE}/" \
-e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \ -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \
-e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \ -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \
-e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \ -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \
@ -173,7 +173,7 @@ LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE}"
LB_DISTRIBUTION="${LB_DISTRIBUTION}" LB_DISTRIBUTION="${LB_DISTRIBUTION}"
# Advanced bootstrap options # Advanced bootstrap options
LB_ARCHITECTURES="${LB_ARCHITECTURES}" LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}"
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}" LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}"
# Advanced chroot options # Advanced chroot options
@ -202,7 +202,7 @@ LB_SOURCE="${LB_SOURCE}"
EOF EOF
echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live
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}|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 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}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LIVE_IMAGE_ARCHITECTURE}|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
fi fi
sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html

6
frontends/cgi/live-build-cgi.cron
View File

@ -90,7 +90,7 @@ then
then then
cd "${_BUILD_PATH}" cd "${_BUILD_PATH}"
# Do config with git and stack on config file params to build # Do config with git and stack on config file params to build
lb config --distribution "${LB_DISTRIBUTION}" --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}" lb config --distribution "${LB_DISTRIBUTION}" --architectures "${LIVE_IMAGE_ARCHITECTURE}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}"
_ERRORCONFIG="${?}" _ERRORCONFIG="${?}"
else else
echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_BUILD_PATH}"/log echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" > "${_BUILD_PATH}"/log
@ -115,10 +115,10 @@ then
if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ] if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ]
then then
_STATUS="maybe-successful" _STATUS="maybe-successful"
echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live-cgi.builds
else else
_STATUS="maybe-failed" _STATUS="maybe-failed"
echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LIVE_IMAGE_ARCHITECTURE}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live-cgi.builds
fi fi
sed -e "s/BUILD/${_BUILD}/g" \ sed -e "s/BUILD/${_BUILD}/g" \

6
functions/architectures.sh
View File

@ -15,7 +15,7 @@ Check_architectures ()
for ARCHITECTURE in ${ARCHITECTURES} for ARCHITECTURE in ${ARCHITECTURES}
do do
if [ "$(echo ${LB_ARCHITECTURES} | grep ${ARCHITECTURE})" ] if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | grep ${ARCHITECTURE})" ]
then then
VALID="true" VALID="true"
break break
@ -70,7 +70,7 @@ Check_crossarchitectures ()
;; ;;
esac esac
if [ "${LB_ARCHITECTURES}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ] if [ "${LIVE_IMAGE_ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ]
then then
if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ] if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ]
@ -93,7 +93,7 @@ Check_crossarchitectures ()
Check_multiarchitectures () Check_multiarchitectures ()
{ {
if [ "$(echo ${LB_ARCHITECTURES} | wc -w)" -gt "1" ] if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | wc -w)" -gt "1" ]
then then
# First, only support multiarch on iso # First, only support multiarch on iso
case "${LIVE_IMAGE_TYPE}" in case "${LIVE_IMAGE_TYPE}" in

2
functions/conffile.sh
View File

@ -16,7 +16,7 @@ Get_conffiles ()
else else
for FILE in ${@} for FILE in ${@}
do do
FILES="${FILES} ${FILE} ${FILE}.${LB_ARCHITECTURES} ${FILE}.${DISTRIBUTION}" FILES="${FILES} ${FILE} ${FILE}.${LIVE_IMAGE_ARCHITECTURE} ${FILE}.${DISTRIBUTION}"
FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||')" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||')"
FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${ARCHITECTURE}" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${ARCHITECTURE}"
FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}" FILES="${FILES} config/$(echo ${PROGRAM} | sed -e 's|^lb_||').${DISTRIBUTION}"

50
functions/defaults.sh
View File

@ -260,7 +260,7 @@ Set_defaults ()
fi fi
fi fi
if [ "${LB_ARCHITECTURE}" = "i386" ] && [ "$(uname -m)" = "x86_64" ] if [ "${LIVE_IMAGE_ARCHITECTURE}" = "i386" ] && [ "$(uname -m)" = "x86_64" ]
then then
_LINUX32="linux32" _LINUX32="linux32"
else else
@ -300,28 +300,28 @@ Set_defaults ()
## config/bootstrap ## config/bootstrap
# Setting architecture value # Setting architecture value
if [ -z "${LB_ARCHITECTURES}" ] if [ -z "${LIVE_IMAGE_ARCHITECTURE}" ]
then then
if [ -x "/usr/bin/dpkg" ] if [ -x "/usr/bin/dpkg" ]
then then
LB_ARCHITECTURES="$(dpkg --print-architecture)" LIVE_IMAGE_ARCHITECTURE="$(dpkg --print-architecture)"
else else
case "$(uname -m)" in case "$(uname -m)" in
sparc|powerpc) sparc|powerpc)
LB_ARCHITECTURES="$(uname -m)" LIVE_IMAGE_ARCHITECTURE="$(uname -m)"
;; ;;
x86_64) x86_64)
LB_ARCHITECTURES="amd64" LIVE_IMAGE_ARCHITECTURE="amd64"
;; ;;
*) *)
if [ -e /lib64 ] if [ -e /lib64 ]
then then
LB_ARCHITECTURES="amd64" LIVE_IMAGE_ARCHITECTURE="amd64"
else else
LB_ARCHITECTURES="i386" LIVE_IMAGE_ARCHITECTURE="i386"
fi fi
Echo_warning "Can't determine architecture, assuming ${LB_ARCHITECTURES}" Echo_warning "Can't determine architecture, assuming ${LIVE_IMAGE_ARCHITECTURE}"
;; ;;
esac esac
fi fi
@ -345,7 +345,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}" LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}"
;; ;;
@ -380,7 +380,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}" LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}"
;; ;;
@ -402,7 +402,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://archive.ubuntu.com/ubuntu/}" LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-http://archive.ubuntu.com/ubuntu/}"
;; ;;
@ -456,7 +456,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}" LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}"
;; ;;
@ -488,7 +488,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}" LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}"
;; ;;
@ -515,7 +515,7 @@ Set_defaults ()
;; ;;
ubuntu) ubuntu)
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://archive.ubuntu.com/ubuntu/}" LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-http://archive.ubuntu.com/ubuntu/}"
;; ;;
@ -625,7 +625,7 @@ Set_defaults ()
esac esac
# Setting linux flavour string # Setting linux flavour string
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
armel) armel)
case "${LB_MODE}" in case "${LB_MODE}" in
ubuntu) ubuntu)
@ -684,7 +684,7 @@ Set_defaults ()
ia64) ia64)
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux) progress-linux)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode." Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode."
exit 1 exit 1
;; ;;
@ -697,7 +697,7 @@ Set_defaults ()
powerpc) powerpc)
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux) progress-linux)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode." Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode."
exit 1 exit 1
;; ;;
@ -714,7 +714,7 @@ Set_defaults ()
s390) s390)
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux|ubuntu) progress-linux|ubuntu)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode." Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode."
exit 1 exit 1
;; ;;
@ -727,7 +727,7 @@ Set_defaults ()
sparc) sparc)
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux) progress-linux)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode." Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode."
exit 1 exit 1
;; ;;
@ -738,7 +738,7 @@ Set_defaults ()
;; ;;
*) *)
Echo_error "Architecture(s) ${LB_ARCHITECTURES} not yet supported (FIXME)" Echo_error "Architecture(s) ${LIVE_IMAGE_ARCHITECTURE} not yet supported (FIXME)"
exit 1 exit 1
;; ;;
esac esac
@ -779,7 +779,7 @@ Set_defaults ()
## config/binary ## config/binary
# Setting image filesystem # Setting image filesystem
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
sparc) sparc)
LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext4}" LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext4}"
;; ;;
@ -790,7 +790,7 @@ Set_defaults ()
esac esac
# Setting image type # Setting image type
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}"
;; ;;
@ -814,7 +814,7 @@ Set_defaults ()
# Setting bootloader # Setting bootloader
if [ -z "${LB_BOOTLOADER}" ] if [ -z "${LB_BOOTLOADER}" ]
then then
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
LB_BOOTLOADER="syslinux" LB_BOOTLOADER="syslinux"
;; ;;
@ -1031,7 +1031,7 @@ Set_defaults ()
;; ;;
*) *)
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
if [ "${LB_DEBIAN_INSTALLER}" != "false" ] if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then then
@ -1055,7 +1055,7 @@ Set_defaults ()
;; ;;
*) *)
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
if [ "${LB_DEBIAN_INSTALLER}" != "false" ] if [ "${LB_DEBIAN_INSTALLER}" != "false" ]
then then

74
scripts/build/binary_debian-installer
View File

@ -76,7 +76,7 @@ Install_package
# Setting destination directory # Setting destination directory
case "${LIVE_IMAGE_TYPE}" in case "${LIVE_IMAGE_TYPE}" in
netboot) netboot)
DESTDIR="tftpboot/debian-install/${LB_ARCHITECTURES}" DESTDIR="tftpboot/debian-install/${LIVE_IMAGE_ARCHITECTURE}"
;; ;;
hdd*|tar) hdd*|tar)
@ -107,7 +107,7 @@ case "${LB_DEBIAN_INSTALLER}" in
esac esac
# Set architecture-specific variables # Set architecture-specific variables
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
armel) armel)
DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')" DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
case "${DI_IMAGE_TYPE}" in case "${DI_IMAGE_TYPE}" in
@ -127,11 +127,11 @@ case "${LB_ARCHITECTURES}" in
powerpc) powerpc)
case "${DI_IMAGE_TYPE}" in case "${DI_IMAGE_TYPE}" in
cdrom) cdrom)
DI_REMOTE_BASE="${LB_ARCHITECTURES}/cdrom" DI_REMOTE_BASE="${LIVE_IMAGE_ARCHITECTURE}/cdrom"
;; ;;
netboot) netboot)
DI_REMOTE_BASE="${LB_ARCHITECTURES}/netboot" DI_REMOTE_BASE="${LIVE_IMAGE_ARCHITECTURE}/netboot"
;; ;;
esac esac
@ -149,8 +149,8 @@ case "${LB_ARCHITECTURES}" in
*) *)
case "${DI_IMAGE_TYPE}" in case "${DI_IMAGE_TYPE}" in
netboot) netboot)
DI_REMOTE_BASE="netboot/debian-installer/${LB_ARCHITECTURES}" DI_REMOTE_BASE="netboot/debian-installer/${LIVE_IMAGE_ARCHITECTURE}"
DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LB_ARCHITECTURES}" DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LIVE_IMAGE_ARCHITECTURE}"
DI_REMOTE_KERNEL="linux" DI_REMOTE_KERNEL="linux"
;; ;;
@ -255,9 +255,9 @@ case "${LB_DERIVATIVE}" in
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
# Debian Installer daily builds # Debian Installer daily builds
URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" URL="http://d-i.debian.org/daily-images/${LIVE_IMAGE_ARCHITECTURE}/daily/"
else else
URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LIVE_IMAGE_ARCHITECTURE}/current/images/"
fi fi
;; ;;
@ -267,23 +267,23 @@ case "${LB_DERIVATIVE}" in
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
# Debian Installer daily builds # Debian Installer daily builds
URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" URL="http://d-i.debian.org/daily-images/${LIVE_IMAGE_ARCHITECTURE}/daily/"
else else
URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LIVE_IMAGE_ARCHITECTURE}/current/images/"
fi fi
if [ "${LB_MODE}" = "progress-linux" ] if [ "${LB_MODE}" = "progress-linux" ]
then then
# FIXME: normal derivatives probably don't rebuild d-i, # FIXME: normal derivatives probably don't rebuild d-i,
# but progress-linux does. # but progress-linux does.
URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LIVE_IMAGE_ARCHITECTURE}/current/images/"
fi fi
;; ;;
esac esac
mkdir -p "${DESTDIR_DI}" mkdir -p "${DESTDIR_DI}"
if [ "${LB_ARCHITECTURES}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ] if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
then then
# There are no prepared kernel/initrd pairs for sparc netboot so we # There are no prepared kernel/initrd pairs for sparc netboot so we
# must unpack them from a mini.iso # must unpack them from a mini.iso
@ -306,7 +306,7 @@ else
DOWNLOAD_GTK_INSTALLER=0 DOWNLOAD_GTK_INSTALLER=0
if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ] if [ "${LB_DEBIAN_INSTALLER_GUI}" = "true" ]
then then
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
DOWNLOAD_GTK_INSTALLER=1 DOWNLOAD_GTK_INSTALLER=1
;; ;;
@ -337,7 +337,7 @@ then
mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
touch chroot/var/lib/dpkg/status touch chroot/var/lib/dpkg/status
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64) amd64)
DI_REQ_PACKAGES="lilo grub grub-pc" DI_REQ_PACKAGES="lilo grub grub-pc"
@ -419,15 +419,15 @@ then
FIRMWARE_PACKAGES="" FIRMWARE_PACKAGES=""
_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" _CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_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}.${LB_ARCHITECTURES} rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
for _CONTENT in ${_CONTENTS} for _CONTENT in ${_CONTENTS}
do do
wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} 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}.${LB_ARCHITECTURES} | sort -u)" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
done done
if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
@ -441,15 +441,15 @@ then
then then
# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). # 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 ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" _CONTENTS="$(for _ARCHIVE_AREA in ${LB_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}.${LB_ARCHITECTURES} rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
for _CONTENT in ${_CONTENTS} for _CONTENT in ${_CONTENTS}
do do
wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} 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}.${LB_ARCHITECTURES} | sort -u)" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
done done
fi fi
@ -532,9 +532,9 @@ then
fi fi
# Including local debs # Including local debs
if Find_files config/packages.binary/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb if Find_files config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".deb || Find_files config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
then then
for FILE in config/packages.binary/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb for FILE in config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".deb config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
do do
if [ -e "${FILE}" ] if [ -e "${FILE}" ]
then then
@ -557,18 +557,18 @@ then
# Generating deb indices # Generating deb indices
for _ARCHIVE_AREA in $(cd binary/pool && ls) for _ARCHIVE_AREA in $(cd binary/pool && ls)
do do
mkdir -p binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LB_ARCHITECTURES} mkdir -p binary/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/${_ARCHIVE_AREA}/binary-${LIVE_IMAGE_ARCHITECTURE}
mv binary chroot/root mv binary chroot/root
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 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
Chroot chroot "sh binary.sh" Chroot chroot "sh binary.sh"
rm -f chroot/binary.sh rm -f chroot/binary.sh
mv chroot/root/binary ./ mv chroot/root/binary ./
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 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
# Fetching release # Fetching 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 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
done done
# Symlink firmware packages to /firmware # Symlink firmware packages to /firmware
@ -593,12 +593,12 @@ then
cd binary.udeb cd binary.udeb
# Downloading udeb indices # Downloading udeb indices
Download_file Packages.gz "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz Download_file Packages.gz "${LB_PARENT_MIRROR_CHROOT}"/dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Packages.gz
gunzip -c Packages.gz > Packages gunzip -c Packages.gz > Packages
if [ "${LB_DERIVATIVE}" = "true" ] if [ "${LB_DERIVATIVE}" = "true" ]
then then
Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}"/Packages.gz Download_file Packages.derivative.gz "${LB_MIRROR_CHROOT}"/dists/"${LB_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"/Packages.gz
gunzip -c Packages.derivative.gz > Packages.derivative gunzip -c Packages.derivative.gz > Packages.derivative
fi fi
@ -639,9 +639,9 @@ then
cp *.udeb ../cache/packages.binary_debian-installer.udeb cp *.udeb ../cache/packages.binary_debian-installer.udeb
# Including local udebs # Including local udebs
if Find_files ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb || Find_files ../config/packages/*_"${LB_ARCHITECTURES}".udeb if Find_files ../config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb || Find_files ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb
then then
for FILE in ../config/packages.binary/*_"${LB_ARCHITECTURES}".udeb ../config/packages/*_"${LB_ARCHITECTURES}".udeb for FILE in ../config/packages.binary/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb ../config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".udeb
do do
if [ -e "${FILE}" ] if [ -e "${FILE}" ]
then then
@ -674,7 +674,7 @@ then
then then
grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/udeb_exclude" > exclude || true 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" >> exclude || true
grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LB_ARCHITECTURES}" >> exclude || true grep -v "^#" "${LOCATION}/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/exclude-udebs-${LIVE_IMAGE_ARCHITECTURE}" >> exclude || true
continue continue
fi fi
@ -710,17 +710,17 @@ then
done done
# Creating udeb indices # Creating udeb indices
mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LB_ARCHITECTURES}" mkdir -p dists/"${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_IMAGE_ARCHITECTURE}"
cd "${OLDPWD}" cd "${OLDPWD}"
mv binary.udeb chroot/root 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-${LB_ARCHITECTURES}/Packages" > chroot/binary.sh 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
Chroot chroot "sh binary.sh" Chroot chroot "sh binary.sh"
rm -f chroot/binary.sh rm -f chroot/binary.sh
mv chroot/root/binary.udeb ./ mv chroot/root/binary.udeb ./
cd binary.udeb cd binary.udeb
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 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
rm -f Packages* exclude rm -f Packages* exclude
find . | cpio -dmpu "${OLDPWD}"/binary find . | cpio -dmpu "${OLDPWD}"/binary
@ -752,7 +752,7 @@ cd /root/binary && apt-ftparchive \
-o APT::FTPArchive::Release::Version="${_VERSION}" \ -o APT::FTPArchive::Release::Version="${_VERSION}" \
-o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \ -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Date="$(date -R)" \ -o APT::FTPArchive::Release::Date="$(date -R)" \
-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ -o APT::FTPArchive::Release::Architectures="${LIVE_IMAGE_ARCHITECTURE}" \
-o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \ -o APT::FTPArchive::Release::Components="${LB_PARENT_ARCHIVE_AREAS}" \
-o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \ -o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \
release dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/Release release dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/Release

8
scripts/build/binary_disk
View File

@ -48,7 +48,7 @@ Create_lockfile .lock
mkdir -p binary/.disk mkdir -p binary/.disk
ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')" ARCHITECTURE="$(echo ${LIVE_IMAGE_ARCHITECTURE} | sed -e 's| |/|g')"
DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')" DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)" DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`" eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
@ -133,7 +133,7 @@ case "${LB_DEBIAN_INSTALLER}" in
do do
if [ -e "${LOCATION}" ] if [ -e "${LOCATION}" ]
then then
cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_udeb_include" binary/.disk/udeb_include
continue continue
fi fi
@ -158,7 +158,7 @@ case "${LB_DEBIAN_INSTALLER}" in
do do
if [ -e "${LOCATION}" ] if [ -e "${LOCATION}" ]
then then
cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_netinst_udeb_include" binary/.disk/udeb_include
continue continue
fi fi
@ -181,7 +181,7 @@ case "${LB_DEBIAN_INSTALLER}" in
do do
if [ -e "${LOCATION}" ] if [ -e "${LOCATION}" ]
then then
cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_businesscard_udeb_include" binary/.disk/udeb_include
continue continue
fi fi

4
scripts/build/binary_hdd
View File

@ -57,7 +57,7 @@ esac
Check_package chroot/usr/share/doc/mtools mtools Check_package chroot/usr/share/doc/mtools mtools
Check_package chroot/sbin/parted parted Check_package chroot/sbin/parted parted
if [ "${LB_ARCHITECTURES}" = "sparc" ] if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ]
then then
case "${LB_BINARY_FILESYSTEM}" in case "${LB_BINARY_FILESYSTEM}" in
ext2|ext3|ext4) ext2|ext3|ext4)
@ -136,7 +136,7 @@ fi
echo "!!! The following error/warning messages can be ignored !!!" echo "!!! The following error/warning messages can be ignored !!!"
Losetup $FREELO chroot/binary.img 0 Losetup $FREELO chroot/binary.img 0
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
sparc) sparc)
PARTITION_TABLE_TYPE="sun" PARTITION_TABLE_TYPE="sun"
;; ;;

2
scripts/build/binary_linux-image
View File

@ -57,7 +57,7 @@ case "${LB_INITRAMFS}" in
;; ;;
esac esac
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
powerpc) powerpc)
LINUX="vmlinux" LINUX="vmlinux"
;; ;;

2
scripts/build/binary_loadlin
View File

@ -43,7 +43,7 @@ Check_lockfile .lock
# Creating lock file # Creating lock file
Create_lockfile .lock Create_lockfile .lock
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then then

2
scripts/build/binary_memtest
View File

@ -43,7 +43,7 @@ Check_lockfile .lock
# Creating lock file # Creating lock file
Create_lockfile .lock Create_lockfile .lock
if [ "${LB_ARCHITECTURES}" != "amd64" ] && [ "${LB_ARCHITECTURES}" != "i386" ] if [ "${LIVE_IMAGE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_IMAGE_ARCHITECTURE}" != "i386" ]
then then
Echo_warning "skipping binary_memtest, foreign architecture." Echo_warning "skipping binary_memtest, foreign architecture."
exit 0 exit 0

2
scripts/build/binary_netboot
View File

@ -48,7 +48,7 @@ Check_lockfile .lock
# Creating lock file # Creating lock file
Create_lockfile .lock Create_lockfile .lock
if [ "${LB_ARCHITECTURES}" = "sparc" ] if [ "${LIVE_IMAGE_ARCHITECTURE}" = "sparc" ]
then then
# Checking depends # Checking depends
Check_package chroot/usr/bin/elftoaout sparc-utils Check_package chroot/usr/bin/elftoaout sparc-utils

6
scripts/build/binary_package-lists
View File

@ -139,9 +139,9 @@ then
do do
SECTION="$(basename ${SECTION})" SECTION="$(basename ${SECTION})"
mkdir -p dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES} mkdir -p dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}
apt-ftparchive packages pool/${SECTION} > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages apt-ftparchive packages pool/${SECTION} > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages
gzip -9 -c dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LB_ARCHITECTURES}/Packages.gz gzip -9 -c dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages > dists/${LB_PARENT_DISTRIBUTION}/${SECTION}/binary-${LIVE_IMAGE_ARCHITECTURE}/Packages.gz
done done
cd "${OLDPWD}" cd "${OLDPWD}"

2
scripts/build/binary_rootfs
View File

@ -38,7 +38,7 @@ Check_lockfile .lock
# Creating lock file # Creating lock file
Create_lockfile .lock Create_lockfile .lock
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
LINUX="vmlinuz" LINUX="vmlinuz"
;; ;;

2
scripts/build/binary_syslinux
View File

@ -299,7 +299,7 @@ then
eval _VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`" eval _VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
_DISTRIBUTION="${LB_DISTRIBUTION}" _DISTRIBUTION="${LB_DISTRIBUTION}"
_ARCHITECTURE="${LB_ARCHITECTURES}" _ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE}"
_DATE=$(date -R) _DATE=$(date -R)
_YEAR="$(date +%Y)" _YEAR="$(date +%Y)"
_MONTH="$(date +%m)" _MONTH="$(date +%m)"

4
scripts/build/binary_win32-loader
View File

@ -43,7 +43,7 @@ Check_lockfile .lock
# Creating lock file # Creating lock file
Create_lockfile .lock Create_lockfile .lock
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
then then
@ -80,7 +80,7 @@ case "${LB_ARCHITECTURES}" in
cat > binary/win32-loader.ini << EOF cat > binary/win32-loader.ini << EOF
[installer] [installer]
arch=${LB_ARCHITECTURES} arch=${LIVE_IMAGE_ARCHITECTURE}
i386/linux=install/vmlinuz i386/linux=install/vmlinuz
i386/initrd=install/initrd.gz i386/initrd=install/initrd.gz
i386/gtk/linux=install/vmlinuz i386/gtk/linux=install/vmlinuz

6
scripts/build/bootstrap_cdebootstrap
View File

@ -61,9 +61,9 @@ Create_lockfile .lock
mkdir -p chroot mkdir -p chroot
# Setting cdebootstrap options # Setting cdebootstrap options
if [ -n "${LB_ARCHITECTURES}" ] if [ -n "${LIVE_IMAGE_ARCHITECTURE}" ]
then then
CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}" CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LIVE_IMAGE_ARCHITECTURE}"
fi fi
if [ "${_DEBUG}" = "true" ] if [ "${_DEBUG}" = "true" ]
@ -115,7 +115,7 @@ then
Echo_breakage "Running ${LB_BOOTSTRAP}... " Echo_breakage "Running ${LB_BOOTSTRAP}... "
# Run appropriate bootstrap, i.e. foreign or regular bootstrap # Run appropriate bootstrap, i.e. foreign or regular bootstrap
if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURES}" ]; then if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LIVE_IMAGE_ARCHITECTURE}" ]; then
if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ] if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ]
then then

6
scripts/build/bootstrap_debootstrap
View File

@ -61,9 +61,9 @@ Create_lockfile .lock
mkdir -p chroot mkdir -p chroot
# Setting debootstrap options # Setting debootstrap options
if [ -n "${LB_ARCHITECTURES}" ] if [ -n "${LIVE_IMAGE_ARCHITECTURE}" ]
then then
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LB_ARCHITECTURES}" DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch=${LIVE_IMAGE_ARCHITECTURE}"
fi fi
if [ "${LB_ARCHIVE_AREAS}" != "main" ] if [ "${LB_ARCHIVE_AREAS}" != "main" ]
@ -119,7 +119,7 @@ then
Echo_breakage "Running debootstrap... " Echo_breakage "Running debootstrap... "
# Run appropriate bootstrap, i.e. foreign or regular bootstrap # Run appropriate bootstrap, i.e. foreign or regular bootstrap
if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LB_ARCHITECTURES}" ]; then if [ "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" = "${LIVE_IMAGE_ARCHITECTURE}" ]; then
if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ] if [ -n "${LB_BOOTSTRAP_QEMU_EXCLUDE}" ]
then then

4
scripts/build/chroot_archives
View File

@ -311,9 +311,9 @@ EOF
fi fi
# Copy packages # Copy packages
if Find_files config/packages.chroot/*_"${LB_ARCHITECTURES}".deb || Find_files config/packages/*_"${LB_ARCHITECTURES}".deb if Find_files config/packages.chroot/*_"${LIVE_IMAGE_ARCHITECTURE}".deb || Find_files config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
then then
for FILE in config/packages.chroot/*_"${LB_ARCHITECTURES}".deb config/packages/*_"${LB_ARCHITECTURES}".deb for FILE in config/packages.chroot/*_"${LIVE_IMAGE_ARCHITECTURE}".deb config/packages/*_"${LIVE_IMAGE_ARCHITECTURE}".deb
do do
if [ -L "${FILE}" ] if [ -L "${FILE}" ]
then then

16
scripts/build/chroot_linux-image
View File

@ -63,15 +63,15 @@ then
FIRMWARE_PACKAGES="" FIRMWARE_PACKAGES=""
_CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS}; do echo ${LB_PARENT_MIRROR_CHROOT}/dists/${LB_PARENT_DISTRIBUTION}/${_PARENT_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" _CONTENTS="$(for _PARENT_ARCHIVE_AREA in ${LB_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}.${LB_ARCHITECTURES} rm -f cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
for _CONTENT in ${_CONTENTS} for _CONTENT in ${_CONTENTS}
do do
wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LB_ARCHITECTURES} 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}.${LB_ARCHITECTURES} | sort -u)" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_PARENT_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
done done
if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free" if echo ${LB_PARENT_ARCHIVE_AREAS} | grep -qs "non-free"
@ -85,15 +85,15 @@ then
then then
# FIXME: account for the fact that PARENT_DISTRIBUTION and DISTRIBUTION might be the same (to not have overlapping cache files for contents). # 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 ${LB_ARCHIVE_AREAS}; do echo ${LB_MIRROR_CHROOT}/dists/${LB_DISTRIBUTION}/${_ARCHIVE_AREA}/Contents-${LB_ARCHITECTURES}.gz; done)" _CONTENTS="$(for _ARCHIVE_AREA in ${LB_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}.${LB_ARCHITECTURES} rm -f cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE}
for _CONTENT in ${_CONTENTS} for _CONTENT in ${_CONTENTS}
do do
wget ${WGET_OPTIONS} ${_CONTENT} -O - | gunzip -c >> cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LB_ARCHITECTURES} 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}.${LB_ARCHITECTURES} | sort -u)" FIRMWARE_PACKAGES="${FIRMWARE_PACKAGES} $(awk '/^lib\/firmware/ { print $2 }' cache/contents.chroot/contents.${LB_DISTRIBUTION}.${LIVE_IMAGE_ARCHITECTURE} | sort -u)"
done done
fi fi

11
scripts/build/config
View File

@ -370,7 +370,7 @@ Local_arguments ()
# config/bootstrap # config/bootstrap
-a|--architectures) -a|--architectures)
LB_ARCHITECTURES="${2}" LIVE_IMAGE_ARCHITECTURE="${2}"
shift 2 shift 2
;; ;;
@ -956,9 +956,9 @@ Check_defaults
if [ ! -e config ] if [ ! -e config ]
then then
Echo_message "Creating config tree for a ${LB_MODE}/${LB_ARCHITECTURES} system" Echo_message "Creating config tree for a ${LB_MODE}/${LIVE_IMAGE_ARCHITECTURE} system"
else else
Echo_message "Updating config tree for a ${LB_MODE}/${LB_ARCHITECTURES} system" Echo_message "Updating config tree for a ${LB_MODE}/${LIVE_IMAGE_ARCHITECTURE} system"
fi fi
# Creating bootstrap configuration # Creating bootstrap configuration
@ -1108,10 +1108,6 @@ EOF
cat > config/bootstrap << EOF cat > config/bootstrap << EOF
# config/bootstrap - options for live-build(7), bootstrap stage # config/bootstrap - options for live-build(7), bootstrap stage
# \$LB_ARCHITECTURES: select chroot architectures
# (Default: autodetected)
LB_ARCHITECTURES="${LB_ARCHITECTURES}"
# \$LB_DISTRIBUTION: select distribution to use # \$LB_DISTRIBUTION: select distribution to use
# (Default: ${LB_DISTRIBUTION}) # (Default: ${LB_DISTRIBUTION})
LB_DISTRIBUTION="${LB_DISTRIBUTION}" LB_DISTRIBUTION="${LB_DISTRIBUTION}"
@ -1490,6 +1486,7 @@ Set_configuration "config/control" "Configuration-Version" "${LIVE_CONFIGURATION
echo "" >> config/control echo "" >> config/control
Set_configuration "config/control" "Image" "binary" Set_configuration "config/control" "Image" "binary"
Set_configuration "config/control" "Type" "${LIVE_IMAGE_TYPE}" Set_configuration "config/control" "Type" "${LIVE_IMAGE_TYPE}"
Set_configuration "config/control" "Architecture" "${LIVE_IMAGE_ARCHITECTURE}"
# Creating stage file # Creating stage file
Create_stagefile .build/config Create_stagefile .build/config

2
scripts/build/source_debian
View File

@ -71,7 +71,7 @@ case "${LB_BINARY_FILESYSTEM}" in
;; ;;
esac esac
case "${LB_ARCHITECTURES}" in case "${LIVE_IMAGE_ARCHITECTURE}" in
amd64|i386) amd64|i386)
cat >> source-selection.txt << EOF cat >> source-selection.txt << EOF

2
templates/cgi/debian/build.html
View File

@ -21,7 +21,7 @@
<b>Advanced bootstrap options</b> <b>Advanced bootstrap options</b>
<table> <table>
<tr><td>--architectures: </td><td>LB_ARCHITECTURES</td></tr> <tr><td>--architectures: </td><td>LIVE_IMAGE_ARCHITECTURE</td></tr>
<tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr> <tr><td>--archive-areas: </td><td>LB_ARCHIVE_AREAS</td></tr>
</table> </table>