From 596c6c107740d38e9bcc9f786a9734af84b90f47 Mon Sep 17 00:00:00 2001 From: Conor Patrick Date: Sat, 16 Feb 2019 22:30:49 -0500 Subject: [PATCH] manually specify order for reproducible builds --- targets/stm32l432/build/application.mk | 2 +- targets/stm32l432/build/bootloader.mk | 2 +- targets/stm32l432/build/common.mk | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/targets/stm32l432/build/application.mk b/targets/stm32l432/build/application.mk index 1b4a2dd..a22bc1d 100644 --- a/targets/stm32l432/build/application.mk +++ b/targets/stm32l432/build/application.mk @@ -4,7 +4,7 @@ include build/common.mk SRC = src/main.c src/init.c src/redirect.c src/flash.c src/rng.c src/led.c src/device.c SRC += src/fifo.c src/crypto.c src/attestation.c SRC += src/startup_stm32l432xx.s src/system_stm32l4xx.c -SRC += $(sort $(wildcard lib/*.c) $(wildcard lib/usbd/*.c)) +SRC += $(DRIVER_LIBS) $(USB_LIB) # FIDO2 lib SRC += ../../fido2/util.c ../../fido2/u2f.c ../../fido2/test_power.c diff --git a/targets/stm32l432/build/bootloader.mk b/targets/stm32l432/build/bootloader.mk index 24f2751..0f1f2d3 100644 --- a/targets/stm32l432/build/bootloader.mk +++ b/targets/stm32l432/build/bootloader.mk @@ -5,7 +5,7 @@ SRC = bootloader/main.c bootloader/bootloader.c SRC += src/init.c src/redirect.c src/flash.c src/rng.c src/led.c src/device.c SRC += src/fifo.c src/crypto.c src/attestation.c SRC += src/startup_stm32l432xx.s src/system_stm32l4xx.c -SRC += $(wildcard lib/*.c) $(wildcard lib/usbd/*.c) +SRC += $(DRIVER_LIBS) $(USB_LIB) # FIDO2 lib SRC += ../../fido2/util.c ../../fido2/u2f.c ../../fido2/extensions/extensions.c diff --git a/targets/stm32l432/build/common.mk b/targets/stm32l432/build/common.mk index 058dac7..4170e51 100644 --- a/targets/stm32l432/build/common.mk +++ b/targets/stm32l432/build/common.mk @@ -3,6 +3,15 @@ CP=$(PREFIX)arm-none-eabi-objcopy SZ=$(PREFIX)arm-none-eabi-size AR=$(PREFIX)arm-none-eabi-ar +DRIVER_LIBS := lib/stm32l4xx_hal_pcd.c lib/stm32l4xx_hal_pcd_ex.c lib/stm32l4xx_ll_gpio.c \ + lib/stm32l4xx_ll_rcc.c lib/stm32l4xx_ll_rng.c lib/stm32l4xx_ll_tim.c \ + lib/stm32l4xx_ll_usb.c lib/stm32l4xx_ll_utils.c lib/stm32l4xx_ll_pwr.c \ + lib/stm32l4xx_ll_usart.c + +USB_LIB := lib/usbd/usbd_cdc.c lib/usbd/usbd_cdc_if.c lib/usbd/usbd_composite.c \ + lib/usbd/usbd_conf.c lib/usbd/usbd_core.c lib/usbd/usbd_ioreq.c \ + lib/usbd/usbd_ctlreq.c lib/usbd/usbd_desc.c lib/usbd/usbd_hid.c + VERSION:=$(shell git describe --abbrev=0 ) VERSION_FULL:=$(shell git describe) VERSION_MAJ:=$(shell python -c 'print("$(VERSION)".split(".")[0])')