- Stop abusing the build system in sparc.cfg by pretending that cdrom

and miniiso are subarches. Add a "combined" subarch for these images
      that really contain both sparc64 and sparc32 support.

r26953

build/README

@@ -58,6 +58,11 @@ A more detailed overview of how the installer is built:
   For example: discover1 [2.2 2.4]
   An older way to accomplish the same thing is the pkg-lists/kernel_specific
   directories.
+* If you'd like to include a given package only if it's available, and not
+  fail otherwise, put a question mark at the end of the line.
+  For example: pcmcia-modules-${kernel:Version} ?
+  It's recommended to use this option seldom and with care as it can make the
+  build less robust if packages can be dropped from it without warning.
 * Apt is used to download the required udebs. This does *not* include
   libraries; libraries used by udebs must be installed on the build system,
   and so are build-depended on.

build/config/sparc.cfg

@@ -1,5 +1,5 @@
 # floppy needs root to build, so cannot autobuild, so is disabled for now
-SUBARCH_SUPPORTED = sparc32 sparc64 miniiso miniiso-2.6 cdrom
+SUBARCH_SUPPORTED = sparc32 sparc64 combined
  
 VERSIONED_SYSTEM_MAP = t
 

build/config/sparc/combined.cfg

@@ -0,0 +1 @@
+MEDIUM_SUPPORTED = cdrom miniiso miniiso-2.6

build/config/sparc/combined/miniiso-2.6.cfg

