mirror of https://gerrit.osmocom.org/simtrace2
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
This commit is contained in:
parent
b1a81c130e
commit
d14970f95b
|
@ -64,7 +64,8 @@ if [ "x$publish" = "x--publish" ]; then
|
|||
[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} binaries@rita.osmocom.org:web-files/simtrace2/firmware/
|
||||
rsync --archive --verbose --compress --delete --rsh "$SSH_COMMAND" $TOPDIR/firmware/bin/*-latest.{bin,elf} binaries@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} binaries@rita.osmocom.org:web-files/simtrace2/firmware/all/
|
||||
fi
|
||||
|
||||
echo
|
||||
|
|
|
@ -44,8 +44,8 @@ MEMORIES ?= flash dfu
|
|||
# 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 @@ ALLOW_PEER_ERASE?=0
|
|||
# Optimization level, put in comment for debugging
|
||||
OPTIMIZATION ?= -Os
|
||||
|
||||
|
||||
|
||||
# Flags
|
||||
INCLUDES_USB = -I$(AT91LIB)/usb/include -I$(AT91LIB)
|
||||
|
||||
|
@ -173,8 +171,7 @@ ASFLAGS = -mcpu=cortex-m3 -mthumb -Wall -g $(OPTIMIZATION) $(INCLUDES) -D$(CHIP)
|
|||
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 @@ ASM_OBJECTS_$(1) = $(addprefix $(OBJ)/$(1)_, $(ASM_OBJECTS))
|
|||
|
||||
$(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)
|
||||
|
|
Loading…
Reference in New Issue