[Cryptech-Commits] [user/sra/alpha-releng/omnibus] 18/24: Move source code one level down in tree to get names in source package right.

[git at cryptech.is]

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/alpha-releng/omnibus.

commit e21726fd47adaf461a9434acf8422a865f53f78b
Author: Rob Austein <sra at hactrn.net>
AuthorDate: Sun Jun 26 10:44:56 2016 -0400

    Move source code one level down in tree to get names in source package right.
---
 .gitmodules                         | 12 ++++++------
 Makefile                            |  4 ++--
 {sw => source}/Makefile             | 12 ++++++------
 {sw => source}/debian/compat        |  0
 {sw => source}/debian/control       |  0
 {sw => source}/debian/copyright     |  0
 {sw => source}/debian/rules         |  0
 {sw => source}/debian/source/format |  0
 source/sw/libhal                    |  1 +
 {sw => source/sw}/pkcs11            |  0
 {sw => source/sw}/thirdparty/libtfm |  0
 sw/libhal                           |  1 -
 12 files changed, 15 insertions(+), 15 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
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/sw/Makefile b/source/Makefile
similarity index 51%
rename from sw/Makefile
rename to 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
similarity index 100%
rename from sw/debian/compat
rename to source/debian/compat
diff --git a/sw/debian/control b/source/debian/control
similarity index 100%
rename from sw/debian/control
rename to source/debian/control
diff --git a/sw/debian/copyright b/source/debian/copyright
similarity index 100%
rename from sw/debian/copyright
rename to source/debian/copyright
diff --git a/sw/debian/rules b/source/debian/rules
similarity index 100%
rename from sw/debian/rules
rename to source/debian/rules
diff --git a/sw/debian/source/format b/source/debian/source/format
similarity index 100%
rename from sw/debian/source/format
rename to source/debian/source/format
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/sw/pkcs11 b/source/sw/pkcs11
similarity index 100%
rename from sw/pkcs11
rename to source/sw/pkcs11
diff --git a/sw/thirdparty/libtfm b/source/sw/thirdparty/libtfm
similarity index 100%
rename from sw/thirdparty/libtfm
rename to source/sw/thirdparty/libtfm
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