diff --git a/package/Makefile.linux b/package/Makefile.linux index 7bb0afc99..fba2ef3ff 100644 --- a/package/Makefile.linux +++ b/package/Makefile.linux @@ -3,7 +3,7 @@ # define CP_DEB_FILES_TEMPLATE -.PHONY: $(1) +.PHONY: $(2)/$(1) $(2)/$(1): $(3)/$(1) $(V1)cp -a $$< $$@ endef @@ -40,18 +40,20 @@ ALL_DEB_FILES += $(foreach f, $(DEB_MACHINE_FILES), $(DEB_BUILD_DIR)/$(f)) DEB_PACKAGE_NAME := openpilot_$(VERSION_FULL)_$(DEB_PLATFORM) -linux_deb_package: gcs deb_build package_flight +linux_deb_package: deb_build gcs @echo $@ starting cd .. && dpkg-buildpackage -b $(V1)mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(BUILD_DIR) $(V1)mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).changes $(BUILD_DIR) $(V1)rm -rf $(DEB_BUILD_DIR) -deb_build: | $(DEB_BUILD_DIR) $(ALL_DEB_FILES) +deb_build: | $(DEB_BUILD_DIR) $(ALL_DEB_FILES) $(BUILD_DIR)/build @echo $@ starting $(V1)$(shell echo $(PACKAGE_DIR) > $(BUILD_DIR)/package_dir) $(V1)sed -i -e "$(SED_SCRIPT)" $(DEB_BUILD_DIR)/changelog +$(BUILD_DIR)/build: package_flight + $(DEB_BUILD_DIR): @echo $@ starting $(V1)mkdir -p $(DEB_BUILD_DIR) @@ -68,7 +70,6 @@ identify: @echo "" @echo "We are in the Linux Package Make system." @echo "" - $(V1)rm -rf $(DEB_BUILD_DIR) ground_package: | identify linux_deb_package diff --git a/package/linux/deb_amd64/control b/package/linux/deb_amd64/control index eab1547b1..c2408ee21 100644 --- a/package/linux/deb_amd64/control +++ b/package/linux/deb_amd64/control @@ -5,8 +5,8 @@ Maintainer: naiiawah Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.4 Homepage: http://www.openpilot.org -#Vcs-Git: git://git.debian.org/collab-maint/openpilot.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/openpilot.git;a=summary +Vcs-Git: git://git.openpilot.org/OpenPilot.git +Vcs-Browser: http://git.openpilot.org/changelog/OpenPilot Package: openpilot Architecture: amd64 diff --git a/package/linux/deb_i386/control b/package/linux/deb_i386/control index 7c274850c..e93d4f559 100644 --- a/package/linux/deb_i386/control +++ b/package/linux/deb_i386/control @@ -5,8 +5,8 @@ Maintainer: naiiawah Build-Depends: debhelper (>= 7.0.50~) Standards-Version: 3.8.4 Homepage: http://www.openpilot.org -#Vcs-Git: git://git.debian.org/collab-maint/openpilot.git -#Vcs-Browser: http://git.debian.org/?p=collab-maint/openpilot.git;a=summary +Vcs-Git: git://git.openpilot.org/OpenPilot.git +Vcs-Browser: http://git.openpilot.org/changelog/OpenPilot Package: openpilot Architecture: i386