From de6d17659a4308b2313e633b0bf5f62946bbd741 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sun, 5 Jul 2015 00:47:00 -0400 Subject: Rearrange tree to make filenames in source packages come out right. --- .gitmodules | 72 +++++++++++++++++++------------------- Makefile | 7 ++-- core/Makefile | 49 ++++++++++++++++++++++++++ core/cipher/aes | 1 + core/cipher/chacha | 1 + core/comm/eim | 1 + core/debian/compat | 1 + core/debian/control | 14 ++++++++ core/debian/copyright | 27 ++++++++++++++ core/debian/rules | 4 +++ core/debian/source/format | 1 + core/hash/sha1 | 1 + core/hash/sha256 | 1 + core/hash/sha512 | 1 + core/math/modexp | 1 + core/patches/01-config-cores.patch | 27 ++++++++++++++ core/platform/common | 1 + core/platform/novena | 1 + core/rng/avalanche_entropy | 1 + core/rng/rosc_entropy | 1 + core/rng/trng | 1 + rtl/Makefile | 49 -------------------------- rtl/core/cipher/aes | 1 - rtl/core/cipher/chacha | 1 - rtl/core/comm/eim | 1 - rtl/core/hash/sha1 | 1 - rtl/core/hash/sha256 | 1 - rtl/core/hash/sha512 | 1 - rtl/core/math/modexp | 1 - rtl/core/platform/common | 1 - rtl/core/platform/novena | 1 - rtl/core/rng/avalanche_entropy | 1 - rtl/core/rng/rosc_entropy | 1 - rtl/core/rng/trng | 1 - rtl/debian/compat | 1 - rtl/debian/control | 14 -------- rtl/debian/copyright | 27 -------------- rtl/debian/rules | 4 --- rtl/debian/source/format | 1 - rtl/patches/01-config-cores.patch | 27 -------------- sw/Makefile | 16 ++++----- sw/libhal | 1 + sw/libtfm | 1 + sw/pkcs11 | 1 + sw/sqlite3 | 1 + sw/sw/libhal | 1 - sw/sw/libtfm | 1 - sw/sw/pkcs11 | 1 - sw/sw/sqlite3 | 1 - 49 files changed, 186 insertions(+), 187 deletions(-) create mode 100644 core/Makefile create mode 160000 core/cipher/aes create mode 160000 core/cipher/chacha create mode 160000 core/comm/eim create mode 100644 core/debian/compat create mode 100644 core/debian/control create mode 100644 core/debian/copyright create mode 100755 core/debian/rules create mode 100644 core/debian/source/format create mode 160000 core/hash/sha1 create mode 160000 core/hash/sha256 create mode 160000 core/hash/sha512 create mode 160000 core/math/modexp create mode 100644 core/patches/01-config-cores.patch create mode 160000 core/platform/common create mode 160000 core/platform/novena create mode 160000 core/rng/avalanche_entropy create mode 160000 core/rng/rosc_entropy create mode 160000 core/rng/trng delete mode 100644 rtl/Makefile delete mode 160000 rtl/core/cipher/aes delete mode 160000 rtl/core/cipher/chacha delete mode 160000 rtl/core/comm/eim delete mode 160000 rtl/core/hash/sha1 delete mode 160000 rtl/core/hash/sha256 delete mode 160000 rtl/core/hash/sha512 delete mode 160000 rtl/core/math/modexp delete mode 160000 rtl/core/platform/common delete mode 160000 rtl/core/platform/novena delete mode 160000 rtl/core/rng/avalanche_entropy delete mode 160000 rtl/core/rng/rosc_entropy delete mode 160000 rtl/core/rng/trng delete mode 100644 rtl/debian/compat delete mode 100644 rtl/debian/control delete mode 100644 rtl/debian/copyright delete mode 100755 rtl/debian/rules delete mode 100644 rtl/debian/source/format delete mode 100644 rtl/patches/01-config-cores.patch create mode 160000 sw/libhal create mode 160000 sw/libtfm create mode 160000 sw/pkcs11 create mode 160000 sw/sqlite3 delete mode 160000 sw/sw/libhal delete mode 160000 sw/sw/libtfm delete mode 160000 sw/sw/pkcs11 delete mode 160000 sw/sw/sqlite3 diff --git a/.gitmodules b/.gitmodules index 8e21521..50e106a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,48 +1,48 @@ -[submodule "sw/sw/libhal"] - path = sw/sw/libhal - url = git@git.cryptech.is:user/sra/libhal -[submodule "sw/sw/libtfm"] - path = sw/sw/libtfm - url = git@git.cryptech.is:user/sra/libtfm -[submodule "sw/sw/pkcs11"] - path = sw/sw/pkcs11 - url = git@git.cryptech.is:user/sra/pkcs11 -[submodule "sw/sw/sqlite3"] - path = sw/sw/sqlite3 - url = git@git.cryptech.is:user/sra/sqlite3 -[submodule "rtl/core/cipher/aes"] - path = rtl/core/cipher/aes +[submodule "sw/libhal"] + path = sw/libhal + url = git@git.cryptech.is:user/sra/libhal.git +[submodule "sw/libtfm"] + path = sw/libtfm + url = git@git.cryptech.is:user/sra/libtfm.git +[submodule "sw/pkcs11"] + path = sw/pkcs11 + url = git@git.cryptech.is:user/sra/pkcs11.git +[submodule "sw/sqlite3"] + path = sw/sqlite3 + url = git@git.cryptech.is:user/sra/sqlite3.git +[submodule "core/cipher/aes"] + path = core/cipher/aes url = git@git.cryptech.is:core/cipher/aes.git -[submodule "rtl/core/cipher/chacha"] - path = rtl/core/cipher/chacha +[submodule "core/cipher/chacha"] + path = core/cipher/chacha url = git@git.cryptech.is:core/cipher/chacha.git -[submodule "rtl/core/comm/eim"] - path = rtl/core/comm/eim +[submodule "core/comm/eim"] + path = core/comm/eim url = git@git.cryptech.is:core/comm/eim.git -[submodule "rtl/core/hash/sha1"] - path = rtl/core/hash/sha1 +[submodule "core/hash/sha1"] + path = core/hash/sha1 url = git@git.cryptech.is:core/hash/sha1.git -[submodule "rtl/core/hash/sha256"] - path = rtl/core/hash/sha256 +[submodule "core/hash/sha256"] + path = core/hash/sha256 url = git@git.cryptech.is:core/hash/sha256.git -[submodule "rtl/core/hash/sha512"] - path = rtl/core/hash/sha512 +[submodule "core/hash/sha512"] + path = core/hash/sha512 url = git@git.cryptech.is:core/hash/sha512.git -[submodule "rtl/core/math/modexp"] - path = rtl/core/math/modexp +[submodule "core/math/modexp"] + path = core/math/modexp url = git@git.cryptech.is:core/math/modexp.git -[submodule "rtl/core/platform/common"] - path = rtl/core/platform/common +[submodule "core/platform/common"] + path = core/platform/common url = git@git.cryptech.is:core/platform/common.git -[submodule "rtl/core/platform/novena"] - path = rtl/core/platform/novena +[submodule "core/platform/novena"] + path = core/platform/novena url = git@git.cryptech.is:core/platform/novena.git -[submodule "rtl/core/rng/avalanche_entropy"] - path = rtl/core/rng/avalanche_entropy +[submodule "core/rng/avalanche_entropy"] + path = core/rng/avalanche_entropy url = git@git.cryptech.is:core/rng/avalanche_entropy.git -[submodule "rtl/core/rng/rosc_entropy"] - path = rtl/core/rng/rosc_entropy +[submodule "core/rng/rosc_entropy"] + path = core/rng/rosc_entropy url = git@git.cryptech.is:core/rng/rosc_entropy.git -[submodule "rtl/core/rng/trng"] - path = rtl/core/rng/trng +[submodule "core/rng/trng"] + path = core/rng/trng url = git@git.cryptech.is:core/rng/trng.git diff --git a/Makefile b/Makefile index cf9c4f0..3bb1b21 100644 --- a/Makefile +++ b/Makefile @@ -87,13 +87,12 @@ sw: cd sw; debuild -b -uc -us -aarmhf rtl: - cd rtl; $(call DCH,rtl,RTL bitstream) - cd rtl; debuild -S -uc -us - cd rtl; debuild -b -uc -us -aarmhf + cd core; $(call DCH,rtl,RTL bitstream) + cd core; debuild -S -uc -us + cd core; debuild -b -uc -us -aarmhf reprepro: ${REPOSITORY}/conf/distributions ${REPOSITORY}/conf/options for f in *.changes; do reprepro -b ${REPOSITORY} --ignore=wrongdistribution include ${CODENAME} $$f; done - for f in *.dsc; do reprepro -b ${REPOSITORY} --ignore=wrongdistribution includedsc ${CODENAME} $$f; done ${REPOSITORY}/conf/distributions ${REPOSITORY}/conf/options: install -D reprepro-conf/$(notdir $@) ${REPOSITORY}/conf/$(notdir $@) diff --git a/core/Makefile b/core/Makefile new file mode 100644 index 0000000..9dadbcd --- /dev/null +++ b/core/Makefile @@ -0,0 +1,49 @@ +# Makefile to build Debian package for Cryptech Novena PVT-1 FPGA +# bitstream. +# +# Author: Rob Austein +# Copyright (c) 2015, SUNET +# +# Redistribution and use in source and binary forms, with or +# without modification, are permitted provided that the following +# conditions are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# 2. 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. +# +# 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 OWNER 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. + +# Directory where we run Verilog synthesis + +BUILD_DIR := platform/novena/eim/build + +# This business of patching files that are under revision control +# because we can't be bothered to generate a proper configuration file +# is kind of nasty. + +all: + patch -p1 --forward +Section: misc +Priority: optional +Standards-Version: 3.9.6 +Build-Depends: debhelper (>= 9) +Homepage: http://trac.cryptech.is/wiki + +Package: cryptech-novena-rtl +Architecture: all +Depends: libc6 (>= 2.13), ${misc:Depends} +Description: Cryptech open-source crypto hardware + "cryptech-novena-rtl" contains FGPA configuration (RTL bitstream) for the Cryptech project on + the Novena PVT-1 development board. diff --git a/core/debian/copyright b/core/debian/copyright new file mode 100644 index 0000000..fd7518e --- /dev/null +++ b/core/debian/copyright @@ -0,0 +1,27 @@ +Copyright (c) 2015, 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/core/debian/rules b/core/debian/rules new file mode 100755 index 0000000..2d33f6a --- /dev/null +++ b/core/debian/rules @@ -0,0 +1,4 @@ +#!/usr/bin/make -f + +%: + dh $@ diff --git a/core/debian/source/format b/core/debian/source/format new file mode 100644 index 0000000..89ae9db --- /dev/null +++ b/core/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/core/hash/sha1 b/core/hash/sha1 new file mode 160000 index 0000000..febb275 --- /dev/null +++ b/core/hash/sha1 @@ -0,0 +1 @@ +Subproject commit febb27562431216a080cb980fdcda09454e72c38 diff --git a/core/hash/sha256 b/core/hash/sha256 new file mode 160000 index 0000000..ce56b11 --- /dev/null +++ b/core/hash/sha256 @@ -0,0 +1 @@ +Subproject commit ce56b11187b92572193fa9327841ad2ef2e792f8 diff --git a/core/hash/sha512 b/core/hash/sha512 new file mode 160000 index 0000000..51ad57c --- /dev/null +++ b/core/hash/sha512 @@ -0,0 +1 @@ +Subproject commit 51ad57c37bb4a0f59e4af4ee069ac18f8fb9284e diff --git a/core/math/modexp b/core/math/modexp new file mode 160000 index 0000000..e61c650 --- /dev/null +++ b/core/math/modexp @@ -0,0 +1 @@ +Subproject commit e61c65059054df407206e58b88a1b203f5ad3c3e diff --git a/core/patches/01-config-cores.patch b/core/patches/01-config-cores.patch new file mode 100644 index 0000000..245e8a3 --- /dev/null +++ b/core/patches/01-config-cores.patch @@ -0,0 +1,27 @@ +Description: configure core selectors for cryptech dnssec signer + +--- core/platform/common/core_selector/src/rtl/cipher_selector.v~ ++++ core/platform/common/core_selector/src/rtl/cipher_selector.v +@@ -67,7 +67,7 @@ module cipher_selector + //---------------------------------------------------------------- + // Comment following lines to exclude cores from implementation. + `define USE_CORE_AES +- `define USE_CORE_CHACHA ++// `define USE_CORE_CHACHA + + + //---------------------------------------------------------------- +--- core/platform/common/core_selector/src/rtl/hash_selector.v~ ++++ core/platform/common/core_selector/src/rtl/hash_selector.v +@@ -125,9 +125,9 @@ XXX move to `define in wrapper core?? + // List of Available Cores + //---------------------------------------------------------------- + // Comment following lines to exclude cores from implementation. +- `define USE_CORE_SHA1 ++// `define USE_CORE_SHA1 + `define USE_CORE_SHA256 +- `define USE_CORE_SHA512 ++// `define USE_CORE_SHA512 + + + //---------------------------------------------------------------- diff --git a/core/platform/common b/core/platform/common new file mode 160000 index 0000000..f05a3c6 --- /dev/null +++ b/core/platform/common @@ -0,0 +1 @@ +Subproject commit f05a3c65ec65004b097cb63d5ac6d463a7a9dc2f diff --git a/core/platform/novena b/core/platform/novena new file mode 160000 index 0000000..33cc55a --- /dev/null +++ b/core/platform/novena @@ -0,0 +1 @@ +Subproject commit 33cc55adaf9ff31473802414f9c0d6e4a553cddf diff --git a/core/rng/avalanche_entropy b/core/rng/avalanche_entropy new file mode 160000 index 0000000..4a0c596 --- /dev/null +++ b/core/rng/avalanche_entropy @@ -0,0 +1 @@ +Subproject commit 4a0c59617c582ef3f0e558067f913309db772f75 diff --git a/core/rng/rosc_entropy b/core/rng/rosc_entropy new file mode 160000 index 0000000..4c3b76c --- /dev/null +++ b/core/rng/rosc_entropy @@ -0,0 +1 @@ +Subproject commit 4c3b76c5b8d2809b236d2396ed6a8b36be4587e8 diff --git a/core/rng/trng b/core/rng/trng new file mode 160000 index 0000000..d5974ed --- /dev/null +++ b/core/rng/trng @@ -0,0 +1 @@ +Subproject commit d5974ed0d389f8953b23d98bb69b1576adad27b8 diff --git a/rtl/Makefile b/rtl/Makefile deleted file mode 100644 index bc7c9f4..0000000 --- a/rtl/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# Makefile to build Debian package for Cryptech Novena PVT-1 FPGA -# bitstream. -# -# Author: Rob Austein -# Copyright (c) 2015, SUNET -# -# Redistribution and use in source and binary forms, with or -# without modification, are permitted provided that the following -# conditions are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# 2. 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. -# -# 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 OWNER 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. - -# Directory where we run Verilog synthesis - -BUILD_DIR := core/platform/novena/eim/build - -# This business of patching files that are under revision control -# because we can't be bothered to generate a proper configuration file -# is kind of nasty. - -all: - patch -p0 --forward -Section: misc -Priority: optional -Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9) -Homepage: http://trac.cryptech.is/wiki - -Package: cryptech-novena-rtl -Architecture: all -Depends: libc6 (>= 2.13), ${misc:Depends} -Description: Cryptech open-source crypto hardware - "cryptech-novena-rtl" contains FGPA configuration (RTL bitstream) for the Cryptech project on - the Novena PVT-1 development board. diff --git a/rtl/debian/copyright b/rtl/debian/copyright deleted file mode 100644 index fd7518e..0000000 --- a/rtl/debian/copyright +++ /dev/null @@ -1,27 +0,0 @@ -Copyright (c) 2015, 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/rtl/debian/rules b/rtl/debian/rules deleted file mode 100755 index 2d33f6a..0000000 --- a/rtl/debian/rules +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/make -f - -%: - dh $@ diff --git a/rtl/debian/source/format b/rtl/debian/source/format deleted file mode 100644 index 89ae9db..0000000 --- a/rtl/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (native) diff --git a/rtl/patches/01-config-cores.patch b/rtl/patches/01-config-cores.patch deleted file mode 100644 index 245e8a3..0000000 --- a/rtl/patches/01-config-cores.patch +++ /dev/null @@ -1,27 +0,0 @@ -Description: configure core selectors for cryptech dnssec signer - ---- core/platform/common/core_selector/src/rtl/cipher_selector.v~ -+++ core/platform/common/core_selector/src/rtl/cipher_selector.v -@@ -67,7 +67,7 @@ module cipher_selector - //---------------------------------------------------------------- - // Comment following lines to exclude cores from implementation. - `define USE_CORE_AES -- `define USE_CORE_CHACHA -+// `define USE_CORE_CHACHA - - - //---------------------------------------------------------------- ---- core/platform/common/core_selector/src/rtl/hash_selector.v~ -+++ core/platform/common/core_selector/src/rtl/hash_selector.v -@@ -125,9 +125,9 @@ XXX move to `define in wrapper core?? - // List of Available Cores - //---------------------------------------------------------------- - // Comment following lines to exclude cores from implementation. -- `define USE_CORE_SHA1 -+// `define USE_CORE_SHA1 - `define USE_CORE_SHA256 -- `define USE_CORE_SHA512 -+// `define USE_CORE_SHA512 - - - //---------------------------------------------------------------- diff --git a/sw/Makefile b/sw/Makefile index 9dd7dc9..17a7d9b 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -39,16 +39,16 @@ export OBJCOPY := arm-linux-gnueabihf-objcopy # Using autoconf was probably a mistake, but hack around it for now. all: - cd sw/libtfm; ${MAKE} - cd sw/libhal; ./configure CFLAGS='-g3 -Wall -fPIC -std=c99 -I$${TFMDIR}' LDFLAGS='-g3 -L$${TFMDIR} -ltfm' - cd sw/libhal; ${MAKE} - cd sw/sqlite3; ${MAKE} CROSS_COMPILE=arm-unknown-linux-gnueabi - cd sw/pkcs11; ${MAKE} + cd libtfm; ${MAKE} + cd libhal; ./configure CFLAGS='-g3 -Wall -fPIC -std=c99 -I$${TFMDIR}' LDFLAGS='-g3 -L$${TFMDIR} -ltfm' + cd libhal; ${MAKE} + cd sqlite3; ${MAKE} CROSS_COMPILE=arm-unknown-linux-gnueabi + cd pkcs11; ${MAKE} clean distclean: - for d in libtfm libhal sqlite3 pkcs11; do (cd sw/$$d && ${MAKE} $@); done + for d in libtfm libhal sqlite3 pkcs11; do (cd $$d && ${MAKE} $@); done install: all - install -D sw/pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so - install -D sw/pkcs11/p11util ${DESTDIR}/usr/sbin/p11util + install -D pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so + install -D pkcs11/p11util ${DESTDIR}/usr/sbin/p11util diff --git a/sw/libhal b/sw/libhal new file mode 160000 index 0000000..e80f25d --- /dev/null +++ b/sw/libhal @@ -0,0 +1 @@ +Subproject commit e80f25d31235628f2d9cfb410d48bcc83b4487d5 diff --git a/sw/libtfm b/sw/libtfm new file mode 160000 index 0000000..108e789 --- /dev/null +++ b/sw/libtfm @@ -0,0 +1 @@ +Subproject commit 108e78987bc39f11d0abbba7dbfe80704cbf0282 diff --git a/sw/pkcs11 b/sw/pkcs11 new file mode 160000 index 0000000..5f0d1c2 --- /dev/null +++ b/sw/pkcs11 @@ -0,0 +1 @@ +Subproject commit 5f0d1c2ecfde778a164dd4cfc362f7bd29ebe241 diff --git a/sw/sqlite3 b/sw/sqlite3 new file mode 160000 index 0000000..7bdeab3 --- /dev/null +++ b/sw/sqlite3 @@ -0,0 +1 @@ +Subproject commit 7bdeab315c5fdaf6d1b087423b98e80e80fefec8 diff --git a/sw/sw/libhal b/sw/sw/libhal deleted file mode 160000 index e80f25d..0000000 --- a/sw/sw/libhal +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e80f25d31235628f2d9cfb410d48bcc83b4487d5 diff --git a/sw/sw/libtfm b/sw/sw/libtfm deleted file mode 160000 index 108e789..0000000 --- a/sw/sw/libtfm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 108e78987bc39f11d0abbba7dbfe80704cbf0282 diff --git a/sw/sw/pkcs11 b/sw/sw/pkcs11 deleted file mode 160000 index 5f0d1c2..0000000 --- a/sw/sw/pkcs11 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f0d1c2ecfde778a164dd4cfc362f7bd29ebe241 diff --git a/sw/sw/sqlite3 b/sw/sw/sqlite3 deleted file mode 160000 index 7bdeab3..0000000 --- a/sw/sw/sqlite3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7bdeab315c5fdaf6d1b087423b98e80e80fefec8 -- cgit v1.2.3