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

Correcting check for debian-installer-distribution when using daily images in non-derivatives mode.

This commit is contained in:
Daniel Baumann 2011-09-28 07:09:05 +02:00
parent 0b08f4529e
commit c2b7c107a5
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
scripts/build/lb_binary_debian-installer
View File

@ -242,20 +242,32 @@ VMLINUZ_GI="gtk/vmlinuz"
INITRD_GI="gtk/initrd.gz"
DESTDIR_GI="${DESTDIR}/gtk"
if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
then
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
case "${LB_DERIVATIVE}" in
false)
if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
then
# FIXME: variable name should be decupled from derivatves
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
# Debian Installer daily builds
URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
else
if [ "${LB_DERIVATIVE}" = "true" ]
then
URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
else
URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
fi
fi
# Debian Installer daily builds
URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
else
URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
fi
;;
true)
if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
then
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
# Debian Installer daily builds
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-${LB_ARCHITECTURES}/current/images/"
fi
;;
esac
mkdir -p "${DESTDIR_DI}"