From a407f0af318ef4f098f6582900be7368d2ae050b Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Tue, 11 Dec 2012 16:35:16 +0200 Subject: [PATCH] [OP-759] Rename Linux package file as a workaround We should reconsider the Linux packaging later. It creates files above the source tree directory, and that is not OK. But for now it should work as a temporary solution. --- package/Makefile.linux | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/package/Makefile.linux b/package/Makefile.linux index ab09cf962..d57d6dacf 100644 --- a/package/Makefile.linux +++ b/package/Makefile.linux @@ -28,7 +28,8 @@ DEB_PLATFORM := i386 DEB_MACHINE_DIR := $(DEB_CFG_I386_DIR) DEB_MACHINE_FILES := $(DEB_CFG_I386_FILES) endif -DEB_PACKAGE_NAME := $(PACKAGE_NAME)$(PACKAGE_SEP)$(PACKAGE_LBL)$(PACKAGE_SEP)$(DEB_PLATFORM) +DEB_PACKAGE_NAME := openpilot_$(PACKAGE_LBL)_$(DEB_PLATFORM) +FULL_PACKAGE_NAME := $(PACKAGE_NAME)$(PACKAGE_SEP)$(PACKAGE_LBL)$(PACKAGE_SEP)$(DEB_PLATFORM) ALL_DEB_FILES = $(foreach f, $(DEB_CFG_CMN_FILES), $(DEB_BUILD_DIR)/$(f)) ALL_DEB_FILES += $(foreach f, $(DEB_MACHINE_FILES), $(DEB_BUILD_DIR)/$(f)) @@ -39,8 +40,8 @@ linux_deb_package: $(ALL_DEB_FILES) gcs package_flight $(V1) $(shell echo $(FW_DIR) > $(BUILD_DIR)/package_dir) $(V1) sed -i -e "$(SED_SCRIPT)" $(DEB_BUILD_DIR)/changelog $(V1) cd .. && dpkg-buildpackage -b -us -uc - $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(BUILD_DIR) - $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).changes $(BUILD_DIR) + $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(BUILD_DIR)/$(FULL_PACKAGE_NAME).deb + $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).changes $(BUILD_DIR)/$(FULL_PACKAGE_NAME).changes $(V1) rm -rf $(DEB_BUILD_DIR) $(ALL_DEB_FILES): | uavobjects