From cc30a7ed3c710c6082df2f2079e3012b17161352 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 6 Apr 2014 23:55:37 +0000 Subject: Start whacking Makefiles svn path=/branches/tk685/; revision=5758 --- buildtools/make-version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/make-version.py b/buildtools/make-version.py index af513b5d..a73a89ab 100644 --- a/buildtools/make-version.py +++ b/buildtools/make-version.py @@ -63,7 +63,7 @@ if v == unknown: sys.stderr.write("Warning: Could not determine software version\n") if old is None or v != old: + with open("rpki/version.py", "w") as f: + f.write("VERSION = \"%s\"\n" % v) with open("VERSION", "w") as f: f.write(v + "\n") - with open("rpkid/rpki/version.py", "w") as f: - f.write("VERSION = \"%s\"\n" % v) -- cgit v1.2.3 From 3059776adf7c0ab739cab4ab6efc591c1ef140d0 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 9 Apr 2014 03:56:01 +0000 Subject: First pass at updated debuild configuration. svn path=/branches/tk685/; revision=5772 --- buildtools/debian-skeleton/rpki-ca.install | 4 ++-- buildtools/debian-skeleton/rpki-rp.install | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'buildtools') diff --git a/buildtools/debian-skeleton/rpki-ca.install b/buildtools/debian-skeleton/rpki-ca.install index fe3e4fed..ffae5103 100644 --- a/buildtools/debian-skeleton/rpki-ca.install +++ b/buildtools/debian-skeleton/rpki-ca.install @@ -1,4 +1,4 @@ etc/rpki/rpki-confgen.xml -usr/lib +usr/lib/rpki usr/sbin -usr/share +usr/share/rpki diff --git a/buildtools/debian-skeleton/rpki-rp.install b/buildtools/debian-skeleton/rpki-rp.install index 710f6ef2..ce17bb14 100644 --- a/buildtools/debian-skeleton/rpki-rp.install +++ b/buildtools/debian-skeleton/rpki-rp.install @@ -2,4 +2,5 @@ etc/rcynic.conf etc/rpki/trust-anchors etc/xinetd.d/rpki-rtr usr/bin +usr/lib/python2.7 var/rcynic -- cgit v1.2.3 From f9102a8cbbbbea27670e8ca628d90c6689441efd Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 9 Apr 2014 21:33:13 +0000 Subject: Clean up source regeneration (h/ and schemas/), debug builds with --disable-*-tools set. svn path=/branches/tk685/; revision=5775 --- buildtools/defstack.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'buildtools') diff --git a/buildtools/defstack.py b/buildtools/defstack.py index 4d93ce66..757516f3 100644 --- a/buildtools/defstack.py +++ b/buildtools/defstack.py @@ -22,6 +22,7 @@ # PERFORMANCE OF THIS SOFTWARE. import fileinput +import os.path import sys import re @@ -76,7 +77,9 @@ token = None for line in fileinput.input(): if token is None: - token = "".join(c if c.isalnum() else "_" for c in fileinput.filename().upper()) + path = fileinput.filename().split(os.path.sep) + path = os.path.join(path[-2], path[-1]) if len(path) > 1 else path[-1] + token = "".join(c if c.isalnum() else "_" for c in path.upper()) sys.stdout.write(header.replace("%", token)) if "DECLARE_STACK_OF" in line: -- cgit v1.2.3 From dead817a839ed49f154d02b1b7c5fac5e322e016 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 10 Apr 2014 00:46:11 +0000 Subject: Kludge to avoid conflict from duplicate .egg-info files. svn path=/branches/tk685/; revision=5776 --- buildtools/freebsd-skeleton/rpki-ca/Makefile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'buildtools') diff --git a/buildtools/freebsd-skeleton/rpki-ca/Makefile b/buildtools/freebsd-skeleton/rpki-ca/Makefile index 71f38436..cf095aa1 100644 --- a/buildtools/freebsd-skeleton/rpki-ca/Makefile +++ b/buildtools/freebsd-skeleton/rpki-ca/Makefile @@ -51,4 +51,18 @@ CONFIGURE_ARGS= --disable-target-installation --disable-runtime-dependencies --d pre-install: @test -d ${STAGEDIR}${PREFIX}/etc/rc.d || mkdir -p ${STAGEDIR}${PREFIX}/etc/rc.d +# Kludge to cope with setup.py insisting on including egg info every +# time it is called, which creates a problem for the way we use it. +# +# The real solution for this would be for the FreeBSD port system to +# grow up and let us build multiple binary packages from a single +# port, at which point this kludge will no longer be necessary (and +# this port will merge with rpki-rp). +# +# Until that glorious day, just whack the egg info, which should be a +# duplicate of the one that rpki-rp installs. + +post-install: + find ${STAGEDIR} -name '*.egg-info' -delete + .include -- cgit v1.2.3 From 0816490b4e202b3ff197c014cc0cd102f9bed9b2 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 10 Apr 2014 17:26:56 +0000 Subject: Tell Debian package system that we moved files from rpki-ca to rpki-rp. svn path=/branches/tk685/; revision=5779 --- buildtools/debian-skeleton/control | 1 + 1 file changed, 1 insertion(+) (limited to 'buildtools') diff --git a/buildtools/debian-skeleton/control b/buildtools/debian-skeleton/control index 0d9272b1..a91c21ca 100644 --- a/buildtools/debian-skeleton/control +++ b/buildtools/debian-skeleton/control @@ -15,6 +15,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, python (>= 2.7), rrdtool, rsync, xi Description: rpki.net relying party tools "Relying party" validation tools from the rpki.net toolkit. See the online documentation at http://rpki.net/. +Replaces: rpki-ca (<= 0.5767) Package: rpki-ca Architecture: any -- cgit v1.2.3