tsaitgaist has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/15011
Change subject: publish: also upload latest ...................................................................... publish: also upload latest the jenkins script will now upload the versioned output to the all directory, and a copy named "latest" in the latest directory. Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e --- M contrib/jenkins.sh M firmware/Makefile 2 files changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/11/15011/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 16420f7..af99c8e 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -64,7 +64,8 @@ [rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX EOF SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48" - rsync -avz -e "$SSH_COMMAND" $TOPDIR/firmware/bin/*.{bin,elf} binar...@rita.osmocom.org:web-files/simtrace2/firmware/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binar...@rita.osmocom.org:web-files/simtrace2/firmware/latest/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" --exclude $TOPDIR/firmware/bin/*-latest.{bin,elf} $TOPDIR/firmware/bin/*-*-*-*.{bin,elf} binar...@rita.osmocom.org:web-files/simtrace2/firmware/all/ fi echo diff --git a/firmware/Makefile b/firmware/Makefile index 646d2f3..a879297 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -44,8 +44,8 @@ # Output file basename APP ?= dfu -# Output directories -OUTPUT = $(BOARD)-$(APP)-$(GIT_VERSION) +# Output directories and filename +OUTPUT = $(BOARD)-$(APP) BIN = bin OBJ = obj/$(BOARD) @@ -129,8 +129,6 @@ # Optimization level, put in comment for debugging OPTIMIZATION ?= -Os - - # Flags INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB) @@ -173,8 +171,7 @@ LDFLAGS = -mcpu=cortex-m3 -mthumb -Wl,--cref -Wl,--check-sections -Wl,--gc-sections -Wl,--entry=ResetException -Wl,--unresolved-symbols=report-all -Wl,--warn-common -Wl,--warn-section-align -Wl,--warn-unresolved-symbols $(LIB) #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats - -# Append OBJ and BIN directories to output filename +# Append BIN directories to output filename OUTPUT := $(BIN)/$(OUTPUT) #------------------------------------------------------------------------------- @@ -207,8 +204,12 @@ $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1)) @$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS) + cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf + cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-latest.elf @$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt @$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin + cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin + cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-latest.bin @$(SIZE) $$^ $(OUTPUT)-$$@.elf $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN) -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/15011 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e Gerrit-Change-Number: 15011 Gerrit-PatchSet: 1 Gerrit-Owner: tsaitgaist <kre...@sysmocom.de> Gerrit-MessageType: newchange