* Update boot-mipsel and boot-hppa to use the which_deb script for

better safety when extracting boot loader files.
  * Update all the relevant boot-* scripts to do the right thing when
    extracting packages and sources, depending on
    $ARCHIVE_EXTRACTED_SOURCES as above

debian/changelog

@@ -39,6 +39,13 @@ debian-cd (3.1.12) UNRELEASED; urgency=low
   * Use debootstrap --no-check-gpg by default since many local mirrors
     are not signed (such as temporary mirrors created by simple-cdd).
 
+  [ Steve McIntyre ]
+  * Update boot-mipsel and boot-hppa to use the which_deb script for
+    better safety when extracting boot loader files.
+  * Update all the relevant boot-* scripts to do the right thing when
+    extracting packages and sources, depending on
+    $ARCHIVE_EXTRACTED_SOURCES as above
+
  -- Steve McIntyre <93sam@debian.org>  Wed, 26 Sep 2012 01:09:13 +0100
 
 debian-cd (3.1.11) unstable; urgency=low

tools/boot/wheezy/boot-hppa

@@ -29,11 +29,21 @@ if [ $N != 1 -a $N != 1_NONUS ]; then
 	exit 0
 fi
 
-PALODEB="$($BASEDIR/tools/apt-selection cache show palo | \
-	sed -n 's/^Filename: \(.*_hppa.deb\)$/\1/p')"
-ar p "${MIRROR}/${PALODEB}" data.tar.gz | tar xz ./usr/share/palo/iplboot
+PALODEB=$(find_pkg_file palo)
+if [ -z "$PALODEB" ] ; then 
+    echo "ERROR:  the palo package is required." >&2
+    exit 1
+fi
+(dpkg --fsys-tarfile "$MIRROR/$PALODEB" | \
+    tar xf - -C . ./usr/share/palo/iplboot)
+mv boot/delo.2nd $CDROOT/boot/delo.2nd
 mv usr/share/palo/iplboot $CDROOT/install/iplboot
 
+if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
+    echo $PALODEB >> $CDDIR/../$N.pkgs_extracted
+    find_pkg_file palo source >> $CDDIR/../$N.pkgs_extracted
+fi
+
 if [ ! "$DI_WWW_HOME" ];then
         if [ ! "$DI_DIR" ];then
            DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/2.6"

tools/boot/wheezy/boot-mipsel

@@ -44,12 +44,21 @@ if [ $NN != 1 ]; then
 	exit 0
 fi
 
-DELODEB="$($BASEDIR/tools/apt-selection cache show delo | \
-	sed -n 's/^Filename: \(.*_mipsel.deb\)$/\1/p')"
-ar p "${MIRROR}/${DELODEB}" data.tar.gz | tar xz ./boot/delo.2nd
+DELODEB=$(find_pkg_file delo)
+if [ -z "$DELODEB" ] ; then 
+    echo "ERROR:  the delo package is required." >&2
+    exit 1
+fi
+(dpkg --fsys-tarfile "$MIRROR/$DELODEB" | \
+    tar xf - -C . ./boot/delo.2nd)
 mkdir -p $CDROOT/boot
 mv boot/delo.2nd $CDROOT/boot/delo.2nd
 
+if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
+    echo $DELODEB >> $CDDIR/../$N.pkgs_extracted
+    find_pkg_file delo source >> $CDDIR/../$N.pkgs_extracted
+fi
+
 install -m 644 -D $BASEDIR/data/wheezy/delo.conf "$CDROOT"/etc/delo.conf
 
 if [ ! "$DI_WWW_HOME" ];then

tools/boot/wheezy/boot-powerpc

@@ -65,8 +65,10 @@ if [ -z "$YABOOT_DEBUG" ]; then
     mv usr/lib/yaboot/yaboot .
     rm -rf usr
 
-    echo $YADEB >> $CDDIR/../$N.pkgs_extracted
-    find_pkg_file yaboot source >> $CDDIR/../$N.pkgs_extracted
+    if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
+        echo $YADEB >> $CDDIR/../$N.pkgs_extracted
+        find_pkg_file yaboot source >> $CDDIR/../$N.pkgs_extracted
+    fi
 
 else
  cp -f $YABOOT_DEBUG yaboot

tools/boot/wheezy/boot-sparc

@@ -47,8 +47,10 @@ fi
 (dpkg --fsys-tarfile $MIRROR/$silo_deb | \
 	tar xf - -C $inst/ ./boot/{isofs,second}.b)
 
-echo $silo_deb >> $CDDIR/../$N.pkgs_extracted
-find_pkg_file silo source >> $CDDIR/../$N.pkgs_extracted
+if [ -n "$ARCHIVE_EXTRACTED_SOURCES" ]; then
+    echo $silo_deb >> $CDDIR/../$N.pkgs_extracted
+    find_pkg_file silo source >> $CDDIR/../$N.pkgs_extracted
+fi
 
 # Some custom etc files
 cp -f -p $BASEDIR/data/wheezy/sparc/silo.conf $inst/boot/

tools/which_deb

@@ -136,6 +136,10 @@ if ($pkg eq "silo") {
     }
 } elsif ($pkg eq "yaboot") {
     $pkgdata = grab_bin_info($pth, "powerpc", $pkg);
+} elsif ($pkg eq "delo") {
+    $pkgdata = grab_bin_info($pth, "mipsel", $pkg);
+} elsif ($pkg eq "palo") {
+    $pkgdata = grab_bin_info($pth, "hppa", $pkg);
 } else { # Fallthrough for all other packages
     first { $pkgdata = grab_bin_info($pth, $_, $pkg) } @ARCHES;
 }