aboutsummaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2020-07-12 18:25:56 -0400
committerRob Austein <sra@hactrn.net>2020-07-12 18:25:56 -0400
commit9e6b0d1117e21f2e6d092e337c5c522726016467 (patch)
treecc4eb37125fc6f1c3a173d5e17a0ec14ab58555f /source
parent37329250395aa3ac724fca99bbd2de01efea10e1 (diff)
Attempt to go Python3-only
Ubuntu 20.04 no longer really supports Python 2, so we'd have to fork the packaging code if we wanted to keep support for Python 2 elsewhere. Given that Python 3 has been around for a more than a decade and that Python 2 was formally EOLed more than six months ago as of this writing, this seems like an unnecessary complication. The biggest change is rewriting the Homebrew formula for Python 3.
Diffstat (limited to 'source')
-rw-r--r--source/Makefile1
-rwxr-xr-xsource/debian/rules2
2 files changed, 1 insertions, 2 deletions
diff --git a/source/Makefile b/source/Makefile
index 5913f47..0e1f613 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -22,6 +22,5 @@ install: all
install -D -m 644 cryptech-alpha-firmware.tar.gz ${DESTDIR}/usr/share/cryptech-alpha-firmware.tar.gz
install -D -m 644 sw/pkcs11/libcryptech-pkcs11.so ${DESTDIR}/usr/lib/libcryptech-pkcs11.so
ln -s libcryptech-pkcs11.so ${DESTDIR}/usr/lib/libcryptech-pkcs11.so.0
- python2 setup.py install --install-layout=deb --root=${DESTDIR}
python3 setup.py install --install-layout=deb --root=${DESTDIR}
find ${DESTDIR} -type d -name __pycache__ -exec rm -rf {} +
diff --git a/source/debian/rules b/source/debian/rules
index 0a37e86..607ba42 100755
--- a/source/debian/rules
+++ b/source/debian/rules
@@ -19,7 +19,7 @@ include /usr/share/dpkg/default.mk
include /usr/share/dpkg/pkg-info.mk
%:
- dh $@ --with python2,python3
+ dh $@ --with python3
# Distinct binary package versions for a single source package built
# on multiple releases, to keep reprepro happy. See: