diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | scripts/build-debian-control-files.py | 7 | ||||
| -rw-r--r-- | source/Makefile | 4 | ||||
| -rwxr-xr-x | source/debian/rules | 2 |
4 files changed, 13 insertions, 3 deletions
diff --git a/.gitmodules b/.gitmodules index cce38ea..ed365da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,12 +43,15 @@ [submodule "source/sw/libhal"] path = source/sw/libhal url = https://git.cryptech.is/sw/libhal.git + branch = python3 [submodule "source/sw/pkcs11"] path = source/sw/pkcs11 url = https://git.cryptech.is/sw/pkcs11.git + branch = python3 [submodule "source/sw/stm32"] path = source/sw/stm32 url = https://git.cryptech.is/sw/stm32.git + branch = python3 [submodule "source/sw/thirdparty/libtfm"] path = source/sw/thirdparty/libtfm url = https://git.cryptech.is/sw/thirdparty/libtfm.git diff --git a/scripts/build-debian-control-files.py b/scripts/build-debian-control-files.py index 9817248..c06055d 100755 --- a/scripts/build-debian-control-files.py +++ b/scripts/build-debian-control-files.py @@ -26,7 +26,8 @@ Standards-Version: 3.9.6 Build-Depends: debhelper (>= 9), dh-python, python (>= 2.7), - python-yaml + python-yaml, + python3 Homepage: http://trac.cryptech.is/wiki Package: {args.package} @@ -35,6 +36,10 @@ Depends: python, python-serial (>= 3.0), python-tornado (>= 4.0), python-crypto, + python3, + python3-serial (>= 3.0), + python3-tornado (>= 4.0), + python3-crypto, ${{misc:Depends}}, ${{python:Depends}}, ${{shlibs:Depends}} diff --git a/source/Makefile b/source/Makefile index 5095766..5913f47 100644 --- a/source/Makefile +++ b/source/Makefile @@ -22,4 +22,6 @@ 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 - python setup.py install --install-layout=deb --root=${DESTDIR} + 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 a0c3a65..0a37e86 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 + dh $@ --with python2,python3 # Distinct binary package versions for a single source package built # on multiple releases, to keep reprepro happy. See: |