Skip to content

Commit

Permalink
Pin git repos to specific revisions
Browse files Browse the repository at this point in the history
Fixes upstreams potentially being able to break our builds, and also
makes builds more deterministic which helps with reproducible builds.

Fixes #498
  • Loading branch information
strugee committed Dec 14, 2018
1 parent 7604296 commit 397dc6f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ define define_module =
# that the files are all present. No signature hashes are checked in
# this case, since we don't have a stable version to compare against.
$(build)/$($1_base_dir)/.canary:
git clone $($1_repo) "$(build)/$($1_base_dir)"
git clone $($1_repo) --branch $($1_rev) "$(build)/$($1_base_dir)"
if [ -r patches/$1.patch ]; then \
( cd $(build)/$($1_base_dir) ; patch -p1 ) \
< patches/$1.patch \
Expand Down
1 change: 1 addition & 0 deletions modules/libremkey-hotp-verification
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ libremkey-hotp-verification_depends := libusb $(musl_dep)
libremkey-hotp-verification_version := git
libremkey-hotp-verification_dir := libremkey-hotp-verification
libremkey-hotp-verification_repo := --recursive https://github.com/Nitrokey/nitrokey-hotp-verification
libremkey-hotp-verification_rev := 5b2bb429777b208b70fea86129b8c26355ef5569

libremkey-hotp-verification_target := \
$(MAKE_JOBS) \
Expand Down
1 change: 1 addition & 0 deletions modules/linuxboot
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ modules-$(CONFIG_LINUXBOOT) += linuxboot
linuxboot_version := git
linuxboot_repo := https://github.com/osresearch/linuxboot
linuxboot_base_dir := linuxboot-$(linuxboot_version)
linuxboot_rev := b5376a441e8e85cbf722e943bb8294958e87c784

# linuxboot builds are specialized on a per-target basis.
# They can be specialized by defining $(CONFIG_LINUXBOOT_BOARD)
Expand Down
1 change: 1 addition & 0 deletions modules/musl-cross
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ modules-y += musl-cross
musl-cross_version := git
musl-cross_dir := musl-cross-$(musl-cross_version)
musl-cross_repo := https://github.com/GregorR/musl-cross
musl-cross_rev := abf1dd54ac05f5b2d34d750027fa083b870e069e

CROSS_TOP := crossgcc/x86_64-linux-musl/bin/x86_64-musl-linux-
CROSS := $(build)/../$(CROSS_TOP)
Expand Down
1 change: 1 addition & 0 deletions modules/tpmtotp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ tpmtotp_depends := mbedtls qrencode $(musl_dep)

tpmtotp_version := git
tpmtotp_repo := https://github.com/osresearch/tpmtotp
tpmtotp_rev := 18b860fdcf5a55537c8395b891f2b2a5c24fc00a

#tpmtotp_version := 0.3.0
tpmtotp_dir := tpmtotp-$(tpmtotp_version)
Expand Down

0 comments on commit 397dc6f

Please sign in to comment.