[XS] Change in osmo-asf4-dfu[master]: contrib/jenkins: fix upload

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39787?usp=email ) Change subject: contrib/jenkins: fix upload ...................................................................... contrib/jenkins: fix upload Bring back the bootloader-sysmooctsim.{bin,elf} symlinks, so the upload to "latest" does not fail with: rsync: [sender] link_stat "/build/gcc/bootloader-sysmooctsim.bin" failed: No such file or directory (2) rsync: [sender] link_stat "/build/gcc/bootloader-sysmooctsim.elf" failed: No such file or directory (2) Adjust the pattern for uploading to "all" to only match the -dfu files, not the new -flash files as discussed with Eric. Fixes: 412731 ("bl updater app") Change-Id: I767d3b99840eba5e1b395079c878dcbae78b08a0 --- M contrib/jenkins.sh M gcc/Makefile 2 files changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-asf4-dfu refs/changes/87/39787/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e9296c6..86794ed 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -43,7 +43,7 @@ $TOPDIR/gcc/bootloader-sysmooctsim.{bin,elf} \ binaries@ftp.osmocom.org:web-files/osmo-asf4-dfu/latest/ rsync --archive --verbose --compress --rsh "$SSH_COMMAND" \ - $TOPDIR/gcc/bootloader-*-*.{bin,elf} \ + $TOPDIR/gcc/bootloader-*-*-dfu.{bin,elf} \ binaries@ftp.osmocom.org:web-files/osmo-asf4-dfu/all/ fi #--exclude $TOPDIR/sysmoOCTSIM/gcc/bootloader-sysmooctsim.bin \ diff --git a/gcc/Makefile b/gcc/Makefile index 27a9143..31cdbad 100644 --- a/gcc/Makefile +++ b/gcc/Makefile @@ -140,6 +140,8 @@ xxd -s $$(($$CRC_START_ADDR - $$FLASH_START_ADDR -4)) -l 4 -g 1 section_text.bin; \ "$(CROSSCC)objcopy" --update-section .text=section_text.bin $(OUTPUT_FILE_NAME)-dfu.elf; + ln -sf $(OUTPUT_FILE_NAME)-dfu.bin bootloader-$(BOARD_LC).bin + ln -sf $(OUTPUT_FILE_NAME)-dfu.elf bootloader-$(BOARD_LC).elf # Compiler targets %.o: %.c -- To view, visit https://gerrit.osmocom.org/c/osmo-asf4-dfu/+/39787?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-asf4-dfu Gerrit-Branch: master Gerrit-Change-Id: I767d3b99840eba5e1b395079c878dcbae78b08a0 Gerrit-Change-Number: 39787 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>