mainline-build: minor cleanups for control and clarity
 

Update for better external control of mainline builds of patched trees.
Add -generic-pae build to the target list.

Signed-off-by: Kees Cook <kees.cook@canonical.com>
---
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 <tag> <series> [<abinum>" 1>&2
+ echo "Usage: $P <tag> <series> [<abinum> [<upload> [<basedir>]]]" 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" </dev/null
sed -e "s/* .*/* Mainline build at commit: $long/"
<"$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"
--
1.7.4.1


--
Kees Cook
Ubuntu Security Team

--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team