From b94f9f9d3816d3cd26a4cc8f3da9f4616bd05a35 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 14 Dec 2016 00:56:24 -0500 Subject: Support multiple packages corresponding to multiple releng branches. We want to be able to provide packaged builds of development branches. The most straightforward way to do this is a 1:1 correspondence between branches in the releng tree and variant package names. We adopt a simple convention: the base package name corresponds to the master branch, all other branches are named with the base package name followed by the branch name. So the master branch is the cryptech-alpha package, the ksng branch is the cryptech-alpha-ksng branch, and so forth. This isn't a perfect solution, but it's probably good enough. In order to do this, we need to generate the debian/control file at build-time, so that we can generate the list of conflicting packages. This commit also pulls in a few changes that had collected on the master branches of various repositories, chiefly because a few of them were necessary to get it the build to run at all. --- source/sw/libhal | 2 +- source/sw/stm32 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/sw') diff --git a/source/sw/libhal b/source/sw/libhal index 0166b1b..1295f7e 160000 --- a/source/sw/libhal +++ b/source/sw/libhal @@ -1 +1 @@ -Subproject commit 0166b1b370862ab34335af3d5710304dc3546499 +Subproject commit 1295f7ebbfaff3ad098fe9d4cafa32a1f3750563 diff --git a/source/sw/stm32 b/source/sw/stm32 index 057c2bd..d172acb 160000 --- a/source/sw/stm32 +++ b/source/sw/stm32 @@ -1 +1 @@ -Subproject commit 057c2bd09138dfd626289b27929427021f1b1c2a +Subproject commit d172acba926b72c57c47697bd640c51c0fcb038d -- cgit v1.2.3