Adding live-helper 1.0~a16-1.

1 files changed, 79 insertions, 18 deletions

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index de15f1c..8bb9a77 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -125,15 +125,47 @@ fi
 
 # Downloading debian-installer
 mkdir -p "${DESTDIR_DI}"
-wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
-wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
+
+if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
+then
+	case "${LIVE_ARCHITECTURE}" in
+		amd64)
+			wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/vmlinuz
+			wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/initrd.gz
+			;;
+
+		i386)
+		 	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/vmlinuz
+			wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/initrd.gz
+			;;
+	esac
+else
+	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
+	wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
+fi
 
 # Downloading graphical-installer
 if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
 then
 	mkdir -p "${DESTDIR_GI}"
-	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
-	wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
+
+	if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
+	then
+		case "${LIVE_ARCHITECTURE}" in
+			amd64)
+				wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/gtk/vmlinuz
+				wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/gtk/initrd.gz
+				;;
+
+			i386)
+				wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/gtk/vmlinuz
+				wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/gtk/initrd.gz
+				;;
+		esac
+	else
+		wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
+		wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
+	fi
 fi
 
 # Downloading additional packages
@@ -143,11 +175,11 @@ touch chroot/var/lib/dpkg/status
 
 case "${LIVE_ARCHITECTURE}" in
 	amd64)
-		DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
+		DI_PACKAGES="linux-image-2.6-amd64 elilo lilo grub"
 		;;
 
 	i386)
-		DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 lilo grub"
+		DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 elilo lilo grub"
 		;;
 
 	powerpc)
@@ -199,15 +231,8 @@ gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Packages
 #gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/source/Sources > dists/${LIVE_DISTRIBUTION}/main/source/Sources
 cd "${OLDPWD}"
 
-# Writing release
-cat > binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release << EOF
-Archive: stable
-Version: 4.0r0
-Component: main
-Origin: Debian
-Label: Debian
-Architecture: ${LIVE_ARCHITECTURE}
-EOF
+# Fetching release
+wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/binary-"${LIVE_ARCHITECTURE}"/Release -O binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}/Release
 
 #cat > binary/dists/${LIVE_DISTRIBUTION}/main/source/Release << EOF
 #Archive: stable
@@ -229,12 +254,43 @@ gunzip -c Packages.gz > Packages
 UDEBS="`awk '/Filename: / { print $2 }' Packages`"
 
 # Downloading udebs
-DOWNLOAD=""
 for UDEB in ${UDEBS}
 do
-	DOWNLOAD="$DOWNLOAD ${LIVE_MIRROR_BOOTSTRAP}/${UDEB}"
+	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
 done
-echo $DOWNLOAD | xargs wget
+
+# Including local udebs
+if ls ../config/binary_local-udebs/* &> /dev/null
+then
+	for FILE in ../config/binary_local-udebs/*.udeb
+	do
+		SOURCE="`dpkg -f ${FILE} Source | awk '{ print $1 }'`"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="`basename ${FILE} | awk -F_ '{ print $1 }'`"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="`echo ${SOURCE} | sed 's/\(....\).*/\1/'`"
+				;;
+
+			*)
+				LETTER="`echo ${SOURCE} | sed 's/\(.\).*/\1/'`"
+				;;
+		esac
+
+		# Install directory
+		mkdir -p pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Copy files
+		cp "${FILE}" pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Prefere local udebs over downloaded udebs
+		rm -f "`basename ${FILE} | awk -F_ '{ print $1 }'`"_*.udeb
+	done
+fi
 
 # Excluding udebs
 grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/"${LIVE_DISTRIBUTION}"/udeb_exclude > exclude
@@ -304,5 +360,10 @@ pcmciautils-udeb
 wireless-tools-udeb
 EOF
 
+if [ -d binary/pool/main/l/live-installer ]
+then
+	echo "live-installer" >> binary/.disk/udeb_include
+fi
+
 # Creating stage file
 Create_stagefile .stage/binary_debian-installer