diff options
author | Rob Austein <sra@hactrn.net> | 2016-12-14 00:56:24 -0500 |
---|---|---|
committer | Rob Austein <sra@hactrn.net> | 2016-12-14 00:56:24 -0500 |
commit | b94f9f9d3816d3cd26a4cc8f3da9f4616bd05a35 (patch) | |
tree | fbeb9b09ce998632986b2ad623adc832f795e6bf /source/sw | |
parent | eb5aaecab2b988f3ff4d36817fb56aca5a30aebb (diff) |
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.
Diffstat (limited to 'source/sw')
m--------- | source/sw/libhal | 0 | ||||
m--------- | source/sw/stm32 | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/source/sw/libhal b/source/sw/libhal -Subproject 0166b1b370862ab34335af3d5710304dc354649 +Subproject 1295f7ebbfaff3ad098fe9d4cafa32a1f375056 diff --git a/source/sw/stm32 b/source/sw/stm32 -Subproject 057c2bd09138dfd626289b27929427021f1b1c2 +Subproject d172acba926b72c57c47697bd640c51c0fcb038 |