From 3d804dd7ca6e2513de54e4c6d680f2fdc7594c90 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Thu, 26 Jan 2017 16:34:40 -0500
Subject: [PATCH] cmake nuttx simple binary naming

---
 Tools/s3put.sh                    | 3 +--
 src/firmware/nuttx/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Tools/s3put.sh b/Tools/s3put.sh
index 34a04fdf76..80a2c05f90 100755
--- a/Tools/s3put.sh
+++ b/Tools/s3put.sh
@@ -13,8 +13,7 @@ filename=${1}
 
 if [ -f ${filename} ]; then
 	base_file_name=`basename $filename`
-	short_file_name=${base_file_name#nuttx-}
-	s3cmd --access_key=${AWS_ACCESS_KEY_ID} --secret_key=${AWS_SECRET_ACCESS_KEY} put ${filename} s3://${AWS_S3_BUCKET}/${short_file_name}
+	s3cmd --access_key=${AWS_ACCESS_KEY_ID} --secret_key=${AWS_SECRET_ACCESS_KEY} put ${filename} s3://${AWS_S3_BUCKET}/${base_file_name}
 else
 	echo "ERROR: ${file} doesn't exist"
 	exit 1
diff --git a/src/firmware/nuttx/CMakeLists.txt b/src/firmware/nuttx/CMakeLists.txt
index 0167bc4329..420d200fe9 100644
--- a/src/firmware/nuttx/CMakeLists.txt
+++ b/src/firmware/nuttx/CMakeLists.txt
@@ -96,7 +96,7 @@ if(NOT ${BOARD} STREQUAL "sim")
 	endif()
 
 	set(fw_file
-		${CMAKE_CURRENT_BINARY_DIR}/${OS}-${BOARD}-${LABEL}.px4)
+		${CMAKE_CURRENT_BINARY_DIR}/${BOARD}_${LABEL}.px4)
 
 #
 # Bootloaders do not need .px4 or xml