@@ -16,9 +16,9 @@ MANIFEST-MINIISO = "tiny bootable CD image for pure network install (2.6)"
 .PHONY: arch_miniiso arch_boot_screens arch_boot
 arch_miniiso:
 	-rm -rf $(TEMP_CD_TREE)/*
-	install -m 644 -D $(BASE_TMP)miniiso-2.6/initrd.gz $(TEMP_CD_TREE)/boot/initrd.gz
-	install -m 644 -D $(BASE_TMP)miniiso-2.6/vmlinuz*32 $(TEMP_CD_TREE)/boot/vmlinuz-sparc32
-	install -m 644 -D $(BASE_TMP)miniiso-2.6/vmlinuz*64 $(TEMP_CD_TREE)/boot/vmlinuz-sparc64
+	install -m 644 -D $(TEMP)/initrd.gz $(TEMP_CD_TREE)/boot/initrd.gz
+	install -m 644 -D $(TEMP)/vmlinuz*32 $(TEMP_CD_TREE)/boot/vmlinuz-sparc32
+	install -m 644 -D $(TEMP)/vmlinuz*64 $(TEMP_CD_TREE)/boot/vmlinuz-sparc64
 	install -m 644 /boot/second.b $(TEMP_CD_TREE)/boot
 	install -m 644 $(TEMP_BOOT_SCREENS)/debian.txt $(TEMP_CD_TREE)/boot
 	install -m 644 boot/sparc/silo.conf $(TEMP_CD_TREE)/boot

build/config/sparc/combined/miniiso.cfg

@@ -9,9 +9,9 @@ MANIFEST-MINIISO = "tiny bootable CD image for pure network install"
 .PHONY: arch_miniiso arch_boot_screens arch_boot
 arch_miniiso:
 	-rm -rf $(TEMP_CD_TREE)/*
-	install -m 644 -D $(BASE_TMP)miniiso/initrd.gz $(TEMP_CD_TREE)/boot/initrd.gz
-	install -m 644 -D $(BASE_TMP)miniiso/vmlinuz*32 $(TEMP_CD_TREE)/boot/vmlinuz-sparc32
-	install -m 644 -D $(BASE_TMP)miniiso/vmlinuz*64 $(TEMP_CD_TREE)/boot/vmlinuz-sparc64
+	install -m 644 -D $(TEMP)/initrd.gz $(TEMP_CD_TREE)/boot/initrd.gz
+	install -m 644 -D $(TEMP)/vmlinuz*32 $(TEMP_CD_TREE)/boot/vmlinuz-sparc32
+	install -m 644 -D $(TEMP)/vmlinuz*64 $(TEMP_CD_TREE)/boot/vmlinuz-sparc64
 	install -m 644 /boot/second.b $(TEMP_CD_TREE)/boot
 	install -m 644 $(TEMP_BOOT_SCREENS)/debian.txt $(TEMP_CD_TREE)/boot
 	install -m 644 boot/sparc/silo.conf $(TEMP_CD_TREE)/boot

build/pkg-lists/cdrom/sparc.cfg

@@ -7,11 +7,6 @@ cdrom-core-modules-${kernel:Version}
 scsi-core-modules-${kernel:Version}
 scsi-modules-${kernel:Version}
 
-# SUPER XXX
-# FJP: Include these ass the above #includes don't work for cdrom builds
-ide-modules-2.4.27-2-sparc64-di
-usb-modules-2.4.27-2-sparc64-di
-
 console-keymaps-usb
 discover1-data-udeb
 discover1-udeb

build/pkg-lists/kernel_specific/2.4/sparc/combined/sparc-ide

@@ -0,0 +1,2 @@
+# Only available on sparc64, so only include if available.
+ide-modules-${kernel:Version} ?

build/pkg-lists/kernel_specific/2.4/sparc/combined/sparc-usb

@@ -0,0 +1,3 @@
+# Only available on sparc64, so only include if available.
+usb-modules-${kernel:Version} ?
+usb-discover

build/pkg-lists/kernel_specific/2.6/sparc/combined/sparc-ide

@@ -0,0 +1,2 @@
+# Only available on sparc64 so only include if available.
+ide-modules-${kernel:Version} ?

build/pkg-lists/kernel_specific/2.6/sparc/combined/sparc-usb

@@ -0,0 +1,3 @@
+# Only available on sparc64, so only include if available.
+usb-modules-${kernel:Version} ?
+usb-discover

build/util/pkg-list

@@ -38,6 +38,24 @@ foreach my $p (sort keys %$collect) {
 	}
 }
 
+# Run apt-cache on udebs, return result.
+sub apt_cache {
+	my $params=shift;
+	
+	my $sourceslist;
+	if (-f 'sources.list.udeb.local') {
+		$sourceslist='sources.list.udeb.local';
+	} else {
+		$sourceslist='sources.list.udeb';
+	}
+	
+	return `LANG=C apt-cache \\
+		-o Dir::Etc::sourcelist=./$sourceslist \\
+		-o Dir::State=./apt.udeb/state \\
+		-o Dir::State::Status=./apt.udeb/state/status \\
+		-o Dir::Cache=./apt.udeb/cache $params 2>/dev/null`;
+}
+
 # Add a package, possibly expanding dependencies.
 sub collectpackage {
 	my $line=shift;
@@ -49,6 +67,11 @@ sub collectpackage {
 		$kernels{$_} = 1 foreach split ' ', $2;
 		return unless $kernels{$kernel_major};
 	}
+	elsif ($line=~s/\s*\?$//) {
+		# Question mark at the end means check for the package and
+		# don't include it if it's not available in apt sources.
+		return unless length apt_cache("show '$line'");
+	}
 
 	if ($line=~/^(.*) \*$/) {
 		# Asterisk at end means include all dependencies of this
@@ -79,22 +102,12 @@ sub collectdeps {
 		collectdeps($dep, $collect, \%seendeps);
 	}
 }
-
+		
 # Get the dependencies of a package;
 sub pkgdeps {
 	my $package=shift;
 	my @ret;
-	my $sourceslist;
-	if (-f 'sources.list.udeb.local') {
-		$sourceslist='sources.list.udeb.local';
-	} else {
-		$sourceslist='sources.list.udeb';
-	}
-	my @deps=`LANG=C apt-cache \\
-		-o Dir::Etc::sourcelist=./$sourceslist \\
-		-o Dir::State=./apt.udeb/state \\
-		-o Dir::State::Status=./apt.udeb/state/status \\
-		-o Dir::Cache=./apt.udeb/cache depends $package`;
+	my @deps=apt_cache("depends $package");
 	shift @deps; # package name;
 	foreach my $dep (@deps) {
 		chomp $dep;

debian/changelog

@@ -37,9 +37,11 @@ debian-installer (trunk) UNRELEASED; urgency=low
       they're still broken.
     - When preseeding mirror/suite, don't make it be seen, so user can
       override from the default.
-    - Reorganise and rename floppy pkg-lists.
     - Recent additions (initrd-preseed) made the el-torito image too big on
       i386, drop usb CD support from it to make it build again.
+    - Stop abusing the build system in sparc.cfg by pretending that cdrom
+      and miniiso are subarches. Add a "combined" subarch for these images
+      that really contain both sparc64 and sparc32 support.
   * Kurt Roeckx
     - Changed libdevmapper1.00-udeb to libdevmapper1.01-udeb in the monolithic
       package list.