From 2dbbd0502e3980bb76debabb8bf674f86d101122 Mon Sep 17 00:00:00 2001 From: James Turner Date: Wed, 22 Oct 2014 15:13:00 +0100 Subject: [PATCH] Revert "Linux-release: use local base-package" This reverts commit 0f1dbad70da65cf70983c87bfa51ed007bab5847, now fgdata is fixed. --- hudson_build_release.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/hudson_build_release.sh b/hudson_build_release.sh index 3068822..e689e17 100755 --- a/hudson_build_release.sh +++ b/hudson_build_release.sh @@ -55,3 +55,20 @@ make install make package_source cp flightgear-*.tar.bz2 ../output/. +##################################################################################### + +echo "Assembling base package" +cd $WORKSPACE + +echo "Syncing base packages files from sphere.telascience.org" + +# a: archive mode +# z: compress +# delete: 'delete extraneous files from dest dirs'; avoid bug 1344 +# filter: use the rules in our rules file +rsync -az --delete \ + --filter 'merge base-package.rules' \ + -e ssh jturner@sphere.telascience.org:/home/jturner/fgdata . + +tar cjf output/FlightGear-$VERSION-data.tar.bz2 fgdata/ +