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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-21 10:44:58 +0000 (Fri, 21 Jun 2013)
New Revision: 81004

Added:
   trunk/src/build/CD-administrator/hintpkgs-wheezy-amd64-i386-netinst-unwanted.txt
   trunk/src/build/CD-administrator/hintpkgs-wheezy-unwanted.txt
Modified:
   trunk/src/build/CD-administrator/hintpkgs-wheezy-test-amd64-i386-netinst-unwanted.txt
   trunk/src/build/CD-administrator/unwanted-list
Log:
Make sure we avoid a common set of packages on all wheezy builds, and sync test and prod netinst builds.

Added: trunk/src/build/CD-administrator/hintpkgs-wheezy-amd64-i386-netinst-unwanted.txt
===================================================================
--- trunk/src/build/CD-administrator/hintpkgs-wheezy-amd64-i386-netinst-unwanted.txt	                        (rev 0)
+++ trunk/src/build/CD-administrator/hintpkgs-wheezy-amd64-i386-netinst-unwanted.txt	2013-06-21 10:44:58 UTC (rev 81004)
@@ -0,0 +1,3 @@
+#
+# Drop packages that can be installed from the net
+openssh-server

Modified: trunk/src/build/CD-administrator/hintpkgs-wheezy-test-amd64-i386-netinst-unwanted.txt
===================================================================
--- trunk/src/build/CD-administrator/hintpkgs-wheezy-test-amd64-i386-netinst-unwanted.txt	2013-06-21 10:43:37 UTC (rev 81003)
+++ trunk/src/build/CD-administrator/hintpkgs-wheezy-test-amd64-i386-netinst-unwanted.txt	2013-06-21 10:44:58 UTC (rev 81004)
@@ -1,9 +1,3 @@
-# Drop support for file systems we do not use
-jfsutils
-xfsprogs
-reiserfsprogs
-btrfs-tools
-ufsutils
 #
 # Drop packages that can be installed from the net
 openssh-server

Added: trunk/src/build/CD-administrator/hintpkgs-wheezy-unwanted.txt
===================================================================
--- trunk/src/build/CD-administrator/hintpkgs-wheezy-unwanted.txt	                        (rev 0)
+++ trunk/src/build/CD-administrator/hintpkgs-wheezy-unwanted.txt	2013-06-21 10:44:58 UTC (rev 81004)
@@ -0,0 +1,6 @@
+# Drop support for file systems we do not use
+jfsutils
+xfsprogs
+reiserfsprogs
+btrfs-tools
+ufsutils

Modified: trunk/src/build/CD-administrator/unwanted-list
===================================================================
--- trunk/src/build/CD-administrator/unwanted-list	2013-06-21 10:43:37 UTC (rev 81003)
+++ trunk/src/build/CD-administrator/unwanted-list	2013-06-21 10:44:58 UTC (rev 81004)
@@ -26,11 +26,12 @@
 	grep -v '^#' $TASKDIR/avoidpackages.txt
 
 	make -C $TASKDIR clean >/dev/null
-
-	if [ -e "hintpkgs-$suite-unwanted.txt" ] ; then
-	    cat "hintpkgs-$suite-unwanted.txt"
-	fi
-
+	for f in "hintpkgs-$CODENAME-unwanted.txt" \
+	    "hintpkgs-$suite-unwanted.txt" ; do
+	    if [ -e "$f" ] ; then
+		cat "$f"
+	    fi
+	done
 ) > $uwpkg.new
 
 # Make sure the packages are only listed once