From patchwork Tue Aug 30 22:04:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 112389 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id CFE28B6F8A for ; Wed, 31 Aug 2011 08:04:58 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QyWQF-0000rK-0z; Tue, 30 Aug 2011 22:04:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QyWQC-0000rE-Qx for kernel-team@lists.ubuntu.com; Tue, 30 Aug 2011 22:04:40 +0000 Received: from c-24-21-156-70.hsd1.or.comcast.net ([24.21.156.70] helo=[192.168.1.3]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QyWQC-0001x8-F6; Tue, 30 Aug 2011 22:04:40 +0000 Subject: Re: Build time improvements From: Leann Ogasawara To: Tim Gardner Date: Tue, 30 Aug 2011 15:04:37 -0700 In-Reply-To: <4E5CFF50.3080508@canonical.com> References: <4E5CFF50.3080508@canonical.com> X-Mailer: Evolution 3.1.5- Message-ID: <1314741879.1809.22.camel@adamo> Mime-Version: 1.0 Cc: Ubuntu Kernel Team X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com 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 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 --- buildscripts/target-scripts/run-build | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) 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