[Cryptech-Commits] [user/sra/novena-releng] 01/01: Rearrange tree to make filenames in source packages come out right.
git at cryptech.is
git at cryptech.is
Sun Jul 5 05:00:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
sra at hactrn.net pushed a commit to branch master
in repository user/sra/novena-releng.
commit de6d17659a4308b2313e633b0bf5f62946bbd741
Author: Rob Austein <sra at hactrn.net>
Date: Sun Jul 5 00:47:00 2015 -0400
Rearrange tree to make filenames in source packages come out right.
---
.gitmodules | 72 ++++++++++++++---------------
Makefile | 7 ++-
{rtl => core}/Makefile | 6 +--
{rtl/core => core}/cipher/aes | 0
{rtl/core => core}/cipher/chacha | 0
{rtl/core => core}/comm/eim | 0
{rtl => core}/debian/compat | 0
{rtl => core}/debian/control | 0
{rtl => core}/debian/copyright | 0
{rtl => core}/debian/rules | 0
{rtl => core}/debian/source/format | 0
{rtl/core => core}/hash/sha1 | 0
{rtl/core => core}/hash/sha256 | 0
{rtl/core => core}/hash/sha512 | 0
{rtl/core => core}/math/modexp | 0
{rtl => core}/patches/01-config-cores.patch | 0
{rtl/core => core}/platform/common | 0
{rtl/core => core}/platform/novena | 0
{rtl/core => core}/rng/avalanche_entropy | 0
{rtl/core => core}/rng/rosc_entropy | 0
{rtl/core => core}/rng/trng | 0
sw/Makefile | 16 +++----
sw/{sw => }/libhal | 0
sw/{sw => }/libtfm | 0
sw/{sw => }/pkcs11 | 0
sw/{sw => }/sqlite3 | 0
26 files changed, 50 insertions(+), 51 deletions(-)
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 at git.cryptech.is:user/sra/libhal
-[submodule "sw/sw/libtfm"]
- path = sw/sw/libtfm
- url = git at git.cryptech.is:user/sra/libtfm
-[submodule "sw/sw/pkcs11"]
- path = sw/sw/pkcs11
- url = git at git.cryptech.is:user/sra/pkcs11
-[submodule "sw/sw/sqlite3"]
- path = sw/sw/sqlite3
- url = git at git.cryptech.is:user/sra/sqlite3
-[submodule "rtl/core/cipher/aes"]
- path = rtl/core/cipher/aes
+[submodule "sw/libhal"]
+ path = sw/libhal
+ url = git at git.cryptech.is:user/sra/libhal.git
+[submodule "sw/libtfm"]
+ path = sw/libtfm
+ url = git at git.cryptech.is:user/sra/libtfm.git
+[submodule "sw/pkcs11"]
+ path = sw/pkcs11
+ url = git at git.cryptech.is:user/sra/pkcs11.git
+[submodule "sw/sqlite3"]
+ path = sw/sqlite3
+ url = git at git.cryptech.is:user/sra/sqlite3.git
+[submodule "core/cipher/aes"]
+ path = core/cipher/aes
url = git at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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/rtl/Makefile b/core/Makefile
similarity index 92%
rename from rtl/Makefile
rename to core/Makefile
index bc7c9f4..9dadbcd 100644
--- a/rtl/Makefile
+++ b/core/Makefile
@@ -31,16 +31,16 @@
# Directory where we run Verilog synthesis
-BUILD_DIR := core/platform/novena/eim/build
+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 -p0 --forward <patches/01-config-cores.patch
+ patch -p1 --forward <patches/01-config-cores.patch
cd ${BUILD_DIR}; $(MAKE)
- patch -p0 --reverse <patches/01-config-cores.patch
+ patch -p1 --reverse <patches/01-config-cores.patch
clean:
cd ${BUILD_DIR}; $(MAKE) clean
diff --git a/rtl/core/cipher/aes b/core/cipher/aes
similarity index 100%
rename from rtl/core/cipher/aes
rename to core/cipher/aes
diff --git a/rtl/core/cipher/chacha b/core/cipher/chacha
similarity index 100%
rename from rtl/core/cipher/chacha
rename to core/cipher/chacha
diff --git a/rtl/core/comm/eim b/core/comm/eim
similarity index 100%
rename from rtl/core/comm/eim
rename to core/comm/eim
diff --git a/rtl/debian/compat b/core/debian/compat
similarity index 100%
rename from rtl/debian/compat
rename to core/debian/compat
diff --git a/rtl/debian/control b/core/debian/control
similarity index 100%
rename from rtl/debian/control
rename to core/debian/control
diff --git a/rtl/debian/copyright b/core/debian/copyright
similarity index 100%
rename from rtl/debian/copyright
rename to core/debian/copyright
diff --git a/rtl/debian/rules b/core/debian/rules
similarity index 100%
rename from rtl/debian/rules
rename to core/debian/rules
diff --git a/rtl/debian/source/format b/core/debian/source/format
similarity index 100%
rename from rtl/debian/source/format
rename to core/debian/source/format
diff --git a/rtl/core/hash/sha1 b/core/hash/sha1
similarity index 100%
rename from rtl/core/hash/sha1
rename to core/hash/sha1
diff --git a/rtl/core/hash/sha256 b/core/hash/sha256
similarity index 100%
rename from rtl/core/hash/sha256
rename to core/hash/sha256
diff --git a/rtl/core/hash/sha512 b/core/hash/sha512
similarity index 100%
rename from rtl/core/hash/sha512
rename to core/hash/sha512
diff --git a/rtl/core/math/modexp b/core/math/modexp
similarity index 100%
rename from rtl/core/math/modexp
rename to core/math/modexp
diff --git a/rtl/patches/01-config-cores.patch b/core/patches/01-config-cores.patch
similarity index 100%
rename from rtl/patches/01-config-cores.patch
rename to core/patches/01-config-cores.patch
diff --git a/rtl/core/platform/common b/core/platform/common
similarity index 100%
rename from rtl/core/platform/common
rename to core/platform/common
diff --git a/rtl/core/platform/novena b/core/platform/novena
similarity index 100%
rename from rtl/core/platform/novena
rename to core/platform/novena
diff --git a/rtl/core/rng/avalanche_entropy b/core/rng/avalanche_entropy
similarity index 100%
rename from rtl/core/rng/avalanche_entropy
rename to core/rng/avalanche_entropy
diff --git a/rtl/core/rng/rosc_entropy b/core/rng/rosc_entropy
similarity index 100%
rename from rtl/core/rng/rosc_entropy
rename to core/rng/rosc_entropy
diff --git a/rtl/core/rng/trng b/core/rng/trng
similarity index 100%
rename from rtl/core/rng/trng
rename to core/rng/trng
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/sw/libhal b/sw/libhal
similarity index 100%
rename from sw/sw/libhal
rename to sw/libhal
diff --git a/sw/sw/libtfm b/sw/libtfm
similarity index 100%
rename from sw/sw/libtfm
rename to sw/libtfm
diff --git a/sw/sw/pkcs11 b/sw/pkcs11
similarity index 100%
rename from sw/sw/pkcs11
rename to sw/pkcs11
diff --git a/sw/sw/sqlite3 b/sw/sqlite3
similarity index 100%
rename from sw/sw/sqlite3
rename to sw/sqlite3
More information about the Commits
mailing list