diff mbox

Build time improvements

Message ID 1314741879.1809.22.camel@adamo
State New
Headers show

Commit Message

Leann Ogasawara Aug. 30, 2011, 10:04 p.m. UTC 
On Tue, 2011-08-30 at 09:18 -0600, Tim Gardner wrote:
> Leann,
> 
> Give this a shot with your normal build processes.
> 
> The following changes since commit 0020abf875522fa557ca1ff6700314b4b5014c4a:
>    Tim Gardner (1):
>          buildscripts/ukb-make: double the fun
> 
> are available in the git repository at:
> 
>    git://kernel.ubuntu.com/rtg/kteam-tools.git master
> 
> Tim Gardner (1):
>        buildscripts/target-scripts/run-build: Use dpkg-buildpackage if 
> parallel build targets are supported
> 
>   buildscripts/target-scripts/run-build |   29 ++++++++++++++++++++++-------
>   1 files changed, 22 insertions(+), 7 deletions(-)

I had to make some minor changes to get this working for me. Otherwise
it's working great.  Patch inlined below...

From 2d3fba49c9362cb43a80403281851f468d4ef905 Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Tue, 30 Aug 2011 13:54:34 -0700
Subject: [PATCH] buildscripts/target-scripts/run-build: Fix up run time errors

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 buildscripts/target-scripts/run-build |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

Comments

Tim Gardner Aug. 31, 2011, 2:17 p.m. UTC | #1 
On 08/30/2011 04:04 PM, Leann Ogasawara wrote:
> On Tue, 2011-08-30 at 09:18 -0600, Tim Gardner wrote:
>> Leann,
>>
>> Give this a shot with your normal build processes.
>>
>> The following changes since commit 0020abf875522fa557ca1ff6700314b4b5014c4a:
>>     Tim Gardner (1):
>>           buildscripts/ukb-make: double the fun
>>
>> are available in the git repository at:
>>
>>     git://kernel.ubuntu.com/rtg/kteam-tools.git master
>>
>> Tim Gardner (1):
>>         buildscripts/target-scripts/run-build: Use dpkg-buildpackage if
>> parallel build targets are supported
>>
>>    buildscripts/target-scripts/run-build |   29 ++++++++++++++++++++++-------
>>    1 files changed, 22 insertions(+), 7 deletions(-)
>
> I had to make some minor changes to get this working for me. Otherwise
> it's working great.  Patch inlined below...
>

Cool. I squashed your fixes in with my original patch and pushed it.
diff mbox

Patch

diff --git a/buildscripts/target-scripts/run-build b/buildscripts/target-scripts/run-build
index 6fa71db..0baa2ea 100755
--- a/buildscripts/target-scripts/run-build
+++ b/buildscripts/target-scripts/run-build
@@ -4,6 +4,7 @@ 
 #==============================================================================
 cd $(dirname $0)
 LOG="$(pwd)/build.log"
+KERNEL_DIR="ubuntu-2.6"
 BPID=0
 LPID=0
 # Older build environments check against unset variable.
@@ -49,7 +50,7 @@  if [ $CONCURRENCY_LEVEL -eq 0 ]; then
 	# Detect make parallel ability. I happen to know that this target did not exist until
 	# the make rules were refined to allow parallel builds.
 	#
-	if egrep "install-doc:.*install-headers" debian/rules.d/3-binary-indep.mk > /dev/null
+	if egrep "install-doc:.*install-headers" $KERNEL_DIR/debian/rules.d/3-binary-indep.mk > /dev/null
 	then
 		BLD_CPUS="`expr ${CONCURRENCY_LEVEL} \* 2`"
 		CL="-j${BLD_CPUS}"
@@ -135,7 +136,7 @@  function Cleanup()
 		rm -f $STATUSFILE
 	fi
 	if [ "${BUILDTARGET}" = "kernel" ]; then
-		cd ubuntu-2.6
+		cd $KERNEL_DIR
 		git clean -d -x -f
 	fi
 	wait
@@ -153,7 +154,7 @@  echo "${BUILDTARGET} build started $(date)" >$LOG
 
 case "${BUILDTARGET}" in
 	kernel)
-		cd ubuntu-2.6
+		cd $KERNEL_DIR
 		VER=$(GetVersion)
 		cat <<-EOD >>$STATUSFILE
 		VER=$VER
@@ -162,7 +163,7 @@  case "${BUILDTARGET}" in
 		EOD
 		rm -f ../linux-image-$VER-*
 		fakeroot debian/rules clean >$LOG 2>&1 || Cleanup $?
-		if [ ! -z "${CL}" ] then;
+		if [ ! -z "${CL}" ]; then
 			echo "ACTION=headers" >>$STATUSFILE
 			echo "ACTION=kernel" >>$STATUSFILE
 			dpkg-buildpackage -B ${CL} -us -uc >>$LOG 2>&1