summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2007-12-26 18:29:18 +0000
committerH. Peter Anvin <hpa@zytor.com>2007-12-26 18:29:18 +0000
commit18b2cd705e375e4eeab94eb60cb10bb4af2db28b (patch)
treef49435a098dd8cc7b4b512a787a1c7343256e456
parent184c35f68cb837b6650069a521ae66ad3e4451be (diff)
downloadnasmbuild-18b2cd705e375e4eeab94eb60cb10bb4af2db28b.tar.gz
nasmbuild-18b2cd705e375e4eeab94eb60cb10bb4af2db28b.tar.xz
nasmbuild-18b2cd705e375e4eeab94eb60cb10bb4af2db28b.zip
Systematic way to force a patch on top of a build
-rwxr-xr-xbuildall.sh10
1 files changed, 9 insertions, 1 deletions
diff --git a/buildall.sh b/buildall.sh
index 82acdf4..206fe2f 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -1,6 +1,7 @@
#!/bin/bash -xe
here=/home/nasmbuild/work
+patchdir=/home/nasmbuild/patches
snapdir=/pub/nasm/snapshots
reldir=/pub/nasm/releasebuilds
repo=/pub/git/nasm/nasm.git
@@ -26,7 +27,14 @@ build () {
rm -rf nasm-* win32 dos os2 rpmbuild
mkdir -p rpmbuild/{BUILD,RPMS,SRPMS,SPECS,SOURCES}
- ( cd "$gitdir" && ./misc/release $version $here )
+ (
+ cd "$gitdir"
+ if [ -f $patchdir/$version ]; then
+ git apply $patchdir/$version
+ git commit -m"Build robot patch for nasm-$version"
+ fi
+ ./misc/release $version $here
+ )
do32 rpmbuild --target i386 -ta nasm-$version.tar.bz2
rpmbuild --target x86_64 -ta nasm-$version.tar.bz2