aboutsummaryrefslogtreecommitdiff
path: root/rpki-pbuilder.sh
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2016-07-28 18:33:36 +0000
committerRob Austein <sra@hactrn.net>2016-07-28 18:33:36 +0000
commitea2b3a78cc70b97a83d5ba3b8dcee6c4c12ace72 (patch)
treea1c0e8a7d2bf5e51738546540134186302e94e6d /rpki-pbuilder.sh
parente10fe610caf2ea0d6efe444c1f3aa0bdfc690778 (diff)
Debug git builds.
Diffstat (limited to 'rpki-pbuilder.sh')
-rwxr-xr-xrpki-pbuilder.sh49
1 files changed, 2 insertions, 47 deletions
diff --git a/rpki-pbuilder.sh b/rpki-pbuilder.sh
index 0364715..106db4b 100755
--- a/rpki-pbuilder.sh
+++ b/rpki-pbuilder.sh
@@ -1,16 +1,5 @@
#!/bin/sh -
-# New top-level script, now that we need to run rpki-pbuilder.py multiple times with different arguments.
-# May eventually want to consolidate all of this back into rpki-pbuilder.py, but not today.
-
-# At the moment, coverage with the new code is a bit scattershot. It works with trusty, with backports
-# from xenial; it works for stretch, and it works for jessie with a lot of backports from stretch.
-# Backports for wheezy are probably more trouble than they're worth, and there seems little point
-# in putting effort into the non-LTS Ubuntu releases.
-#
-# In practice, the old code no longer builds for precise, which is an LTS that's still under support.
-# Don't yet know why.
-
/usr/sbin/logrotate -s $HOME/logrotate.state $HOME/logrotate.conf
exec >> $HOME/builder.log 2>&1
@@ -20,41 +9,7 @@ set -x
cd $HOME
python rpki-pbuilder.py \
- --svn-tree $HOME/source.ng/tk705/ \
- --apt-tree $HOME/repository.ng/ \
- --url-path /APTng \
- --backports python-django python-tornado \
- --releases ubuntu/trusty
-
-python rpki-pbuilder.py \
- --svn-tree $HOME/source.ng/tk705/ \
- --apt-tree $HOME/repository.ng/ \
- --url-path /APTng \
- --releases ubuntu/xenial
-
-python rpki-pbuilder.py \
- --svn-tree $HOME/source.ng/tk705/ \
+ --git-tree $HOME/source.ng/master/ \
--apt-tree $HOME/repository.ng/ \
--url-path /APTng \
- --releases debian/jessie
-
-python rpki-pbuilder.py \
- --svn-tree $HOME/source.tos/trunk/ \
- --apt-tree $HOME/repository.tos/ \
- --url-path /APT \
- --backports python-django-south \
- --releases ubuntu/trusty
-
-python rpki-pbuilder.py \
- --svn-tree $HOME/source.tos/trunk/ \
- --apt-tree $HOME/repository.tos/ \
- --url-path /APT \
- --backports python-django python-django-south \
- --releases debian/wheezy
-
-python rpki-pbuilder.py \
- --svn-tree $HOME/source.tos/trunk/ \
- --apt-tree $HOME/repository.tos/ \
- --url-path /APT \
- --backports python-django python-django-south \
- --releases ubuntu/precise
+ --releases debian/jessie ubuntu/xenial