[d-i-commits] r32036 - in trunk/installer: build build/config debian

[Colin Watson]

Author: cjwatson
Date: 2005-11-14 14:17:33 +0000 (Mon, 14 Nov 2005)
New Revision: 32036

Modified:
   trunk/installer/build/Makefile
   trunk/installer/build/README
   trunk/installer/build/config/common
   trunk/installer/debian/changelog
Log:
* Move "main/debian-installer" (for sources.list.udeb) to a
  UDEB_COMPONENTS variable in build/config/common, so that people can more
  easily build with e.g. non-free udebs.

Modified: trunk/installer/build/Makefile
===================================================================
--- trunk/installer/build/Makefile	2005-11-14 14:11:15 UTC (rev 32035)
+++ trunk/installer/build/Makefile	2005-11-14 14:17:33 UTC (rev 32036)
@@ -507,14 +507,14 @@
 	(set -e; \
 	echo "# This file is automatically generated, edit $@.local instead."; \
 	if [ "$(MIRROR)x" != "x" ]; then \
-		echo "deb $(MIRROR) $(SUITE) main/debian-installer"; \
+		echo "deb $(MIRROR) $(SUITE) $(UDEB_COMPONENTS)"; \
 	else \
 		grep '^deb[ \t]' $(SYSTEM_SOURCES_LIST) \
 		|grep -v '^deb[ \t]cdrom:' \
 		|grep -v '\(non-US\|non-us.debian.org\|security.debian.org\)' \
 		|grep '[ \t]main' \
 		|awk '{print $$1 " " $$2}' \
-		|sed "s,/* *$$, $(SUITE) main/debian-installer," \
+		|sed "s,/* *$$, $(SUITE) $(UDEB_COMPONENTS)," \
 		|sed "s,^deb file,deb copy," \
 		|perl -ne 'print unless $$seen{$$_}; $$seen{$$_}=1' ; \
 	fi) > $@

Modified: trunk/installer/build/README
===================================================================
--- trunk/installer/build/README	2005-11-14 14:11:15 UTC (rev 32035)
+++ trunk/installer/build/README	2005-11-14 14:17:33 UTC (rev 32036)
@@ -400,7 +400,11 @@
 SUITE
   The suite to use for the build. Defaults to unstable.
 
+UDEB_COMPONENTS
+  Archive components from which to fetch .udeb packages. Defaults to
+  main/debian-installer.
 
+
 Rules invoked from the various targets:
 
 arch_boot:

Modified: trunk/installer/build/config/common
===================================================================
--- trunk/installer/build/config/common	2005-11-14 14:11:15 UTC (rev 32035)
+++ trunk/installer/build/config/common	2005-11-14 14:17:33 UTC (rev 32036)
@@ -36,6 +36,9 @@
 # stable, testing or unstable.
 SUITE ?= unstable
 
+# Archive components from which to fetch debian-installer modules.
+UDEB_COMPONENTS ?= main/debian-installer
+
 # Options to pass to dpkg when it is unpacking the udebs to create the
 # image. None should be needed, but --force-overwrite might need to be
 # enabled from time to time if udebs have conflicting files.

Modified: trunk/installer/debian/changelog
===================================================================
--- trunk/installer/debian/changelog	2005-11-14 14:11:15 UTC (rev 32035)
+++ trunk/installer/debian/changelog	2005-11-14 14:17:33 UTC (rev 32036)
@@ -8,6 +8,9 @@
 
   [ Colin Watson ]
   * Only generate /etc/lsb-release if a udeb hasn't already provided it.
+  * Move "main/debian-installer" (for sources.list.udeb) to a
+    UDEB_COMPONENTS variable in build/config/common, so that people can more
+    easily build with e.g. non-free udebs.
 
  -- Stephen R. Marenka <smarenka at debian.org>  Mon, 31 Oct 2005 10:54:50 -0600