summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2017-12-07 07:28:19 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2017-12-07 07:28:19 +0100
commit02d987a6aa15284e4f79cc6296abcd67aa65879c (patch)
tree8bb7a3d3d5e078878f21f037703ddb664c376339
parent0a36a831a9c673804a2f71c0b028b4a1fc5b68e9 (diff)
Generate logs, switch to debuild
-rwxr-xr-xbackport3
-rwxr-xr-xbuild3
-rwxr-xr-xmove_debs4
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

Contact - Imprint