From 7170c835b7cadf03ec542e31805a38485dc40eab Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Thu, 22 Sep 2016 09:04:36 +0200 Subject: [PATCH] LP-404 replace opfw_resource target with fw_resource --- .drone.yml | 2 +- .travis.yml | 2 +- bitbucket-pipelines.yml | 2 +- package/linux/debian/rules | 2 +- package/linux/rpmspec.in | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3cc9d4365..b8f8c67b2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 diff --git a/.travis.yml b/.travis.yml index 06c8fe0e8..cb2c73948 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_install: script: - make config_new CCACHE=ccache - make all_flight - - make opfw_resource + - make fw_resource - make gcs git: diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index b73f5e6aa..7f75b1d65 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -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 diff --git a/package/linux/debian/rules b/package/linux/debian/rules index e636c8a1d..45b1cfe3d 100755 --- a/package/linux/debian/rules +++ b/package/linux/debian/rules @@ -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 diff --git a/package/linux/rpmspec.in b/package/linux/rpmspec.in index 35cbc4aca..1b4ac92a0 100644 --- a/package/linux/rpmspec.in +++ b/package/linux/rpmspec.in @@ -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