1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00

Updates to fix review issues: -jX build issues fixes, updated URLs in

<processor_type>/control
This commit is contained in:
naiiawah 2011-12-21 22:18:08 -07:00
parent eac9f7a606
commit ed86805458
3 changed files with 9 additions and 8 deletions

View File

@ -3,7 +3,7 @@
# #
define CP_DEB_FILES_TEMPLATE define CP_DEB_FILES_TEMPLATE
.PHONY: $(1) .PHONY: $(2)/$(1)
$(2)/$(1): $(3)/$(1) $(2)/$(1): $(3)/$(1)
$(V1)cp -a $$< $$@ $(V1)cp -a $$< $$@
endef 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) DEB_PACKAGE_NAME := openpilot_$(VERSION_FULL)_$(DEB_PLATFORM)
linux_deb_package: gcs deb_build package_flight linux_deb_package: deb_build gcs
@echo $@ starting @echo $@ starting
cd .. && dpkg-buildpackage -b cd .. && dpkg-buildpackage -b
$(V1)mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(BUILD_DIR) $(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).changes $(BUILD_DIR)
$(V1)rm -rf $(DEB_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 @echo $@ starting
$(V1)$(shell echo $(PACKAGE_DIR) > $(BUILD_DIR)/package_dir) $(V1)$(shell echo $(PACKAGE_DIR) > $(BUILD_DIR)/package_dir)
$(V1)sed -i -e "$(SED_SCRIPT)" $(DEB_BUILD_DIR)/changelog $(V1)sed -i -e "$(SED_SCRIPT)" $(DEB_BUILD_DIR)/changelog
$(BUILD_DIR)/build: package_flight
$(DEB_BUILD_DIR): $(DEB_BUILD_DIR):
@echo $@ starting @echo $@ starting
$(V1)mkdir -p $(DEB_BUILD_DIR) $(V1)mkdir -p $(DEB_BUILD_DIR)
@ -68,7 +70,6 @@ identify:
@echo "" @echo ""
@echo "We are in the Linux Package Make system." @echo "We are in the Linux Package Make system."
@echo "" @echo ""
$(V1)rm -rf $(DEB_BUILD_DIR)
ground_package: | identify linux_deb_package ground_package: | identify linux_deb_package

View File

@ -5,8 +5,8 @@ Maintainer: naiiawah <naiiawah@openpilot.org>
Build-Depends: debhelper (>= 7.0.50~) Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://www.openpilot.org Homepage: http://www.openpilot.org
#Vcs-Git: git://git.debian.org/collab-maint/openpilot.git Vcs-Git: git://git.openpilot.org/OpenPilot.git
#Vcs-Browser: http://git.debian.org/?p=collab-maint/openpilot.git;a=summary Vcs-Browser: http://git.openpilot.org/changelog/OpenPilot
Package: openpilot Package: openpilot
Architecture: amd64 Architecture: amd64

View File

@ -5,8 +5,8 @@ Maintainer: naiiawah <naiiawah@openpilot.org>
Build-Depends: debhelper (>= 7.0.50~) Build-Depends: debhelper (>= 7.0.50~)
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Homepage: http://www.openpilot.org Homepage: http://www.openpilot.org
#Vcs-Git: git://git.debian.org/collab-maint/openpilot.git Vcs-Git: git://git.openpilot.org/OpenPilot.git
#Vcs-Browser: http://git.debian.org/?p=collab-maint/openpilot.git;a=summary Vcs-Browser: http://git.openpilot.org/changelog/OpenPilot
Package: openpilot Package: openpilot
Architecture: i386 Architecture: i386