rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/os/OP-893_remove-firmware-from-package' into next

Browse Source
This commit is contained in:
Oleg Semyonov 2013-05-28 14:56:05 +02:00
commit dcc9425b7e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -764,7 +764,7 @@ package: all_fw all_ground uavobjects_matlab
$(V1) [ ! -d "$(PACKAGE_DIR)" ] || $(RM) -rf "$(PACKAGE_DIR)"
$(V1) $(MKDIR) -p "$(PACKAGE_DIR)/firmware"
$(foreach fw_targ, $(PACKAGE_FW_TARGETS), $(call COPY_FW_FILES,$(fw_targ),.opfw,.opfw))
$(foreach fw_targ, $(PACKAGE_ELF_TARGETS), $(call COPY_FW_FILES,$(fw_targ),.elf,))
$(foreach fw_targ, $(PACKAGE_ELF_TARGETS), $(call COPY_FW_FILES,$(fw_targ),.elf,.elf))
$(MAKE) --no-print-directory -C $(ROOT_DIR)/package --file=$(UNAME).mk $@
##############################

2
package/linux/deb_common/rules
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

2
package/osx/package
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}"

2
package/winx86/openpilotgcs.nsi
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