<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/15011">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">publish: also upload latest<br><br>the jenkins script will now upload the versioned output to the<br>all directory, and a copy named "latest" in the latest directory.<br><br>Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e<br>---<br>M contrib/jenkins.sh<br>M firmware/Makefile<br>2 files changed, 9 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 16420f7..202339c 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -64,7 +64,8 @@</span><br><span> [rita.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX</span><br><span> EOF</span><br><span> SSH_COMMAND="ssh -o 'UserKnownHostsFile=$WORKSPACE/known_hosts' -p 48"</span><br><span style="color: hsl(0, 100%, 40%);">- rsync -avz -e "$SSH_COMMAND" $TOPDIR/firmware/bin/*.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/</span><br><span style="color: hsl(120, 100%, 40%);">+ rsync --archive --verbose --compress --delete --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/latest/</span><br><span style="color: hsl(120, 100%, 40%);">+ rsync --archive --verbose --compress --rsh "$SSH_COMMAND" --exclude $TOPDIR/firmware/bin/*-latest.{bin,elf} $TOPDIR/firmware/bin/*-*-*-*.{bin,elf} binaries@rita.osmocom.org:web-files/simtrace2/firmware/all/</span><br><span> fi</span><br><span> </span><br><span> echo</span><br><span>diff --git a/firmware/Makefile b/firmware/Makefile</span><br><span>index 646d2f3..a879297 100644</span><br><span>--- a/firmware/Makefile</span><br><span>+++ b/firmware/Makefile</span><br><span>@@ -44,8 +44,8 @@</span><br><span> # Output file basename</span><br><span> APP ?= dfu</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-# Output directories</span><br><span style="color: hsl(0, 100%, 40%);">-OUTPUT = $(BOARD)-$(APP)-$(GIT_VERSION)</span><br><span style="color: hsl(120, 100%, 40%);">+# Output directories and filename</span><br><span style="color: hsl(120, 100%, 40%);">+OUTPUT = $(BOARD)-$(APP)</span><br><span> BIN = bin</span><br><span> OBJ = obj/$(BOARD)</span><br><span> </span><br><span>@@ -129,8 +129,6 @@</span><br><span> # Optimization level, put in comment for debugging</span><br><span> OPTIMIZATION ?= -Os</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> # Flags</span><br><span> INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB)</span><br><span> </span><br><span>@@ -173,8 +171,7 @@</span><br><span> 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)</span><br><span> #LD_OPTIONAL=-Wl,--print-gc-sections -Wl,--stats</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-# Append OBJ and BIN directories to output filename</span><br><span style="color: hsl(120, 100%, 40%);">+# Append BIN directories to output filename</span><br><span> OUTPUT := $(BIN)/$(OUTPUT)</span><br><span> </span><br><span> #-------------------------------------------------------------------------------</span><br><span>@@ -207,8 +204,12 @@</span><br><span> </span><br><span> $(1): $$(ASM_OBJECTS_$(1)) $$(C_OBJECTS_$(1))</span><br><span> @$(CC) $(LDFLAGS) $(LD_OPTIONAL) -T"libboard/common/resources/$(CHIP)/$$@.ld" -Wl,-Map,$(OUTPUT)-$$@.map -o $(OUTPUT)-$$@.elf $$^ $(LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+ cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf</span><br><span style="color: hsl(120, 100%, 40%);">+ cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-latest.elf</span><br><span> @$(NM) $(OUTPUT)-$$@.elf >$(OUTPUT)-$$@.elf.txt</span><br><span> @$(OBJCOPY) -O binary $(OUTPUT)-$$@.elf $(OUTPUT)-$$@.bin</span><br><span style="color: hsl(120, 100%, 40%);">+ cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin</span><br><span style="color: hsl(120, 100%, 40%);">+ cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-latest.bin</span><br><span> @$(SIZE) $$^ $(OUTPUT)-$$@.elf</span><br><span> </span><br><span> $$(C_OBJECTS_$(1)): $(OBJ)/$(1)_%.o: %.c Makefile $(OBJ) $(BIN)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/15011">change 15011</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/simtrace2/+/15011"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I70114ef8414779e369da5cbf945854c9ace3464e </div>
<div style="display:none"> Gerrit-Change-Number: 15011 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: tsaitgaist <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>