<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/23255">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: create duplicate files for upload only<br><br>Don't create copies of firmware files with version strings appended in<br>the normal build. Only do this before uploading the firmware files.<br><br>I have verified that "make" before this change and<br>"make; contrib/prepare_upload.sh" after produce the same files.<br><br>Close: OS#4413<br>Change-Id: I118a4ff397a178281c26a6b98112fa66b6f049ab<br>---<br>M contrib/jenkins.sh<br>A contrib/prepare_upload.sh<br>M firmware/Makefile<br>3 files changed, 15 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/55/23255/1</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 7ddfa6e..2ad7a7f 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -68,6 +68,7 @@</span><br><span> if [ "x$publish" = "x--publish" ]; then</span><br><span>   echo</span><br><span>         echo "=============== UPLOAD BUILD  =============="</span><br><span style="color: hsl(120, 100%, 40%);">+ contrib/prepare_upload.sh</span><br><span> </span><br><span>        cat > "/build/known_hosts" <<EOF</span><br><span> [rita.osmocom.org]:48 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDgQ9HntlpWNmh953a2Gc8NysKE4orOatVT1wQkyzhARnfYUerRuwyNr1GqMyBKdSI9amYVBXJIOUFcpV81niA7zQRUs66bpIMkE9/rHxBd81SkorEPOIS84W4vm3SZtuNqa+fADcqe88Hcb0ZdTzjKILuwi19gzrQyME2knHY71EOETe9Yow5RD2hTIpB5ecNxI0LUKDq+Ii8HfBvndPBIr0BWYDugckQ3Bocf+yn/tn2/GZieFEyFpBGF/MnLbAAfUKIdeyFRX7ufaiWWz5yKAfEhtziqdAGZaXNaLG6gkpy3EixOAy6ZXuTAk3b3Y0FUmDjhOHllbPmTOcKMry9</span><br><span>diff --git a/contrib/prepare_upload.sh b/contrib/prepare_upload.sh</span><br><span>new file mode 100755</span><br><span>index 0000000..8242fd4</span><br><span>--- /dev/null</span><br><span>+++ b/contrib/prepare_upload.sh</span><br><span>@@ -0,0 +1,14 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#!/bin/sh -e</span><br><span style="color: hsl(120, 100%, 40%);">+# Create copies of binaries with -latest, -$GIT_VERSION (OS#4413, OS#3452)</span><br><span style="color: hsl(120, 100%, 40%);">+GIT_VERSION="$(./git-version-gen .tarball-version)"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo "Copying binaries with "-latest" and "-$GIT_VERSION" appended..."</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+cd firmware/bin</span><br><span style="color: hsl(120, 100%, 40%);">+for ext in bin elf; do</span><br><span style="color: hsl(120, 100%, 40%);">+       for file in *."$ext"; do</span><br><span style="color: hsl(120, 100%, 40%);">+            without_ext="${file%.*}"</span><br><span style="color: hsl(120, 100%, 40%);">+            cp -v "$file" "$without_ext-latest.$ext"</span><br><span style="color: hsl(120, 100%, 40%);">+          cp -v "$file" "$without_ext-$GIT_VERSION.$ext"</span><br><span style="color: hsl(120, 100%, 40%);">+    done</span><br><span style="color: hsl(120, 100%, 40%);">+done</span><br><span>diff --git a/firmware/Makefile b/firmware/Makefile</span><br><span>index d7c64b9..ccf5843 100644</span><br><span>--- a/firmware/Makefile</span><br><span>+++ b/firmware/Makefile</span><br><span>@@ -211,12 +211,8 @@</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(0, 100%, 40%);">-     cp $(OUTPUT)-$$@.elf $(OUTPUT)-$$@-$(GIT_VERSION).elf</span><br><span style="color: hsl(0, 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(0, 100%, 40%);">-       cp $(OUTPUT)-$$@.bin $(OUTPUT)-$$@-$(GIT_VERSION).bin</span><br><span style="color: hsl(0, 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/+/23255">change 23255</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/+/23255"/><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: I118a4ff397a178281c26a6b98112fa66b6f049ab </div>
<div style="display:none"> Gerrit-Change-Number: 23255 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>