debian-installer/build/make/arch linux-i386,1.18,1.19 linux-powerpc,1.4,1.5

[Joey Hess <joeyh@debian.org>]

Update of /cvs/debian-boot/debian-installer/build/make/arch
In directory gluck:/tmp/cvs-serv26079/make/arch

Modified Files:
	linux-i386 linux-powerpc 
Log Message:
    - makelabel takes the build date as its second parameter. Calculating
      BUILD_DATE once at the start to avoid inconsistencies during
      long/midnight builds.
    - Add MEDIA_TYPE to configs for bootable image types.
    - Add DEBIAN_VERSION to config.
    - Add bootscreen-subst to substitute these variables into boot screens.
    - Make a syslinux help screen, for all i386 syslinuxed boot media.
      Includes the build date, debian version, and media type, and is derived
      from isolinux help texts on the sarge cds, but modified to actually
      match d-i:
        - remove boot flavor docs, as we currently have no flavors
        - remove rescue stuff, as d-i is not currently also a rescue disk
        - reduce number of colors used for cleaner look
        - remove mention of non-free
        - try to make the prerequisites documentation somewhere close to
          reality -- 64 mb ram and 256 mb disk.
        - make every boot message screen 22 lines long, followed by a blank
          line (which is in turn followed by the boot: prompt), for consistent
          display
        - remove references in f4.txt to a nonexistant table
        - remove documentation of mono and vga16:off, as they do not work with
          d-i
        - remove keytimer hack documentation, that was for boot-floppies
        - add documentation of d-i's boot time parameters, including the new
          debian-installer/framebuffer=false
        - remove the mailing list subscription info; boot time is not the
          time to tell the user about this. In its place, make f9.txt be
          about Debian.
      - Remove DEBCONF_DEBUG setting from syslinux.cfg.
      - Use bootscreen-subst on powerpc's boot.msg, too.


Index: linux-i386
===================================================================
RCS file: /cvs/debian-boot/debian-installer/build/make/arch/linux-i386,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- linux-i386	16 Nov 2003 22:58:20 -0000	1.18
+++ linux-i386	8 Dec 2003 21:08:33 -0000	1.19
@@ -25,14 +25,19 @@
 
 ifdef DISK_LABEL
 	# generate a disk label
-	./makelabel $(DISK_LABEL) > $(TEMP)/disk.lbl
+	./makelabel $(DISK_LABEL) $(BUILD_DATE) > $(TEMP)/disk.lbl
 	mcopy -i$@.new $(TEMP)/disk.lbl ::disk.lbl
 endif
 
 ifdef KERNELNAME
 	# syslinux is used to make the floppy bootable
 	cat boot/i386/syslinux.cfg | todos | \
-		mcopy -i$@.new - ::\syslinux.cfg
+		mcopy -i$@.new - ::syslinux.cfg
+	for img in boot/i386/*.txt ; do \
+		./bootscreen-subst "${MEDIA_TYPE}" "${DEBIAN_VERSION}" "${BUILD_DATE}" \
+		       < $$img | \
+			mcopy -i$@.new - ::`basename $$img`; \
+	done
 	syslinux $(SYSLINUX_OPTS) $@.new
 endif
 

Index: linux-powerpc
===================================================================
RCS file: /cvs/debian-boot/debian-installer/build/make/arch/linux-powerpc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- linux-powerpc	18 Oct 2003 14:13:48 -0000	1.4
+++ linux-powerpc	8 Dec 2003 21:08:33 -0000	1.5
@@ -15,7 +15,8 @@
 	# New-world bootability
 	cp -f boot/powerpc/ofboot.b $(CD_IMAGE_TREE)/install/powermac
 	cp -f /usr/lib/yaboot/yaboot $(CD_IMAGE_TREE)/install/powermac
-	cp -f boot/powerpc/boot.msg $(CD_IMAGE_TREE)/install/powermac
+	./bootscreen-subst "${MEDIA_TYPE}" "${DEBIAN_VERSION}" "${BUILD_DATE}" \
+		< boot/powerpc/boot.msg > $(CD_IMAGE_TREE)/install/powermac
 	cp -f boot/powerpc/$(TYPE)-yaboot.conf $(CD_IMAGE_TREE)/install/powermac/yaboot.conf
 
 # creates a bootable cd image for powerpc