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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-17 20:59:42 +0000 (Mon, 17 Jun 2013)
New Revision: 80847

Modified:
   trunk/src/build/CD-administrator/debian-cd.patch.lenny
   trunk/src/build/CD-administrator/debian-cd.patch.squeeze
   trunk/src/build/CD-administrator/debian-cd.patch.wheezy
   trunk/src/build/CD-administrator/list-sources
Log:
Fix source ISO build for wheezy and adjust patches for lenny and squeeze to cope with the new argument for list-sources.

Modified: trunk/src/build/CD-administrator/debian-cd.patch.lenny
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.lenny	2013-06-17 19:13:27 UTC (rev 80846)
+++ trunk/src/build/CD-administrator/debian-cd.patch.lenny	2013-06-17 20:59:42 UTC (rev 80847)
@@ -74,7 +74,7 @@
  	$(Q)if [ "$(SOURCEONLY)"x = "yes"x ] ; then \
 -		awk '/^Package:/ {print $$2}' $(ADIR)/$(CODENAME)-source/apt-state/lists/*Sources | \
 -			sort -u > $(BDIR)/rawlist; \
-+		../list-sources $(TDIR)/../lenny-dvd/lenny/CD1 | sort | uniq > $(BDIR)/rawlist; \
++		../list-sources $(TDIR)/../lenny-dvd/lenny/CD1 lenny | sort | uniq > $(BDIR)/rawlist; \
  	fi
  #	ls -al $(BDIR)/rawlist
  

Modified: trunk/src/build/CD-administrator/debian-cd.patch.squeeze
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.squeeze	2013-06-17 19:13:27 UTC (rev 80846)
+++ trunk/src/build/CD-administrator/debian-cd.patch.squeeze	2013-06-17 20:59:42 UTC (rev 80847)
@@ -7,7 +7,7 @@
  	$(Q)if [ "$(SOURCEONLY)"x = "yes"x ] ; then \
 -		awk '/^Package:/ {print $$2}' $(ADIR)/$(CODENAME)-source/apt-state/lists/*Sources | \
 -			sort -u > $(BDIR)/rawlist; \
-+		../list-sources $(TDIR)/../squeeze-dvd/squeeze/CD1 | sort | uniq > $(BDIR)/rawlist; \
++		../list-sources $(TDIR)/../squeeze-dvd/squeeze/CD1 squeeze | sort | uniq > $(BDIR)/rawlist; \
  	fi
  #	ls -al $(BDIR)/rawlist
  

Modified: trunk/src/build/CD-administrator/debian-cd.patch.wheezy
===================================================================
--- trunk/src/build/CD-administrator/debian-cd.patch.wheezy	2013-06-17 19:13:27 UTC (rev 80846)
+++ trunk/src/build/CD-administrator/debian-cd.patch.wheezy	2013-06-17 20:59:42 UTC (rev 80847)
@@ -1,3 +1,16 @@
+diff -Nur --exclude=debian-installer-etch --exclude=debian-installer+kernel-etch --exclude=unexclude-CD2-etch --exclude=.svn --exclude=sid debian-cd.unpatched/Makefile debian-cd/Makefile
+--- debian-cd.unpatched/Makefile
++++ debian-cd/Makefile
+@@ -345,8 +345,7 @@
+     # If we're *only* doing source, then we need to build a list of all the
+     # available source packages. Deliberately ignore the tasks too.
+ 	$(Q)if [ "$(SOURCEONLY)"x = "yes"x ] ; then \
+-		awk '/^Package:/ {print $$2}' $(ADIR)/$(CODENAME)-source/apt-state/lists/*Sources | \
+-			sort -u > $(BDIR)/rawlist; \
++		../list-sources $(TDIR)/../wheezy-test-usbstick/wheezy/CD1 wheezy | sort | uniq > $(BDIR)/rawlist; \
+ 	fi
+ #	ls -al $(BDIR)/rawlist
+ 
 diff -urN debian-cd.unpatched.wheezy/tasks/wheezy/exclude debian-cd.new/tasks/wheezy/exclude
 --- debian-cd.unpatched.wheezy/tasks/wheezy/exclude	2010-08-07 19:05:03.000000000 +0200
 +++ debian-cd.new/tasks/wheezy/exclude	2010-10-23 08:55:04.000000000 +0200

Modified: trunk/src/build/CD-administrator/list-sources
===================================================================
--- trunk/src/build/CD-administrator/list-sources	2013-06-17 19:13:27 UTC (rev 80846)
+++ trunk/src/build/CD-administrator/list-sources	2013-06-17 20:59:42 UTC (rev 80847)
@@ -3,10 +3,10 @@
 # List all the source packages of packages on a CD. Needs the directory the
 # CD was built in.
 my $dir=shift;
+my $CODENAME = shift || "wheezy";
 
 #print "$dir\n";
 
-my $CODENAME = "squeeze";
 
 foreach my $dist (glob("$dir/dists/$CODENAME/*")) {
 #       print "$dist\n";