On Wed, Mar 16, 2005 at 02:18:16AM -0500, Joey Hess wrote: > Geert Stappers wrote: > > It is currently executing debian-installer/installer/build/daily-build > > in the trunk branch. > > > > Does it make sense if I put it on > > http://people.debian.org/~stappers/d-i/images/daily/ > > and in a cronjob? > > Yes please. I pinged Josh on this and he requested that you might try to > build the floppies. You have to run their builds as root though, so it's > obviously up to you. :-) Let me know when you have the builds going and > I'll update things. A first set is available at http://people.debian.org/~stappers/d-i/images/2005-03-17/ For the building as root and upload as user, I modified daily-build (stripped the upload part) and created upload-daily-build (daily-build with build) Attached are the patches for these modifications. At which time should I schedule the builds? Cheers Geert Stappers
Index: daily-build
===================================================================
--- daily-build (revision 26294)
+++ daily-build (working copy)
@@ -1,25 +1,6 @@
#!/bin/sh -e
# Set these in the environment to override.
-if [ -z "$HOST" ]; then
- HOST=people.debian.org
-fi
-if [ -z "$BASEDIR" ]; then
- # Please don't change this. If you need it to be something else,
- # override the variable.
- BASEDIR=public_html/d-i/images
-fi
-if [ -z "$DIR" ]; then
- DIR=`date +%Y-%m-%d`
-fi
-if [ "$HOST" = "local" ]; then
- SYNC="rsync"
- SYNC_BASEDIR="$BASEDIR"
-else
- CALL="ssh $HOST"
- SYNC="rsync -e ssh"
- SYNC_BASEDIR="$HOST:$BASEDIR"
-fi
[ -n "$ROOTCMD" ] || ROOTCMD="fakeroot"
overview () {
@@ -57,14 +38,3 @@
done
$ROOTCMD make $(echo $TARGETS | sed 's/build_/stats_/g') | 2>&1 tee dest/stats.txt # This is allowed to fail
-echo
-echo UPLOADING FILES
-echo
-
-$CALL mkdir -p $BASEDIR/${DIR}_RSYNC_IN_PROGRESS
-$CALL test ! -d $BASEDIR/daily || $CALL cp -a $BASEDIR/daily/* $BASEDIR/${DIR}_RSYNC_IN_PROGRESS/
-$SYNC --stats -rvl --safe-links --delete -e ssh dest/ $SYNC_BASEDIR/${DIR}_RSYNC_IN_PROGRESS/
-$CALL rm -rf $BASEDIR/$DIR
-$CALL mv $BASEDIR/${DIR}_RSYNC_IN_PROGRESS $BASEDIR/$DIR
-$CALL rm -rf $BASEDIR/daily
-$CALL ln -sf $DIR $BASEDIR/daily
--- ../build-svn/daily-build 2005-03-15 14:58:19.000000000 +0100
+++ upload-daily-build 2005-03-17 01:11:47.067522696 +0100
@@ -20,43 +20,12 @@
SYNC="rsync -e ssh"
SYNC_BASEDIR="$HOST:$BASEDIR"
fi
-[ -n "$ROOTCMD" ] || ROOTCMD="fakeroot"
-
-overview () {
- LANG=C echo "$(dpkg --print-architecture) ($(date)) $(whoami)@$(hostname | cut -d . -f 1) $1" >> dest/overview.log
-}
if [ ! -d pkg-lists ]; then
echo "You must run this from the build directory"
exit 1
fi
-unset LANG LC_ALL LANGUAGE || true
-(cd ../debian && svn up || true)
-svn up || true
-
-# Override $TARGETS with custom makefile targets.
-if [ -z "$TARGETS" ]; then
- TARGETS="$($ROOTCMD make all_list |grep '^build')"
-fi
-
-$ROOTCMD make reallyclean
-mkdir dest
-touch dest/overview.log
-for t in $TARGETS; do
- (
- echo
- echo BUILDING IMAGE FOR $t
- echo
- if $ROOTCMD make $t; then
- overview "$t success"
- else
- overview "$t failed"
- fi
- ) 2>&1 | tee dest/$t.log # This is allowed to fail
-done
-$ROOTCMD make $(echo $TARGETS | sed 's/build_/stats_/g') | 2>&1 tee dest/stats.txt # This is allowed to fail
-
echo
echo UPLOADING FILES
echo
Attachment:
signature.asc
Description: Digital signature