mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-19 04:52:12 +01:00
Merged in filnet/librepilot/LP-404_make_librepilot_vendor_neutral (pull request #330)
LP-404 replace opfw_resource target with fw_resource
This commit is contained in:
commit
71e5d07db7
@ -10,7 +10,7 @@ build:
|
||||
- mingw32-make all_sdk_install
|
||||
- git config core.filemode false
|
||||
- mingw32-make build-info && cat build/build-info.txt
|
||||
- mingw32-make opfw_resource
|
||||
- mingw32-make fw_resource
|
||||
- mingw32-make gcs
|
||||
- mingw32-make package
|
||||
- mv `ls build/LibrePilot-*.exe` build/$$BRANCH-$$COMMIT-$$arch-package.exe
|
||||
|
@ -13,7 +13,7 @@ before_install:
|
||||
script:
|
||||
- make config_new CCACHE=ccache
|
||||
- make all_flight
|
||||
- make opfw_resource
|
||||
- make fw_resource
|
||||
- make gcs
|
||||
|
||||
git:
|
||||
|
@ -7,5 +7,5 @@ pipelines:
|
||||
- apt-get install -y libc6-i386 libudev-dev libusb-1.0-0-dev libsdl1.2-dev python libopenscenegraph-dev libosgearth-dev qt56-meta-minimal qt56svg qt56script qt56serialport qt56multimedia qt56translations qt56tools
|
||||
- make build_sdk_install
|
||||
- make all_flight
|
||||
- make opfw_resource
|
||||
- make fw_resource
|
||||
- make gcs
|
||||
|
@ -15,7 +15,7 @@ override_dh_auto_configure:
|
||||
$(MAKE) config_new WITH_PREBUILT_FW=$(CURDIR)/firmware
|
||||
|
||||
override_dh_auto_build:
|
||||
dh_auto_build -- opfw_resource gcs
|
||||
dh_auto_build -- fw_resource gcs
|
||||
|
||||
override_dh_auto_install:
|
||||
dh_auto_install -- prefix=/usr
|
||||
|
@ -61,7 +61,7 @@ make config_new \
|
||||
udevrulesdir=%{_udevrulesdir} \
|
||||
WITH_PREBUILT_FW=$(pwd)/build/firmware
|
||||
|
||||
make %{?_smp_mflags} opfw_resource gcs
|
||||
make %{?_smp_mflags} fw_resource gcs
|
||||
|
||||
|
||||
%install
|
||||
|
Loading…
x
Reference in New Issue
Block a user