Add meta-package.

7 files changed, 61 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index f960bad..c897944 100644
--- a/Makefile
+++ b/Makefile
@@ -61,8 +61,8 @@ CRYPTECH_PACKAGE_VERSION := ${CRYPTECH_VERSION}~${HEAD_TIME}~${HEAD_HASH}
 
 DCH =	test -f debian/changelog || \
 	EDITOR=true VISUAL=true TZ=UTC DEBEMAIL='APT Builder Robot <aptbot@cryptech.is>' \
-	dch --create --package cryptech-novena-$(1) --newversion '${CRYPTECH_PACKAGE_VERSION}' \
-	'Version ${CRYPTECH_VERSION} of Cryptech $(2) for the Novena PVT-1 development board.'
+	dch --create --package cryptech-novena$(strip $(1)) --newversion '${CRYPTECH_PACKAGE_VERSION}' \
+	'$(strip Version ${CRYPTECH_VERSION} of Cryptech $(2) for Novena PVT-1 development board.)'
 
 # Parameters controlling maintenance of the reprepro repository.  The
 # "reprepro" target initializes the repository if it doesn't exist.
@@ -93,7 +93,7 @@ UPLOAD_URI  := rsync://apt.cryptech.is/novena/
 export GNUPGHOME
 
 
-all: init sw rtl
+all: init sw rtl meta
 
 enchilada: all reprepro upload
 
@@ -105,15 +105,21 @@ clean:
 	git submodule foreach 'git clean -dfx'
 
 sw:
-	cd sw; $(call DCH,sw,software tools)
+	cd sw; $(call DCH, -sw, software tools)
 	cd sw; debuild -S -uc -us
 	cd sw; debuild -b -uc -us -aarmhf
 
 rtl:
-	cd core; $(call DCH,rtl,RTL bitstream)
+	cd core; $(call DCH, -rtl, RTL bitstream)
 	cd core; debuild -S -uc -us
 	cd core; debuild -b -uc -us -aarmhf
 
+meta:
+	cd meta; $(call DCH, , meta package)
+	cd meta; debuild -S -uc -us
+	cd meta; debuild -b -uc -us -aarmhf
+	
+
 reprepro: ${REPOSITORY}/conf/distributions ${REPOSITORY}/conf/options
 	umask ${REPO_UMASK}; for f in *.changes; do reprepro -b ${REPOSITORY} include ${CODENAME} $$f; done
 
@@ -126,4 +132,4 @@ upload:
 	${RSYNC} --ignore-existing       ${REPOSITORY}/ ${UPLOAD_URI}
 	${RSYNC} --delete --delete-delay ${REPOSITORY}/ ${UPLOAD_URI}
 
-.PHONY: all init clean sw rtl reprepro upload enchilada
+.PHONY: all init clean sw rtl meta reprepro upload enchilada
diff --git a/meta/README b/meta/README
new file mode 100644
index 0000000..e766a81
--- /dev/null
+++ b/meta/README
@@ -0,0 +1 @@
+Debian "meta-package" as a convenience for installers.
diff --git a/meta/debian/compat b/meta/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/meta/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/meta/debian/control b/meta/debian/control
new file mode 100644
index 0000000..a43887f
--- /dev/null
+++ b/meta/debian/control
@@ -0,0 +1,15 @@
+Source: cryptech-novena
+Maintainer: Rob Austein <sra@hactrn.net>
+Section: misc
+Priority: optional
+Standards-Version: 3.9.6
+Build-Depends: debhelper (>= 9)
+Homepage: https://trac.cryptech.is/wiki
+
+Package: cryptech-novena
+Architecture: all
+Depends: cryptech-novena-sw, cryptech-novena-rtl, ${misc:Depends}
+Description: Meta package for Cryptech Project Novena packages.
+ This is a meta-package whose sole purpose is to provide a convenient 
+ single target one can use with apt-get to install all of the 
+ Cryptech Project packages for the Novena PVT-1 development board.
diff --git a/meta/debian/copyright b/meta/debian/copyright
new file mode 100644
index 0000000..fd7518e
--- /dev/null
+++ b/meta/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/meta/debian/rules b/meta/debian/rules
new file mode 100755
index 0000000..2d33f6a
--- /dev/null
+++ b/meta/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
diff --git a/meta/debian/source/format b/meta/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/meta/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)