From b48fc78d6d067d8ece912ef2c7558d2e44f361de Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Wed, 25 Mar 2020 22:41:04 +0000 Subject: Update to currently used scripts --- rebuild.sh | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) (limited to 'rebuild.sh') diff --git a/rebuild.sh b/rebuild.sh index df98c54..bdc64b3 100755 --- a/rebuild.sh +++ b/rebuild.sh @@ -1,21 +1,33 @@ -# Sample script to rebuild the distribution - -# mount -t tmpfs none /home/pterjan/build/ -o size=100G,nr_inodes=32M -stat -f -c %T /home/pterjan/build | grep -q tmpfs || exit 1 - IURT="perl -I/home/pterjan/git/iurt/lib /home/pterjan/git/iurt/iurt" -# Rebuild chroot tarball -$IURT --repository /distrib --discard-packages --chrooted-urpmi http://127.0.0.1/ -r cauldron x86_64 /distrib/cauldron/SRPMS/core/release/iurt-*.src.rpm +if [ -f /distrib/logs/IN-PROGRESS ]; then + date=`cat /distrib/logs/IN-PROGRESS`; + logger -s "Resuming ${date}" +else + date=$1 + [ -z "$date" ] && date=$(date +%Y-%m-%d) + logger -s "Starting new build ${date}" + echo $date > /distrib/logs/IN-PROGRESS +fi + +# Rebuild chroot tarball, needed on resume too as we lose it when rebooting +$IURT --repository /distrib --discard-packages --chrooted-urpmi /distrib -r cauldron x86_64 /distrib/cauldron/SRPMS/core/release/iurt-*.src.rpm || exit 1 -dir="$HOME/build/$(date +%Y-%m-%d)" -[ -d $dir ] && exit 2 +dir="/distrib/logs/$date" mkdir -p "$dir/log" cat /distrib/cauldron/*/VERSION | sort > "$dir/log/VERSION" if [ "$IURT_NUM_SHARDS" != "" -a "$IURT_SHARD_ID" != "" ]; then - shardopts="--num_shards $IURT_NUM_SHARDS --shard_id $IURT_SHARD_ID" + shardopts="--num_shards $IURT_NUM_SHARDS --shard_id $IURT_SHARD_ID" fi -nproc=$(/usr/bin/getconf _NPROCESSORS_ONLN) -$IURT --discard-packages --config local_spool "$dir" --repository /distrib --chrooted-urpmi http://127.0.0.1/ --parallel 10 --rpmmacros '%_smp_mflags %(echo %name | grep -q -v "^(auto-multiple-choice|boost|chromium-browser-beta|davfs2|dbus-java|ddclient|dhcp|dmraid|docbook-dtd31-sgml|dosemu|dsniff|eclipse-eclox|eclipse-texlipse|evolution-kolab|fdesktoprecorder|ghostpcl|gmic|inn|kmozillahelper|kscd|kscreen|lincity-ng|lv2|mdadm|modello|monkeystudio|most|motion|munin|mysql-workbench|mythtv|nabi|opencascade|opencpn|openjade|ORBit2|pam|pcb|plotutils|polkit|python-cairo|python-dtopt|python-qwt|qbittorrent|qeven|qterminal|qtiplot|qtwebkit|qupzilla|resolvconf|rosegarden|rt-tests|scidavis|scidvspc|scite|screenfetch|semantik|slrn|spamassassin|spring|springlobby|stardict-quick-eng-fra|sugar-base|syslog-ng|tcptraceroute|thunderbird|tor|util-vserver|waf|wine-gecko|wine-mono|xaos|xmms2|yaflight|evolution-kolab|spring|qtwebkit5|mysql-workbench|xdvik|libvirt-glib)$" && echo -n "-j4 " || echo "-l'$nproc' -j'$nproc'")' '%_install_langs en_GB:en_US:fr:fr_FR' --distro cauldron -a x86_64 --build-all $shardopts -m core > "$dir/iurt.log" 2>&1 +$IURT --discard-packages --config local_spool "$dir" --repository /distrib --chrooted-urpmi /distrib --parallel 8 --rpmmacros '%_smp_mflags -j8' --distro cauldron -a aarch64 --build-all --fixed_media --resume $shardopts -m core >> "$dir/iurt.log" 2>&1 + +# Retry failures once, in case it's transient +#sed -i '/failure$/d' "$dir/log/status.core.log" +#$IURT --discard-packages --config local_spool "$dir" --repository /distrib --chrooted-urpmi http://127.0.0.1/ --parallel 8 --rpmmacros '%_smp_mflags -j16' --distro cauldron -a x86_64 --build-all --resume -m core >> "$dir/iurt.log" 2>&1 + +mv -f /distrib/logs/{IN-PROGRESS,LAST} + +#sleep 900 +#sudo shutdown -h -- cgit v1.2.1