From 032c48640aa8f074f1bb74d2ba4e374a07750e49 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Fri, 12 Aug 2005 15:04:05 +0000
Subject: [PATCH] * Move md5sums and udeb.list generation into "release" target
 of   build/Makefile and run these as part of the daily build too.

r29872
---
 build/Makefile    | 7 +++++++
 build/daily-build | 1 +
 debian/changelog  | 4 +++-
 debian/rules      | 5 +----
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/build/Makefile b/build/Makefile
index 1ae31b9ef..26cc67f4f 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -261,6 +261,13 @@ rebuild_%:
 _rebuild:
 	@$(submake) _clean _build
 
+# Run before releasing built files.
+release:
+	egrep '^[[:space:]]' $(BASE_DEST)/MANIFEST.udebs | \
+		sed 's/^[[:space:]]*//' | sort | uniq > $(BASE_DEST)/udeb.list
+	rm -f $(BASE_DEST)/MD5SUMS
+	cd $(BASE_DEST) && md5sum `find . -type f` > MD5SUMS
+
 # The general tree target.
 $(STAMPS)tree-unpack-$(targetstring)-stamp: $(STAMPS)get_udebs-$(targetstring)-stamp
 	dh_testroot
diff --git a/build/daily-build b/build/daily-build
index 14edefcfe..5e2d606fc 100755
--- a/build/daily-build
+++ b/build/daily-build
@@ -67,6 +67,7 @@ build () {
 		fi
 	done
 	$ROOTCMD make $(echo $TARGETS | sed 's/build_/stats_/g') > dest/stats.txt 2>&1 || true
+	make release
 }
 
 upload () {
diff --git a/debian/changelog b/debian/changelog
index b9adcbac4..a93cc4100 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -215,8 +215,10 @@ debian-installer (20050630) UNRELEASED; urgency=low
   * Add libnss-files-udeb to exclude list to work around bug #322506.
   * Optimise pkg-lists a bit.
   * rootskel-locale renamed to installation-locale.
+  * Move md5sums and udeb.list generation into "release" target of
+    build/Makefile and run these as part of the daily build too.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 11 Aug 2005 11:51:09 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 12 Aug 2005 11:00:55 -0400
 
 debian-installer (20050317) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 5a24ade01..867915489 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ clean:
 
 # Must run as root, so is not run as part of regular build.
 build-images:
-	$(MAKE) -C build all_build stats \
+	$(MAKE) -C build all_build stats release \
 		SUITE=$(SUITE) BUILD_DATE=$(DATE) PRESEED=
 	
 build: build-stamp
@@ -60,9 +60,6 @@ install: build
 
 	install -d $(IMAGEDIR)
 	cp -a build/dest/* $(IMAGEDIR)
-	egrep '^[[:space:]]' $(IMAGEDIR)/MANIFEST.udebs | \
-		sed 's/^[[:space:]]*//' | sort | uniq > $(IMAGEDIR)/udeb.list
-	cd $(IMAGEDIR) && md5sum `find . -type f` > MD5SUMS
 	ln -s $(DATE) $(ARCHIVEDIR)/current
 
 binary-arch: install