From e21726fd47adaf461a9434acf8422a865f53f78b Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 26 Jun 2016 10:44:56 -0400 Subject: Move source code one level down in tree to get names in source package right. --- .gitmodules | 12 ++++++------ Makefile | 4 ++-- source/Makefile | 17 +++++++++++++++++ source/debian/compat | 1 + source/debian/control | 14 ++++++++++++++ source/debian/copyright | 27 +++++++++++++++++++++++++++ source/debian/rules | 4 ++++ source/debian/source/format | 1 + source/sw/libhal | 1 + source/sw/pkcs11 | 1 + source/sw/thirdparty/libtfm | 1 + sw/Makefile | 17 ----------------- sw/debian/compat | 1 - sw/debian/control | 14 -------------- sw/debian/copyright | 27 --------------------------- sw/debian/rules | 4 ---- sw/debian/source/format | 1 - sw/libhal | 1 - sw/pkcs11 | 1 - sw/thirdparty/libtfm | 1 - 20 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 source/Makefile create mode 100644 source/debian/compat create mode 100644 source/debian/control create mode 100644 source/debian/copyright create mode 100755 source/debian/rules create mode 100644 source/debian/source/format create mode 160000 source/sw/libhal create mode 160000 source/sw/pkcs11 create mode 160000 source/sw/thirdparty/libtfm delete mode 100644 sw/Makefile delete mode 100644 sw/debian/compat delete mode 100644 sw/debian/control delete mode 100644 sw/debian/copyright delete mode 100755 sw/debian/rules delete mode 100644 sw/debian/source/format delete mode 160000 sw/libhal delete mode 160000 sw/pkcs11 delete mode 160000 sw/thirdparty/libtfm 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 diff --git a/Makefile b/Makefile index 1fc76a8..787fea4 100644 --- a/Makefile +++ b/Makefile @@ -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/source/Makefile b/source/Makefile new file mode 100644 index 0000000..7b44136 --- /dev/null +++ b/source/Makefile @@ -0,0 +1,17 @@ +# Makefile to build Debian package for Cryptech Alpha board software + +all: + 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 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/source/debian/compat b/source/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/source/debian/compat @@ -0,0 +1 @@ +9 diff --git a/source/debian/control b/source/debian/control new file mode 100644 index 0000000..8ae25b9 --- /dev/null +++ b/source/debian/control @@ -0,0 +1,14 @@ +Source: cryptech-alpha +Maintainer: APT Builder Robot +Section: misc +Priority: optional +Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9), libsqlite3-0, libsqlite3-dev, python (>= 2.7), python-yaml +Homepage: http://trac.cryptech.is/wiki + +Package: cryptech-alpha +Architecture: any +Depends: libc6 (>= 2.13), ${misc:Depends}, libsqlite3-0 +Description: Cryptech open-source crypto software + "cryptech-alpha" contains software for use with the Cryptech Project + "Alpha" development board. diff --git a/source/debian/copyright b/source/debian/copyright new file mode 100644 index 0000000..ec25460 --- /dev/null +++ b/source/debian/copyright @@ -0,0 +1,27 @@ +Copyright (c) 2015-2016, NORDUnet A/S All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: +- Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +- Neither the name of the NORDUnet nor the names of its contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/source/debian/rules b/source/debian/rules new file mode 100755 index 0000000..2d33f6a --- /dev/null +++ b/source/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ diff --git a/source/debian/source/format b/source/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/source/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/source/sw/libhal b/source/sw/libhal new file mode 160000 index 0000000..709a71c --- /dev/null +++ b/source/sw/libhal @@ -0,0 +1 @@ +Subproject commit 709a71c0030225ba08cddf5227a1c67c2dbb4176 diff --git a/source/sw/pkcs11 b/source/sw/pkcs11 new file mode 160000 index 0000000..6c7ea99 --- /dev/null +++ b/source/sw/pkcs11 @@ -0,0 +1 @@ +Subproject commit 6c7ea9977c45116cc51aba7a4486059926d01113 diff --git a/source/sw/thirdparty/libtfm b/source/sw/thirdparty/libtfm new file mode 160000 index 0000000..269fc4e --- /dev/null +++ b/source/sw/thirdparty/libtfm @@ -0,0 +1 @@ +Subproject commit 269fc4e58f616a2cf1c318f494ec18a52991da8c diff --git a/sw/Makefile b/sw/Makefile deleted file mode 100644 index 9fd3c72..0000000 --- a/sw/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Makefile to build Debian package for Cryptech Alpha board software - -all: - cd thirdparty/libtfm; ${MAKE} - cd libhal; ${MAKE} daemon - cd 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 - 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/sw/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/sw/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/sw/debian/control b/sw/debian/control deleted file mode 100644 index 8ae25b9..0000000 --- a/sw/debian/control +++ /dev/null @@ -1,14 +0,0 @@ -Source: cryptech-alpha -Maintainer: APT Builder Robot -Section: misc -Priority: optional -Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9), libsqlite3-0, libsqlite3-dev, python (>= 2.7), python-yaml -Homepage: http://trac.cryptech.is/wiki - -Package: cryptech-alpha -Architecture: any -Depends: libc6 (>= 2.13), ${misc:Depends}, libsqlite3-0 -Description: Cryptech open-source crypto software - "cryptech-alpha" contains software for use with the Cryptech Project - "Alpha" development board. diff --git a/sw/debian/copyright b/sw/debian/copyright deleted file mode 100644 index ec25460..0000000 --- a/sw/debian/copyright +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2015-2016, NORDUnet A/S All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: -- Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -- Neither the name of the NORDUnet nor the names of its contributors may - be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED -TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/sw/debian/rules b/sw/debian/rules deleted file mode 100755 index 2d33f6a..0000000 --- a/sw/debian/rules +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ diff --git a/sw/debian/source/format b/sw/debian/source/format deleted file mode 100644 index 89ae9db..0000000 --- a/sw/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) diff --git a/sw/libhal b/sw/libhal deleted file mode 160000 index 2cd3b6f..0000000 --- a/sw/libhal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2cd3b6fabe5e32f169257caf5532b2bf9c83f803 diff --git a/sw/pkcs11 b/sw/pkcs11 deleted file mode 160000 index 6c7ea99..0000000 --- a/sw/pkcs11 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6c7ea9977c45116cc51aba7a4486059926d01113 diff --git a/sw/thirdparty/libtfm b/sw/thirdparty/libtfm deleted file mode 160000 index 269fc4e..0000000 --- a/sw/thirdparty/libtfm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 269fc4e58f616a2cf1c318f494ec18a52991da8c -- cgit v1.2.3