From patchwork Thu May 26 18:15:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 97606 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 9B100B6F91 for ; Fri, 27 May 2011 04:15:38 +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 1QPf5l-0006qk-5u; Thu, 26 May 2011 18:15:29 +0000 Received: from smtp.outflux.net ([198.145.64.163]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QPf5j-0006qa-BT for kernel-team@lists.ubuntu.com; Thu, 26 May 2011 18:15:27 +0000 Received: from www.outflux.net (serenity-end.outflux.net [10.2.0.2]) by vinyl.outflux.net (8.14.3/8.14.3/Debian-9.2ubuntu1) with ESMTP id p4QIFPhg005275 for ; Thu, 26 May 2011 11:15:26 -0700 Date: Thu, 26 May 2011 11:15:25 -0700 From: Kees Cook To: kernel-team@lists.ubuntu.com Subject: [PATCH][kteam-tools] mainline-build: minor cleanups for control and clarity Message-ID: <20110526181525.GG19633@outflux.net> MIME-Version: 1.0 Content-Disposition: inline Organization: Ubuntu X-MIMEDefang-Filter: outflux$Revision: 1.316 $ X-HELO: www.outflux.net X-Scanned-By: MIMEDefang 2.69 on 10.2.0.1 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 Update for better external control of mainline builds of patched trees. Add -generic-pae build to the target list. Signed-off-by: Kees Cook --- mainline-build/mainline-build-one | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mainline-build/mainline-build-one b/mainline-build/mainline-build-one index 7e21b7e..31ce112 100755 --- a/mainline-build/mainline-build-one +++ b/mainline-build/mainline-build-one @@ -3,7 +3,7 @@ P="build-mainline-one" if [ "$#" -ne 2 -a "$#" -ne 3 ]; then - echo "Usage: $P [" 1>&2 + echo "Usage: $P [ [ []]]" 1>&2 exit 1 fi @@ -16,6 +16,10 @@ esac commit="$1" series="$2" abinum="$3" +upload="$4" +if [ -n "$5" ]; then + here="$5" +fi build_release="hardy" @@ -49,7 +53,9 @@ if [ "$abinum" = "" ]; then fi # use the date as an upload number so we can tell different builds apart. -upload=".`date +%Y%m%d%H%M`" +if [ -z "$upload" ]; then + upload="`date +%Y%m%d%H%M`" +fi # Produce CHANGES fragment. if [ "$log_enabled" -eq 1 ]; then @@ -161,7 +167,7 @@ do done changelog="$debian/changelog" rm -f "$changelog" -EDITOR=":" dch -v "${version}-$abinum$upload" --distribution "$series" \ +EDITOR=":" dch -v "${version}-$abinum.$upload" --distribution "$series" \ --package linux --create -c "$changelog" "$changelog.new" @@ -191,6 +197,7 @@ git clean -x -f -d # Build the source package. # #dpkg-buildpackage -S -sd -rfakeroot -I.git -I.gitignore -i'\.git.*' +#dpkg-buildpackage -S -sa -rfakeroot -I.git -I.gitignore -i'\.git.*' #dpkg-buildpackage -b dchroot --directory=`pwd` -c "$build_release" \ "fakeroot debian/rules clean" @@ -204,3 +211,5 @@ linux32 dchroot --directory=`pwd` -c "$build_release-i386" \ "fakeroot debian/rules clean" linux32 dchroot --directory=`pwd` -c "$build_release-i386" \ "fakeroot debian/rules do_tools=0 no_dumpfile=1 binary-generic" +linux32 dchroot --directory=`pwd` -c "$build_release-i386" \ + "fakeroot debian/rules do_tools=0 no_dumpfile=1 binary-generic-pae"