From 02d987a6aa15284e4f79cc6296abcd67aa65879c Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Thu, 7 Dec 2017 07:28:19 +0100 Subject: Generate logs, switch to debuild --- backport | 3 ++- build | 3 ++- move_debs | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/backport b/backport index 87c3fcc..4898e4e 100755 --- a/backport +++ b/backport @@ -99,7 +99,7 @@ cranversion=$upstreamversion"~"$DIST"cran.$iteration" # necessary new_dsc=$rcrandir/$DIST-cran34/${pkg}_${cranversion}.dsc -#new_dsc=dummy_value # set temporarily to force rebuilds for the r-api-3.4 transition +logfile=$rcrandir/$DIST-cran34/${pkg}_${cranversion}_${ARCH}.build if [ -e $new_dsc ]; then @@ -137,6 +137,7 @@ else fi sudo -E pdebuild --debbuildopts '-sa' \ --buildresult $rcrandir/$DIST-cran34/ \ + --logfile $logfile \ -- --override-config \ --distribution $DIST --basetgz /var/cache/pbuilder/$DIST-$ARCH-base.tgz \ --aptcache /var/cache/pbuilder/$DIST-$ARCH/aptcache \ diff --git a/build b/build index 222d9ed..62ba7a1 100755 --- a/build +++ b/build @@ -65,6 +65,7 @@ if [ $DIST == "stretch" ]; then apt --only-source source $pkg fi + # Move sources to $DIST directory to enable parallel builds mkdir -p $DIST mv $pkg\_* $DIST @@ -72,7 +73,7 @@ mv $pkg-* $DIST cd $DIST/$pkg-* -dpkg-buildpackage -B +debuild --no-lintian -ui -uc -us -B cd ../.. diff --git a/move_debs b/move_debs index bf479b6..a1d468c 100755 --- a/move_debs +++ b/move_debs @@ -14,5 +14,5 @@ DIST=$1 # Validate distribution argument if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi -sudo chown jranke $DIST/*${DIST}cran*_amd64.deb -mv -v $DIST/*${DIST}cran*_amd64.deb /home/jranke/svn/website/www/ranke/r-cran/$DIST-cran34 +sudo chown jranke $DIST/*${DIST}cran*_amd64.{deb,build} +mv -v $DIST/*${DIST}cran*_amd64.{deb,build} /home/jranke/svn/website/www/ranke/r-cran/$DIST-cran34 -- cgit v1.2.1