* Updated tools/add_secured to work with all versions of md5sum

(including the one that comes with dpkg >= 1.10).
* Protect the call to add_secured by a stamp file. Closes: #147105
* Provide a customised isolinux image. We don't need to
  recommend syslinux now.

Makefile

@@ -191,11 +191,11 @@ bin-clean:
 	$(Q)-rm -rf $(BDIR)/*_NONUS
 	$(Q)-rm -f $(BDIR)/*.filelist*
 	$(Q)-rm -f  $(BDIR)/packages-stamp $(BDIR)/bootable-stamp \
-	         $(BDIR)/upgrade-stamp
+	         $(BDIR)/upgrade-stamp $(BDIR)/secured-stamp
 src-clean:
 	$(Q)-rm -rf $(SDIR)/CD[1234567890]
 	$(Q)-rm -rf $(SDIR)/*_NONUS
-	$(Q)-rm -rf $(SDIR)/sources-stamp
+	$(Q)-rm -rf $(SDIR)/sources-stamp $(SDIR)/secured-stamp
 
 # Completely cleans the current arch tree
 realclean: distclean
@@ -444,7 +444,7 @@ $(BDIR)/packages-stamp:
 	    for p in `/usr/sbin/debootstrap --arch $(ARCH) --print-debs $(CODENAME)`; do \
 		if ! grep -q ^$$p$$ $(BDIR)/$$DISK.packages; then \
 		    ok=no; \
-		    echo "Missing debootstrap-required $p"; \
+		    echo "Missing debootstrap-required $$p"; \
 		fi; \
 	    done; \
 	    if [ "$$ok" = "yes" ]; then \
@@ -715,8 +715,8 @@ $(SDIR)/CD1/md5sum.txt:
 # from the official tree
 # Complete the Release file from the normal tree
 secured: bin-secured src-secured
-bin-secured: $(BDIR)/CD1/dists/$(CODENAME)-secured
-$(BDIR)/CD1/dists/$(CODENAME)-secured:
+bin-secured: $(BDIR)/secured-stamp
+$(BDIR)/secured-stamp:
 	@echo "Generating $(CODENAME)-secured on all the binary CDs ..."
 	$(Q)set -e; \
 	 for file in $(BDIR)/*.packages; do \
@@ -726,9 +726,10 @@ $(BDIR)/CD1/dists/$(CODENAME)-secured:
 		cd $$dir; \
 		$(add_secured); \
 	done
+	$(Q)touch $(BDIR)/secured-stamp
 
-src-secured: $(SDIR)/CD1/dists/$(CODENAME)-secured
-$(SDIR)/CD1/dists/$(CODENAME)-secured:
+src-secured: $(SDIR)/secured-stamp
+$(SDIR)/secured-stamp:
 	@echo "Generating $(CODENAME)-secured on all the source CDs ..."
 	$(Q)set -e; \
 	 for file in $(SDIR)/*.sources; do \
@@ -738,6 +739,7 @@ $(SDIR)/CD1/dists/$(CODENAME)-secured:
 		cd $$dir; \
 		$(add_secured); \
 	done
+	$(Q)touch $(SDIR)/secured-stamp
 
 # Make file list for jigdo (if DOJIGDO>0)
 # "Fake" depend on the unstable Packages.gz to make sure we only regenerate

debian/changelog

@@ -7,6 +7,12 @@ debian-cd (2.2.15) unstable; urgency=low
     Marcia Mantinan.
   * Reordered some woody task files. Thanks to Philip Charles.
   * Added cpp in the Depends field. Closes: #145869
+  * Fixed error message in Makefile. Closes: #146184
+  * Updated tools/add_secured to work with all versions of md5sum
+    (including the one that comes with dpkg >= 1.10).
+  * Protect the call to add_secured by a stamp file. Closes: #147105
+  * Provide a customised isolinux image. We don't need to
+    recommend syslinux now.
 
  -- Raphael Hertzog <hertzog@debian.org>  Sun,  5 May 2002 12:12:36 +0200
 

debian/control

@@ -8,7 +8,7 @@ Standards-Version: 3.5.2
 Package: debian-cd
 Architecture: all
 Depends: perl, cpp, libdigest-md5-perl, sysutils, apt (>= 0.3.11.1), make, mkisofs | mkhybrid, lynx, grep-dctrl, apt-utils (>= 0.5.4), debootstrap, bc
-Recommends: hfsutils, debianutils (>= 1.6), syslinux
+Recommends: hfsutils, debianutils (>= 1.6)
 Suggests: palo (>= 0.94), binutils-multiarch
 Description: Tools for building (Official) Debian CD set
  Debian-cd is the official tool for building Debian CD set since the potato

tools/add_secured

@@ -17,7 +17,7 @@ if [ -e "dists/$CODENAME/Release" ]; then
     (while read file; do \
         rfile="dists/$CODENAME/$file"; \
     	c=`wc -c < $rfile`; \
-	m=`md5sum < $rfile`; \
+	m=`md5sum < $rfile | cut -d" " -f1`; \
 	printf " %s %8d %s\n" $m $c $file; \
     done) >> dists/$CODENAME/Release
     # TODO: Should add SHA1 field here
@@ -34,7 +34,7 @@ if [ -n "$NONUS" -a -e "dists/$CODENAME/non-US/Release" ]; then
     (while read file; do \
         rfile="dists/$CODENAME/non-US/$file"; \
     	c=`wc -c < $rfile`; \
-	m=`md5sum < $rfile`; \
+	m=`md5sum < $rfile | cut -d" " -f1`; \
 	printf " %s %8d %s\n" $m $c $file; \
     done) >> dists/$CODENAME/non-US/Release
     # TODO: Should add SHA1 field here

tools/boot/woody/boot-i386

@@ -57,7 +57,7 @@ THISTYPE=${KTYPE[$NN]}
 if [ "${ISOLINUX:-0}" != "0" ] && [ "$NN" = "1" ]; then
     echo "Using ISOLINUX boot-disks image on CD$N"
     mkdir -p boot$N/isolinux
-    cp -f /usr/share/debian-cd/data/woody/isolinux.bin boot$N/isolinux/
+    cp -f $BASEDIR/data/woody/isolinux.bin boot$N/isolinux/
     cp -lf CD1/dists/$CODENAME/main/disks-$ARCH/current/images-1.44/root.bin boot$N/isolinux/
     cp -lf CD1/dists/$CODENAME/main/disks-$ARCH/current/images-1.44/bf2.4/root.bin boot$N/isolinux/bf24.bin
     cp -lf CD1/dists/$CODENAME/main/disks-$ARCH/current/images-1.44/compact/root.bin boot$N/isolinux/compact.bin