r4283 - dists/trunk/scripts/test_kernel_build

[Simon Horman]

Author: horms
Date: 2005-09-26 10:44:11 +0000 (Mon, 26 Sep 2005)
New Revision: 4283

Modified:
   dists/trunk/scripts/test_kernel_build/test_kernel_build.unified
Log:
patch tree

Modified: dists/trunk/scripts/test_kernel_build/test_kernel_build.unified
===================================================================
--- dists/trunk/scripts/test_kernel_build/test_kernel_build.unified	2005-09-26 09:38:06 UTC (rev 4282)
+++ dists/trunk/scripts/test_kernel_build/test_kernel_build.unified	2005-09-26 10:44:11 UTC (rev 4283)
@@ -88,9 +88,10 @@
 STAGE_NAME="Patching linux-2.6 tree"
 stage_begin "$STAGE_NAME" || {
 	(
-		echo "skip, as it does nothing"
-		#cd "$S_PKG_DIR" && \
-		#./debian/rules patch
+		cd "$S_PKG_DIR" && \
+		home="$S_PKG_DIR/debian/patches-debian" \
+			override_version=$S_TAG_VERSION \
+			sh ./debian/bin/apply
 	) >& "$LOG.$STAGE"
 	stage_end $?
 }
@@ -98,7 +99,11 @@
 STAGE_NAME="Build linux-2.6 package"
 stage_begin "$STAGE_NAME" || {
 	(
+		# have to unpatch first, else the build falls over
 		cd "$S_PKG_DIR" && \
+		home="$S_PKG_DIR/debian/patches-debian" \
+			override_version=$S_UPSTREAM_VERSION \
+			sh ./debian/bin/apply && \
 		dpkg-buildpackage -us -uc -rfakeroot
 	) >& "$LOG.$STAGE"
 	stage_end $?