[debian-edu-commits] r79243 - trunk/src/build/CD-administrator

[pere at alioth.debian.org]

Author: pere
Date: 2013-03-02 16:16:56 +0000 (Sat, 02 Mar 2013)
New Revision: 79243

Added:
   trunk/src/build/CD-administrator/hintpkgs-wheezy-netinst.txt
Modified:
   trunk/src/build/CD-administrator/wanted-list
   trunk/src/build/CD-administrator/wantedpkglist-wheezy-test-amd64-i386-netinst.txt
Log:
Fix wheezy netinst priority ordering of packages, to try to fix the installation problem.

Added: trunk/src/build/CD-administrator/hintpkgs-wheezy-netinst.txt
===================================================================
--- trunk/src/build/CD-administrator/hintpkgs-wheezy-netinst.txt	                        (rev 0)
+++ trunk/src/build/CD-administrator/hintpkgs-wheezy-netinst.txt	2013-03-02 16:16:56 UTC (rev 79243)
@@ -0,0 +1,55 @@
+# This file holds hints for packages to tell debian-cd to include.
+# This can be used to get debian-cd to choose one specific package to
+# satisy a virtual package dependency.
+# This is the netinstaller version, and packages are all online. so there are mostly udebs here. 
+# 
+
+#packages used in debootstrap
+exim4-daemon-heavy
+
+# LTSP 
+ltsp-client-builder
+
+# Misc debian-edu packages used by d-i
+localechooser
+debian-edu-install-udeb
+debian-edu-profile-udeb
+debian-edu-archive-keyring-udeb
+localization-config-udeb
+debian-edu-archive-keyring
+
+# And the firmware blobs needed to get network, disk controllers and
+# video cards working. FIXME review firmware list regularly.
+atmel-firmware
+firmware-atheros
+firmware-bnx2
+firmware-bnx2x
+firmware-brcm80211
+firmware-intelwimax
+firmware-ipw2x00
+firmware-ivtv
+firmware-iwlwifi
+firmware-linux-nonfree
+firmware-netxen
+firmware-qlogic
+firmware-ralink
+firmware-ralink
+firmware-realtek
+libertas-firmware
+b43-fwcutter
+
+wireless-tools
+wpasupplicant
+#
+# Packages installed early in the boot before the network APT sources
+# are available.
+acpi
+mdetect
+xresprobe
+read-edid
+
+# Misc debian-edu packages installed by d-i
+education-tasks
+debian-edu-config
+debian-edu-install
+etckeeper

Modified: trunk/src/build/CD-administrator/wanted-list
===================================================================
--- trunk/src/build/CD-administrator/wanted-list	2013-03-02 11:57:01 UTC (rev 79242)
+++ trunk/src/build/CD-administrator/wanted-list	2013-03-02 16:16:56 UTC (rev 79243)
@@ -26,6 +26,16 @@
 
 case $SUITE in 
 	#the netinstallers only needs udebs, so the tasks are irrelevant. 
+	*wheezy-*-netinst*)
+	(
+		hintpkgs="hintpkgs-wheezy-netinst.txt"
+                svn -q update $hintpkgs >/dev/null 2>&1
+		
+		[ -f $hintpkgs ] && cat $hintpkgs
+
+	) > $wpkg.new
+	;;
+	#the netinstallers only needs udebs, so the tasks are irrelevant. 
 	*netinst*)
 	(
 		hintpkgs="hintpkgs-netinst.txt"

Modified: trunk/src/build/CD-administrator/wantedpkglist-wheezy-test-amd64-i386-netinst.txt
===================================================================
--- trunk/src/build/CD-administrator/wantedpkglist-wheezy-test-amd64-i386-netinst.txt	2013-03-02 11:57:01 UTC (rev 79242)
+++ trunk/src/build/CD-administrator/wantedpkglist-wheezy-test-amd64-i386-netinst.txt	2013-03-02 16:16:56 UTC (rev 79243)
@@ -43,7 +43,7 @@
 xresprobe
 read-edid
 # Misc debian-edu packages installed by d-i
-etckeeper
 education-tasks
 debian-edu-config
 debian-edu-install
+etckeeper