1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00

OP-893: do not include *.opfw firmware files into package

Now GCS has all firmware embedded and available through the Vehicle Setup
Wizard or Auto-Update function. Hence it is not necessary to include
another copies of the same files. But the code to do this is kept because
later we will include sim targets as firmware. Linux version does include
it already, OSX and Windows should follow.
This commit is contained in:
Oleg Semyonov 2013-05-26 22:47:43 +03:00
parent 78dda599f5
commit b6d3b2ac22
3 changed files with 3 additions and 3 deletions

View File

@ -43,7 +43,7 @@ install:
cp -arp package/linux/openpilot_menu.menu debian/openpilot/etc/xdg/menus/applications-merged
cp -arp package/linux/openpilot_menu.directory debian/openpilot/usr/share/desktop-directories
ifdef PACKAGE_DIR
cp -a $(PACKAGE_DIR)/* debian/openpilot/usr/local/OpenPilot/firmware/
cp -a $(PACKAGE_DIR)/*.elf debian/openpilot/usr/local/OpenPilot/firmware/
else
$(error PACKAGE_DIR not defined! $(PACKAGE_DIR))
endif

View File

@ -20,7 +20,7 @@ device=$(hdiutil attach "${TEMP_FILE}" | \
# packaging goes here
cp -a "${APP_PATH}" "/Volumes/${VOL_NAME}"
ls "${FW_DIR}" | xargs -n 1 -I {} cp "${FW_DIR}/{}" "/Volumes/${VOL_NAME}/Firmware"
#ls "${FW_DIR}" | xargs -n 1 -I {} cp "${FW_DIR}/{}" "/Volumes/${VOL_NAME}/Firmware"
cp "${BUILD_DIR}/uavobject-synthetics/matlab/OPLogConvert.m" "/Volumes/${VOL_NAME}/Utilities"
cp "${ROOT_DIR}/HISTORY.txt" "/Volumes/${VOL_NAME}"

View File

@ -202,7 +202,7 @@ Section "-Localization" InSecLocalization
SectionEnd
; Copy firmware files
Section "Firmware" InSecFirmware
Section /o "-Firmware" InSecFirmware
SetOutPath "$INSTDIR\firmware"
File /r "${PACKAGE_DIR}\${FIRMWARE_DIR}\*"
SectionEnd