diff options
| -rwxr-xr-x | backport | 7 | ||||
| -rwxr-xr-x | backport_others | 10 | ||||
| -rwxr-xr-x | build | 13 | ||||
| -rwxr-xr-x | build_others | 9 |
4 files changed, 24 insertions, 15 deletions
@@ -6,7 +6,6 @@ ARCH=i386 export ARCH # R version against which the software is compiled -Rversion=3.4.1 iteration=0 # Where the buildresults should be stored and where to look for current backports @@ -62,9 +61,6 @@ DIST=$2 if [ $DIST != "stretch" ] && [ $DIST != "jessie" ] && [ $DIST != "wheezy" ]; then usage; exit 1; fi export DIST -# Set required r-base-dev version for packages build-depending on R -rbasedev="r-base-dev (>= $Rversion)" - # Remove previously extracted sources if [ -d $pkg-* ] then @@ -98,7 +94,8 @@ cranversion=$upstreamversion"~"$DIST"cran.$iteration" # would make an update of the archive index inside the loop in backport_others # necessary -new_dsc=$rcrandir/$DIST-cran34/${pkg}_${cranversion}.dsc +#new_dsc=$rcrandir/$DIST-cran34/${pkg}_${cranversion}.dsc +new_dsc=dummy_value # set temporarily to force rebuilds for the r-api-3.4 transition if [ -e $new_dsc ]; then diff --git a/backport_others b/backport_others index 0cae945..725cf72 100755 --- a/backport_others +++ b/backport_others @@ -54,11 +54,15 @@ fi if [ $DIST != "stretch" ] && [ $DIST != "jessie" ]; then usage; exit 1; fi export DIST -# When doing a new repository, lattice, r-cran-mass and survival have to be -# built first, then nlme and rmatrix, then the rest +# When doing a new repository, do lattice, r-cran-mass, rmatrix, +# then survival and nlme, then the rest # Packages to backport: -for i in lattice nlme rmatrix mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet r-cran-mass rodbc rpart survival littler rpy rpy2 rkward r-cran-rjags; do +#for i in lattice r-cran-mass; do +#for i in rmatrix nlme; do +#for i in survival; do +#for i in rpart mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet rodbc littler rpy rpy2 rkward r-cran-rjags; do +for i in lattice nlme rmatrix mgcv boot cluster codetools foreign kernsmooth r-cran-class r-cran-coda r-cran-spatial r-cran-nnet r-cran-mass rodbc rpart survival littler rpy rpy2 rkward r-cran-rjags dh-r; do ./backport -s $i $DIST @@ -53,8 +53,17 @@ then apt-get update apt-get upgrade fi -apt --only-source build-dep $pkg -apt --only-source source $pkg + +# stretch needs --only-source (at least for rkward source packages), jessie +# does not know this argument +if [ $DIST == "jessie" ]; then + apt-get build-dep $pkg + apt-get source $pkg +fi +if [ $DIST == "stretch" ]; then + apt --only-source build-dep $pkg + apt --only-source source $pkg +fi # Move sources to $DIST directory to enable parallel builds mkdir -p $DIST diff --git a/build_others b/build_others index ea48dfc..6ba911d 100755 --- a/build_others +++ b/build_others @@ -35,12 +35,11 @@ then apt-get upgrade fi -# When doing a new repository, lattice, r-cran-mass and survival have to be -# built first, then nlme and rmatrix, then the rest - # wheezy/jessie/stretch -#for i in lattice r-cran-mass survival; do -#for i in nlme rmatrix; do +#for i in lattice r-cran-mass; do +#for i in rmatrix nlme; do +#for i in survival; do +#for i in cluster foreign r-cran-class r-cran-spatial r-cran-nnet kernsmooth mgcv rodbc rpart littler rpy rpy2 rkward r-cran-rjags; do for i in lattice rmatrix nlme cluster foreign r-cran-class r-cran-spatial r-cran-nnet r-cran-mass kernsmooth mgcv rodbc rpart survival littler rpy rpy2 rkward r-cran-rjags; do ./build -s $i done |