From caddf8c48ccd1ecde1168400f9f08e1c2bc5cbdb Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 13 May 2017 12:25:49 +0200 Subject: Updated build script. --- tools/build_live.sh | 49 +++++++++++++++++-------------------------------- 1 file changed, 17 insertions(+), 32 deletions(-) (limited to 'tools') diff --git a/tools/build_live.sh b/tools/build_live.sh index 9ab2b46..dce0430 100755 --- a/tools/build_live.sh +++ b/tools/build_live.sh @@ -1,41 +1,26 @@ -#!/bin/sh +#!/bin/bash +# Run this script from the draklive-config directory: +# ./tools/build_live.sh -set=$(date -u +%Y%m%d%H%M) +declare -A desktops -logdir=~/draklive-logs -mkdir -p $logdir -exec &>$logdir/draklive-$set.log +release=6-rc -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="PLASMA5 GNOME" -#desktops="PLASMA5" -#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/ -steps="--clean --all" -#steps="--boot --loop --master" +desktops[i586]="Xfce" -draklive_cmd="sudo draklive --config-root $draklive_config" -#draklive_cmd="sudo -u draklive sudo perl -I./draklive/lib ./draklive/draklive --config-root $draklive_config" +desktops[x86_64]="GNOME Plasma Xfce" -start=$(date) +pushd files/mga_rpms +./update_media.sh +popd 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[$arch]}; 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/trial-builds/Mageia-${release}-LiveDVD-${desktop}-${arch}-DVD + sudo -u bcd cp /home/draklive/var-data/build/Mageia-${release}-LiveDVD-${desktop}-${arch}-DVD/dist/* /home/bcd/public_html/isos/trial-builds/Mageia-${release}-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) -- cgit v1.2.1