mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-01 09:24:10 +01:00
Fixed borkage in the rules file where the if test was malformed. Added
a change to force an error if the passed in ENV var is not defined. If that had been there, the borkage wouldn't have been undetected. Changed to only put the main FW in the firmware dir, instead of BL and FW.
This commit is contained in:
parent
f136f3d956
commit
6c38114cfc
@ -49,7 +49,7 @@ linux_deb_package: deb_build gcs
|
||||
|
||||
deb_build: | $(DEB_BUILD_DIR) $(ALL_DEB_FILES) $(BUILD_DIR)/build
|
||||
@echo $@ starting
|
||||
$(V1)$(shell echo $(PACKAGE_DIR) > $(BUILD_DIR)/package_dir)
|
||||
$(V1)$(shell echo $(FW_DIR) > $(BUILD_DIR)/package_dir)
|
||||
$(V1)sed -i -e "$(SED_SCRIPT)" $(DEB_BUILD_DIR)/changelog
|
||||
|
||||
$(BUILD_DIR)/build: package_flight
|
||||
|
6
package/linux/deb_common/rules
Executable file → Normal file
6
package/linux/deb_common/rules
Executable file → Normal file
@ -43,8 +43,10 @@ install:
|
||||
cp -arp package/linux/openpilot_menu.png debian/openpilot/usr/share/pixmaps
|
||||
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 -ar $(PACKAGE_DIR)/* debian/openpilot/usr/local/OpenPilot/firmware/
|
||||
ifdef PACKAGE_DIR
|
||||
cp -a $(PACKAGE_DIR)/*.opfw debian/openpilot/usr/local/OpenPilot/firmware/
|
||||
else
|
||||
$(error PACKAGE_DIR not defined! $(PACKAGE_DIR))
|
||||
endif
|
||||
ln -s /usr/local/OpenPilot/bin/openpilotgcs.bin `pwd`/debian/openpilot/usr/bin/openpilot-gcs
|
||||
rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/sounds/sounds
|
||||
|
Loading…
Reference in New Issue
Block a user