From 26e0a2413d0540cfbcbce36423d2baf8fb55eac3 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Sun, 13 Jul 2008 11:33:35 +0000
Subject: [PATCH] Workaround: don't include source for udebs in images

* list2cds: set "Component" for udebs to "debian-installer
* merge_package_lists: skip udebs when including source

When building images for Etch+1/2, which takes regular packages from
stable and udebs from testing, there is a problem when adding source
for udebs as existing code will take source for both debs and udebs
from stable. This can result in either incorrect source being included
(version mismatch) or errors (new udebs for which no match can be found
in the Source.gz file that is used).

A proper solution would require that the debian-installer section gets
its own Sources.gz file, but that is currently just not available.
After trying some things the conclusion was that the best solution for
now is to just not include source for udebs at all.

Patch written by Steve McIntyre.
---
 debian/changelog          |  5 ++++-
 tools/list2cds            |  2 ++
 tools/merge_package_lists | 45 +++++++++++++++++++++++----------------
 3 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 25b5e203..66295ae2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,8 +60,11 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
   * Fix bashism in tools/grab_md5. Closes: #489562
   * Change lynx dependency to use lynx-cur|lynx instead. Closes: #489486
   * Add sanity check for data passed to add_packages.
+  * Workaround to avoid errors when building images for Etch+1/2 (using
+    packages from stable but D-I/udebs from testing): don't include source
+    for udebs in images.
 
- -- Frans Pop <fjp@debian.org>  Sun, 13 Jul 2008 13:12:39 +0200
+ -- Frans Pop <fjp@debian.org>  Sun, 13 Jul 2008 13:29:49 +0200
 
 debian-cd (3.0.4) unstable; urgency=low
 
diff --git a/tools/list2cds b/tools/list2cds
index 57b0f12b..8b330d61 100755
--- a/tools/list2cds
+++ b/tools/list2cds
@@ -83,6 +83,8 @@ while (defined($_=<AVAIL>)) {
 		$packages{$p}{"Component"} = "contrib";
 	} elsif ($packages{$p}{"Section"} =~ /non-free\//) {
 		$packages{$p}{"Component"} = "non-free";
+	} elsif ($packages{$p}{"IsUdeb"}) {
+		$packages{$p}{"Component"} = "main-installer";
 	} else {
 		$packages{$p}{"Component"} = "main";
 	}
diff --git a/tools/merge_package_lists b/tools/merge_package_lists
index 0eff0328..00c586b8 100755
--- a/tools/merge_package_lists
+++ b/tools/merge_package_lists
@@ -87,34 +87,42 @@ if [ $source = "yes" ] ; then
 	# Now start placing source packages, depending on the order of the binary packages
 	/.*/        {
 				  if (parsed) {
-				    split($0,fields,":")
+				  	split($0,fields,":")
 					arch=fields[1]
 					component=fields[2]
 					pkg=fields[3]
 					source=bin2src[pkg]
-					if (!included[source]) {
-					  printf("# Adding source %s at %d because of %s:%s\n",
-					      source, FNR, arch, pkg)
-					  included[source] = pkg
-					  incarch[source] = arch
-					  indexnr[source] = FNR
-					  sourcecomp[source] = component
+					if ("main-installer" == component) {
+						printf("# Ignoring source for udeb %s\n", pkg)
 					} else {
-					  if (FNR < indexnr[source]) {
-					    printf("# Updating source %s: was due to %d:%s:%s, now moved earlier because of %d:%s:%s\n",
-						source, indexnr[source],
-						incarch[source], included[source],
-						FNR, arch, pkg);
-					    included[source] = pkg
-					    incarch[source] = arch
-					    indexnr[source] = FNR
-					  } else {
-					    printf("# Not adding pkg %s source (%d:%s:%s), already added due to %d:%s:%s\n", pkg, FNR, arch, source, indexnr[source], incarch[source], included[source])
+					    if (!included[source]) {
+						printf("# Adding source %s at %d because of %s:%s\n",
+						  source, FNR, arch, pkg)
+						  included[source] = pkg
+						  incarch[source] = arch
+						  indexnr[source] = FNR
+						  sourcecomp[source] = component
+					    } else {
+						if (FNR < indexnr[source]) {
+							printf("# Updating source %s: was due to %d:%s:%s, now moved earlier because of %d:%s:%s\n",
+							  source, indexnr[source],
+							  incarch[source], included[source],
+							  FNR, arch, pkg)
+							included[source] = pkg
+							incarch[source] = arch
+							indexnr[source] = FNR
+						} else {
+							printf("# Not adding pkg %s source (%d:%s:%s), already added due to %d:%s:%s\n",
+							  pkg, FNR, arch, source,
+							  indexnr[source], incarch[source],
+							  included[source])
+						}
 					    }
 					}
 					printf("%d:%s\n", FNR, $0)
 				  }
 				}
+
 	END {
 	    for (source in included) {
 		printf("%d:aaaaaaaaaaaaaaaaaa:%s:%s\n", indexnr[source], sourcecomp[source], source)
@@ -136,6 +144,7 @@ grep -v ^# $BDIR/list.mid | awk -F : '
             pkgname[number_packages++] = $4
         }
 		gsub("aaaaaaaaaaaaaaaaaa", "source", $2) # Undo the source sorting hack
+		gsub("main-installer", "main", $3)
         add[$4] = add[$4] $2 ":" $3 ":" $4 " "
     }
 END {