summaryrefslogtreecommitdiffstats
path: root/buildall.sh
diff options
context:
space:
mode:
Diffstat (limited to 'buildall.sh')
-rwxr-xr-xbuildall.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/buildall.sh b/buildall.sh
index 8b1620d..6d5cf09 100755
--- a/buildall.sh
+++ b/buildall.sh
@@ -1,5 +1,6 @@
#!/bin/bash -xe
+mirrorrobot=/home/nasmbuild/gitmirror/robot-wrapper.sh
here=/home/nasmbuild/work
patchdir=/home/nasmbuild/patches
pubdir=/pub/nasm
@@ -63,7 +64,7 @@ build () {
# --- Generate Linux RPMs ---
(
mkdir -p rpmbuild/i386/{BUILD,RPMS,SRPMS,SPECS,SOURCES}
- do32 rpmbuild -D "%_topdir ${here}/rpmbuild/i386" --target i386 -tb nasm-$version.tar.xz
+ do32 rpmbuild -D "%_topdir ${here}/rpmbuild/i386" --target i686 -tb nasm-$version.tar.xz
) > log/rpm32 2>&1 &
jobn[rpm32]=$!
(
@@ -213,7 +214,8 @@ build () {
# OS/2
#mv -f nasm-${version}-os2.zip "$outdir"/os2/
# Linux (RPMS)
- find rpmbuild -name \*.rpm -exec mv -f '{}' "$outdir"/linux/ \;
+ find rpmbuild/i386 -name '*.i?86.rpm' -exec mv -f '{}' "$outdir"/linux/ \;
+ find rpmbuild/x86_64 -name '*.rpm' -exec mv -f '{}' "$outdir"/linux/ \;
( cd "$outdir"/linux && createrepo_c . )
# Expanded docs
cp -a doc "$outdir"/doc
@@ -247,7 +249,7 @@ rm -rf git git-rel
today=$(date +%Y%m%d)
# Make sure the git repo is up to date
-$HOME/gitmirror/robot-wrapper.sh force
+$mirrorrobot force
git clone -s -l $repo git
(cd $tagrepo && git fetch -f) > /dev/null 2>&1
HEAD=$(cd git && git rev-parse HEAD)