From f3ebed43ad59fa27915584ff12c9d679013df7fc Mon Sep 17 00:00:00 2001 From: James Duley Date: Fri, 9 Jan 2015 11:05:29 +1300 Subject: [PATCH] OP-1666_deb_tidy: removes spilt arch control file --- package/Linux.mk | 34 +++---------------- package/linux/deb_amd64/control | 15 -------- .../linux/{deb_common => debian}/changelog | 0 package/linux/{deb_common => debian}/compat | 0 package/linux/{deb_i386 => debian}/control | 10 +++--- .../linux/{deb_common => debian}/copyright | 0 package/linux/{deb_common => debian}/docs | 0 .../linux/{deb_common => debian}/init.d.ex | 0 .../linux/{deb_common => debian}/manpage.1.ex | 0 .../{deb_common => debian}/manpage.sgml.ex | 0 .../{deb_common => debian}/manpage.xml.ex | 0 package/linux/{deb_common => debian}/menu.ex | 0 .../openpilot.cron.d.ex | 0 .../openpilot.debhelper.log | 0 .../openpilot.default.ex | 0 .../{deb_common => debian}/openpilot.dirs | 0 .../openpilot.doc-base.EX | 0 .../openpilot.substvars | 0 .../{deb_common => debian}/openpilot.udev | 0 package/linux/{deb_common => debian}/postinst | 0 .../linux/{deb_common => debian}/postinst.ex | 0 .../linux/{deb_common => debian}/postrm.ex | 0 .../linux/{deb_common => debian}/preinst.ex | 0 package/linux/{deb_common => debian}/prerm.ex | 0 package/linux/{deb_common => debian}/rules | 0 package/linux/{deb_common => debian}/watch.ex | 0 26 files changed, 10 insertions(+), 49 deletions(-) delete mode 100644 package/linux/deb_amd64/control rename package/linux/{deb_common => debian}/changelog (100%) rename package/linux/{deb_common => debian}/compat (100%) rename package/linux/{deb_i386 => debian}/control (68%) rename package/linux/{deb_common => debian}/copyright (100%) rename package/linux/{deb_common => debian}/docs (100%) rename package/linux/{deb_common => debian}/init.d.ex (100%) rename package/linux/{deb_common => debian}/manpage.1.ex (100%) rename package/linux/{deb_common => debian}/manpage.sgml.ex (100%) rename package/linux/{deb_common => debian}/manpage.xml.ex (100%) rename package/linux/{deb_common => debian}/menu.ex (100%) rename package/linux/{deb_common => debian}/openpilot.cron.d.ex (100%) rename package/linux/{deb_common => debian}/openpilot.debhelper.log (100%) rename package/linux/{deb_common => debian}/openpilot.default.ex (100%) rename package/linux/{deb_common => debian}/openpilot.dirs (100%) rename package/linux/{deb_common => debian}/openpilot.doc-base.EX (100%) rename package/linux/{deb_common => debian}/openpilot.substvars (100%) rename package/linux/{deb_common => debian}/openpilot.udev (100%) rename package/linux/{deb_common => debian}/postinst (100%) rename package/linux/{deb_common => debian}/postinst.ex (100%) rename package/linux/{deb_common => debian}/postrm.ex (100%) rename package/linux/{deb_common => debian}/preinst.ex (100%) rename package/linux/{deb_common => debian}/prerm.ex (100%) rename package/linux/{deb_common => debian}/rules (100%) rename package/linux/{deb_common => debian}/watch.ex (100%) diff --git a/package/Linux.mk b/package/Linux.mk index 59145265a..85b0b50ed 100644 --- a/package/Linux.mk +++ b/package/Linux.mk @@ -11,49 +11,25 @@ endif # Until we do that, package name does NOT include $(VERNUM) and uses $(PACKAGE_LBL) only VERNUM := 0.1.0 VERSION_FULL := $(VERNUM)-$(PACKAGE_LBL) +DEB_DIR := $(ROOT_DIR)/package/linux/debian DEB_BUILD_DIR := $(ROOT_DIR)/debian SED_DATE_STRG = $(shell date -R) SED_SCRIPT = s//$(VERNUM)/;s//$(SED_DATE_STRG)/ -DEB_CFG_CMN := $(ROOT_DIR)/package/linux/deb_common -DEB_CFG_I386_DIR := $(ROOT_DIR)/package/linux/deb_i386 -DEB_CFG_AMD64_DIR := $(ROOT_DIR)/package/linux/deb_amd64 -DEB_CFG_CMN_FILES := $(shell ls $(DEB_CFG_CMN)) -DEB_CFG_I386_FILES := $(shell ls $(DEB_CFG_I386_DIR)) -DEB_CFG_AMD64_FILES := $(shell ls $(DEB_CFG_AMD64_DIR)) - DEB_PLATFORM := amd64 -DEB_MACHINE_DIR := $(DEB_CFG_AMD64_DIR) -DEB_MACHINE_FILES := $(DEB_CFG_AMD64_FILES) MACHINE_TYPE := $(shell uname -m) ifneq ($(MACHINE_TYPE), x86_64) DEB_PLATFORM := i386 - DEB_MACHINE_DIR := $(DEB_CFG_I386_DIR) - DEB_MACHINE_FILES := $(DEB_CFG_I386_FILES) endif DEB_PACKAGE_NAME := openpilot_$(VERNUM)_$(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)) .PHONY: package -package: $(ALL_DEB_FILES) +package: $(V1) echo "Building Linux package, please wait..." - $(V1) mkdir -p $(DEB_BUILD_DIR) + $(V1) cp -r $(DEB_DIR) $(DEB_BUILD_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)/$(FULL_PACKAGE_NAME).deb - $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).changes $(BUILD_DIR)/$(FULL_PACKAGE_NAME).changes + $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(BUILD_DIR)/$(DEB_PACKAGE_NAME).deb + $(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).changes $(BUILD_DIR)/$(DEB_PACKAGE_NAME).changes $(V1) rm -rf $(DEB_BUILD_DIR) - -define CP_DEB_FILES_TEMPLATE -.PHONY: $(2)/$(1) -$(2)/$(1): $(3)/$(1) - $(V1) mkdir -p $(2) - $(V1) cp -a $$< $$@ -endef - -$(foreach cpfile, $(DEB_CFG_CMN_FILES), $(eval $(call CP_DEB_FILES_TEMPLATE,$(cpfile),$(DEB_BUILD_DIR),$(DEB_CFG_CMN)))) -$(foreach cpfile, $(DEB_MACHINE_FILES), $(eval $(call CP_DEB_FILES_TEMPLATE,$(cpfile),$(DEB_BUILD_DIR),$(DEB_MACHINE_DIR)))) diff --git a/package/linux/deb_amd64/control b/package/linux/deb_amd64/control deleted file mode 100644 index 4e76e63b3..000000000 --- a/package/linux/deb_amd64/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: openpilot -Section: unknown -Priority: extra -Maintainer: naiiawah -Build-Depends: debhelper (>= 7.0.50~) -Standards-Version: 3.8.4 -Homepage: http://www.openpilot.org -Vcs-Git: git://git.openpilot.org/OpenPilot.git -Vcs-Browser: http://git.openpilot.org/changelog/OpenPilot - -Package: openpilot -Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: OpenPilot GCS - OpenPilot Ground Control Station software diff --git a/package/linux/deb_common/changelog b/package/linux/debian/changelog similarity index 100% rename from package/linux/deb_common/changelog rename to package/linux/debian/changelog diff --git a/package/linux/deb_common/compat b/package/linux/debian/compat similarity index 100% rename from package/linux/deb_common/compat rename to package/linux/debian/compat diff --git a/package/linux/deb_i386/control b/package/linux/debian/control similarity index 68% rename from package/linux/deb_i386/control rename to package/linux/debian/control index cd59b4114..4d8bbb155 100644 --- a/package/linux/deb_i386/control +++ b/package/linux/debian/control @@ -1,15 +1,15 @@ Source: openpilot Section: unknown -Priority: extra -Maintainer: naiiawah -Build-Depends: debhelper (>= 7.0.50~) -Standards-Version: 3.8.4 +Priority: optional +Maintainer: James Duley +Build-Depends: debhelper (>= 8.0.0) +Standards-Version: 3.9.4 Homepage: http://www.openpilot.org Vcs-Git: git://git.openpilot.org/OpenPilot.git Vcs-Browser: http://git.openpilot.org/changelog/OpenPilot Package: openpilot -Architecture: i386 +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: OpenPilot GCS OpenPilot Ground Control Station software diff --git a/package/linux/deb_common/copyright b/package/linux/debian/copyright similarity index 100% rename from package/linux/deb_common/copyright rename to package/linux/debian/copyright diff --git a/package/linux/deb_common/docs b/package/linux/debian/docs similarity index 100% rename from package/linux/deb_common/docs rename to package/linux/debian/docs diff --git a/package/linux/deb_common/init.d.ex b/package/linux/debian/init.d.ex similarity index 100% rename from package/linux/deb_common/init.d.ex rename to package/linux/debian/init.d.ex diff --git a/package/linux/deb_common/manpage.1.ex b/package/linux/debian/manpage.1.ex similarity index 100% rename from package/linux/deb_common/manpage.1.ex rename to package/linux/debian/manpage.1.ex diff --git a/package/linux/deb_common/manpage.sgml.ex b/package/linux/debian/manpage.sgml.ex similarity index 100% rename from package/linux/deb_common/manpage.sgml.ex rename to package/linux/debian/manpage.sgml.ex diff --git a/package/linux/deb_common/manpage.xml.ex b/package/linux/debian/manpage.xml.ex similarity index 100% rename from package/linux/deb_common/manpage.xml.ex rename to package/linux/debian/manpage.xml.ex diff --git a/package/linux/deb_common/menu.ex b/package/linux/debian/menu.ex similarity index 100% rename from package/linux/deb_common/menu.ex rename to package/linux/debian/menu.ex diff --git a/package/linux/deb_common/openpilot.cron.d.ex b/package/linux/debian/openpilot.cron.d.ex similarity index 100% rename from package/linux/deb_common/openpilot.cron.d.ex rename to package/linux/debian/openpilot.cron.d.ex diff --git a/package/linux/deb_common/openpilot.debhelper.log b/package/linux/debian/openpilot.debhelper.log similarity index 100% rename from package/linux/deb_common/openpilot.debhelper.log rename to package/linux/debian/openpilot.debhelper.log diff --git a/package/linux/deb_common/openpilot.default.ex b/package/linux/debian/openpilot.default.ex similarity index 100% rename from package/linux/deb_common/openpilot.default.ex rename to package/linux/debian/openpilot.default.ex diff --git a/package/linux/deb_common/openpilot.dirs b/package/linux/debian/openpilot.dirs similarity index 100% rename from package/linux/deb_common/openpilot.dirs rename to package/linux/debian/openpilot.dirs diff --git a/package/linux/deb_common/openpilot.doc-base.EX b/package/linux/debian/openpilot.doc-base.EX similarity index 100% rename from package/linux/deb_common/openpilot.doc-base.EX rename to package/linux/debian/openpilot.doc-base.EX diff --git a/package/linux/deb_common/openpilot.substvars b/package/linux/debian/openpilot.substvars similarity index 100% rename from package/linux/deb_common/openpilot.substvars rename to package/linux/debian/openpilot.substvars diff --git a/package/linux/deb_common/openpilot.udev b/package/linux/debian/openpilot.udev similarity index 100% rename from package/linux/deb_common/openpilot.udev rename to package/linux/debian/openpilot.udev diff --git a/package/linux/deb_common/postinst b/package/linux/debian/postinst similarity index 100% rename from package/linux/deb_common/postinst rename to package/linux/debian/postinst diff --git a/package/linux/deb_common/postinst.ex b/package/linux/debian/postinst.ex similarity index 100% rename from package/linux/deb_common/postinst.ex rename to package/linux/debian/postinst.ex diff --git a/package/linux/deb_common/postrm.ex b/package/linux/debian/postrm.ex similarity index 100% rename from package/linux/deb_common/postrm.ex rename to package/linux/debian/postrm.ex diff --git a/package/linux/deb_common/preinst.ex b/package/linux/debian/preinst.ex similarity index 100% rename from package/linux/deb_common/preinst.ex rename to package/linux/debian/preinst.ex diff --git a/package/linux/deb_common/prerm.ex b/package/linux/debian/prerm.ex similarity index 100% rename from package/linux/deb_common/prerm.ex rename to package/linux/debian/prerm.ex diff --git a/package/linux/deb_common/rules b/package/linux/debian/rules similarity index 100% rename from package/linux/deb_common/rules rename to package/linux/debian/rules diff --git a/package/linux/deb_common/watch.ex b/package/linux/debian/watch.ex similarity index 100% rename from package/linux/deb_common/watch.ex rename to package/linux/debian/watch.ex