diff options
| author | Rob Austein <sra@hactrn.net> | 2016-06-26 10:44:56 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-06-26 10:44:56 -0400 |
| commit | e21726fd47adaf461a9434acf8422a865f53f78b (patch) | |
| tree | 18a6d4a02933671ebd3fdbc604c91633d68c5e3d | |
| parent | dfbff65fedfa40311a29302b90935835307d7842 (diff) | |
Move source code one level down in tree to get names in source package right.
| -rw-r--r-- | .gitmodules | 12 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | source/Makefile (renamed from sw/Makefile) | 12 | ||||
| -rw-r--r-- | source/debian/compat (renamed from sw/debian/compat) | 0 | ||||
| -rw-r--r-- | source/debian/control (renamed from sw/debian/control) | 0 | ||||
| -rw-r--r-- | source/debian/copyright (renamed from sw/debian/copyright) | 0 | ||||
| -rwxr-xr-x | source/debian/rules (renamed from sw/debian/rules) | 0 | ||||
| -rw-r--r-- | source/debian/source/format (renamed from sw/debian/source/format) | 0 | ||||
| m--------- | source/sw/libhal | 0 | ||||
| m--------- | source/sw/pkcs11 (renamed from sw/pkcs11) | 0 | ||||
| m--------- | source/sw/thirdparty/libtfm (renamed from sw/thirdparty/libtfm) | 0 | ||||
| m--------- | sw/libhal | 0 |
12 files changed, 14 insertions, 14 deletions
diff --git a/.gitmodules b/.gitmodules index f24e2a2..a464eb3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "sw/libhal"] - path = sw/libhal +[submodule "source/sw/libhal"] + path = source/sw/libhal url = https://git.cryptech.is/sw/libhal.git -[submodule "sw/pkcs11"] - path = sw/pkcs11 +[submodule "source/sw/pkcs11"] + path = source/sw/pkcs11 url = https://git.cryptech.is/sw/pkcs11.git -[submodule "sw/thirdparty/libtfm"] - path = sw/thirdparty/libtfm +[submodule "source/sw/thirdparty/libtfm"] + path = source/sw/thirdparty/libtfm url = https://git.cryptech.is/sw/thirdparty/libtfm.git @@ -42,8 +42,8 @@ sandblast: clean git submodule deinit -f . source: - cd sw; ${DCH} - cd sw; debuild -S -uc -us + cd source; ${DCH} + cd source; debuild -S -uc -us pbuilder: rm -f ${PBUILDER_BASE}/*result/* diff --git a/sw/Makefile b/source/Makefile index 9fd3c72..7b44136 100644 --- a/sw/Makefile +++ b/source/Makefile @@ -1,17 +1,17 @@ # Makefile to build Debian package for Cryptech Alpha board software all: - cd thirdparty/libtfm; ${MAKE} - cd libhal; ${MAKE} daemon - cd pkcs11; ${MAKE} + cd sw/thirdparty/libtfm; ${MAKE} + cd sw/libhal; ${MAKE} daemon + cd sw/pkcs11; ${MAKE} clean distclean: for d in thirdparty/libtfm libhal pkcs11; do (cd $$d && ${MAKE} $@); done install: all - install -m 644 -D pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so - install -D pkcs11/p11util ${DESTDIR}/usr/sbin/p11util - install -D libhal/cryptech_rpcd ${DESTDIR}/usr/sbin/cryptech_rpcd + install -m 644 -D sw/pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so + install -D sw/pkcs11/p11util ${DESTDIR}/usr/sbin/p11util + install -D sw/libhal/cryptech_rpcd ${DESTDIR}/usr/sbin/cryptech_rpcd ln -s libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so.0 # Might also want to install the firmware tarball, scripts to use it, .... diff --git a/sw/debian/compat b/source/debian/compat index ec63514..ec63514 100644 --- a/sw/debian/compat +++ b/source/debian/compat diff --git a/sw/debian/control b/source/debian/control index 8ae25b9..8ae25b9 100644 --- a/sw/debian/control +++ b/source/debian/control diff --git a/sw/debian/copyright b/source/debian/copyright index ec25460..ec25460 100644 --- a/sw/debian/copyright +++ b/source/debian/copyright diff --git a/sw/debian/rules b/source/debian/rules index 2d33f6a..2d33f6a 100755 --- a/sw/debian/rules +++ b/source/debian/rules diff --git a/sw/debian/source/format b/source/debian/source/format index 89ae9db..89ae9db 100644 --- a/sw/debian/source/format +++ b/source/debian/source/format diff --git a/source/sw/libhal b/source/sw/libhal new file mode 160000 +Subproject 709a71c0030225ba08cddf5227a1c67c2dbb417 diff --git a/sw/pkcs11 b/source/sw/pkcs11 -Subproject 6c7ea9977c45116cc51aba7a4486059926d0111 +Subproject 6c7ea9977c45116cc51aba7a4486059926d0111 diff --git a/sw/thirdparty/libtfm b/source/sw/thirdparty/libtfm -Subproject 269fc4e58f616a2cf1c318f494ec18a52991da8 +Subproject 269fc4e58f616a2cf1c318f494ec18a52991da8 diff --git a/sw/libhal b/sw/libhal deleted file mode 160000 -Subproject 2cd3b6fabe5e32f169257caf5532b2bf9c83f80 |