Skip to content

Commit

Permalink
Recovery image is reproducible
Browse files Browse the repository at this point in the history
Updated to a version of ums that includes usbarmory/armory-ums#5 and enabled the reproducible build mode. Deleted 'CROSS_COMPILE=arm-none-eabi-' because it's already specified in the Makefile.
  • Loading branch information
mhutchinson committed Feb 15, 2024
1 parent 373ce9e commit 9d788e6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions recovery/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM golang:1.21.3-bookworm

ARG TAMAGO_VERSION
# Pinned at tag [v20231018](https://github.com/usbarmory/armory-ums/releases/tag/v20231018)
ARG ARMORY_UMS_VERSION=74060722c9aa92bbdcf3725ed0d0be4ebe8f8687
# Must be a valid commit hash for https://github.com/usbarmory/armory-ums/
ARG ARMORY_UMS_VERSION=850baf54809bd29548d6f817933240043400a4e1

# Install dependencies.
RUN apt-get update && apt-get install -y make wget u-boot-tools binutils-arm-none-eabi
Expand All @@ -16,5 +16,5 @@ WORKDIR /build

RUN git clone https://github.com/usbarmory/armory-ums.git
RUN cd armory-ums && git reset --hard ${ARMORY_UMS_VERSION} && \
CROSS_COMPILE=arm-none-eabi- make imx && \
REPRODUCIBLE=1 make imx && \
git rev-parse --verify HEAD > armory-ums.imx.git-commit
2 changes: 1 addition & 1 deletion recovery/cloudbuild_ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ substitutions:
_TAMAGO_VERSION: '1.21.5'
# Pinned at tag [v20231018](https://github.com/usbarmory/armory-ums/releases/tag/v20231018)
# This MUST be a full git commit tag for the armory-ums repo
_ARMORY_UMS_VERSION: 74060722c9aa92bbdcf3725ed0d0be4ebe8f8687
_ARMORY_UMS_VERSION: 850baf54809bd29548d6f817933240043400a4e1
# Log-related.
# This must correspond with the trailing number on the _FIRMWARE_BUCKET, _ORIGIN, _LOG_NAME values.
_KEY_VERSION: '1'
Expand Down

0 comments on commit 9d788e6

Please sign in to comment.