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

installer: de-dup daily DI url 

Closes: #952860
This commit is contained in:
Lyndon Brown 2020-02-11 17:36:54 +00:00 committed by Raphaël Hertzog
parent 95fedc81c1
commit f3544ff68e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/build/installer_debian-installer
View File

@ -240,6 +240,9 @@ VMLINUZ_GI="gtk/vmlinuz"
INITRD_GI="gtk/initrd.gz"
DESTDIR_GI="${DESTDIR}/gtk"
# Debian Installer daily builds
DAILY_DI_URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
case "${LB_DERIVATIVE}" in
false)
if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
@ -247,8 +250,7 @@ case "${LB_DERIVATIVE}" in
# FIXME: variable name should be decupled from derivatves
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
# Debian Installer daily builds
URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
URL="${DAILY_DI_URL}"
else
URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
fi
@ -259,8 +261,7 @@ case "${LB_DERIVATIVE}" in
then
LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid"
# Debian Installer daily builds
URL="https://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/"
URL="${DAILY_DI_URL}"
else
URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
fi