[Debian-live-changes] r2082 - dists/trunk/live-helper/helpers

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-06-14 14:53:13 +0000 (Thu, 14 Jun 2007)
New Revision: 2082

Modified:
   dists/trunk/live-helper/helpers/lh_binary_debian-installer
Log:


Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-06-14 12:11:37 UTC (rev 2081)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer	2007-06-14 14:53:13 UTC (rev 2082)
@@ -201,35 +201,58 @@
 #Architecture: source
 #EOF
 
-# Downloading udebs indices
-mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
-cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+# CRAP
+#mkdir -p binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+#cd binary/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+# CRAP
+
+mkdir binary.udeb
+cd binary.udeb
+
+# Downloading udeb indices
 wget "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages.gz
 gunzip -c Packages.gz > Packages
-cd "${OLDPWD}"
 
 # Sorting udebs
-DEBS="`awk '/Filename: / { print $2 }' binary/dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages`"
+DEBS="`awk '/Filename: / { print $2 }' Packages`"
 UDEBS="`echo ${DEBS} | grep '.*.udeb'`"
 
+# Downloading udebs
+for UDEB in ${UDEBS}
+do
+	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+done
+
 # Excluding udebs
-EXCLUDE_UDEBS="`grep -v '^#' ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/exclude-udebs`"
-EXCLUDE_UDEBS_i386="`grep -v '^#' ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/exclude-udebs-i386`"
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/exclude-udebs > exclude
+grep -v "^#" ${LH_BASE:-/usr/share/live-helper}/data/debian-cd/exclude-udebs-i386 >> exclude
 
-for EXCLUDE in ${EXCLUDE_UDEBS}
+for EXCLUDE in `cat exclude`
 do
-	UDEBS="`grep -v ${EXCLUDE} ${UDEBS}`"
+	rm -f "${EXCLUDE}"_*.udeb
 done
 
-# Downloading udebs
+# Moving udebs
 for UDEB in ${UDEBS}
 do
-	mkdir -p binary/`dirname ${UDEB}`
-	cd binary/`dirname ${UDEB}`
-	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
-	cd "${OLDPWD}"
+	if [ -f "`basename ${UDEB}`" ]
+	then
+		mkdir -p `dirname ${UDEB}`
+		mv "`basename ${UDEB}`" "`dirname ${UDEB}`"
+	fi
 done
 
+# Creating udeb indices
+mkdir -p dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"
+apt-ftparchive packages pool/main > dists/"${LIVE_DISTRIBUTION}"/main/debian-installer/binary-"${LIVE_ARCHITECTURE}"/Packages
+gzip -9 -c dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages > dists/${LIVE_DISTRIBUTION}/main/debian-installer/binary-${LIVE_ARCHITECTURE}/Packages.gz
+
+rm -f Packages* exclude
+find . | cpio -dmpu "${OLDPWD}"/binary
+cd "${OLDPWD}"
+
+rm -rf binary.udeb
+
 # Generating release file
 apt-ftparchive \
 	-o APT::FTPArchive::Release::Origin="Debian" \
@@ -256,9 +279,15 @@
 echo "main" > binary/.disk/base_components
 touch binary/.disk/base_installable
 echo "not_complete" > binary/.disk/cd_type
-#echo "Debian GNU/Linux 4.0 r0 \"Etch\" - Official i386 NETINST Binary-1 20070407-11:29" > binary/.disk/info
-echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} NETINST Binary-1 `date +%Y%m%d-%H:%M`" > binary/.disk/info
+echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} LIVE Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
 touch binary/.disk/mkisofs
+cat > binary/.disk/udeb_include << EOF
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
+EOF
 
 # Creating stage file
 Create_stagefile .stage/binary_debian-installer