summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-18 23:48:27 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-18 23:48:27 +0100
commit5e69cd116e88ae1cfbf82ae2c52f5e50e10ca99d (patch)
treec71686d33e1b1257ba883121858048f39bde4c30
parentc4322da5f75572cde16dfc4a3c95eab997f60457 (diff)
downloaddraklive-config-distro/mga5.1.tar
draklive-config-distro/mga5.1.tar.gz
draklive-config-distro/mga5.1.tar.bz2
draklive-config-distro/mga5.1.tar.xz
draklive-config-distro/mga5.1.zip
build_live.sh: customise for 5.1 buildsdistro/mga5.1
-rwxr-xr-xtools/build_live.sh43
1 files changed, 8 insertions, 35 deletions
diff --git a/tools/build_live.sh b/tools/build_live.sh
index c0f082e..1eb7661 100755
--- a/tools/build_live.sh
+++ b/tools/build_live.sh
@@ -1,41 +1,14 @@
#!/bin/sh
-set=$(date -u +%Y%m%d%H%M)
-
-logdir=~/draklive-logs
-mkdir -p $logdir
-exec &>$logdir/draklive-$set.log
-
-echo "tmb is doing manual builds right now, so no auto build allowed for tonight"
-exit 0
-
-set -x
-
-#archs="i586"
archs="i586 x86_64"
-desktops="KDE4 GNOME"
-#desktops="KDE4"
-#regions="Europe1-Americas Europe2 Africa-India Asia-no-India"
-#regions="all"
-regions="Europe1-Americas"
-draklive_config=$(dirname $(dirname $0))
-#draklive_config=/home/blino/live-config/
+desktops="GNOME KDE4"
-steps="--clean --all"
-#steps="--boot --loop --master"
-
-draklive_cmd="sudo draklive --config-root $draklive_config"
-#draklive_cmd="sudo -u draklive sudo perl -I./draklive/lib ./draklive/draklive --config-root $draklive_config"
-
-start=$(date)
for arch in $archs; do
- for desktop in $desktops; do
- for region in $regions; do
- time $draklive_cmd $steps --define arch=$arch --define desktop=$desktop --define region=$region --define set=$set
- done
- done
+ for desktop in $desktops; do
+ sudo -u draklive sudo /usr/sbin/draklive --clean --all --define arch=$arch --define desktop=$desktop
+ sudo -u bcd mkdir -p /home/bcd/public_html/isos/mageia5.1/Mageia-5.1-LiveDVD-${desktop}-${arch}-DVD
+ sudo -u bcd cp /home/draklive/var-data/build/Mageia-5.1-LiveDVD-${desktop}-${arch}-DVD/dist/* /home/bcd/public_html/isos/mageia5.1/Mageia-5.1-LiveDVD-${desktop}-${arch}-DVD
+ # not enough space on rabbit's RAM disk for all four variants, so delete as we go
+ sudo -u draklive sudo /usr/sbin/draklive --clean --define arch=$arch --define desktop=$desktop
+ done
done
-
-echo set $set
-echo $start
-echo $(date)