diff --git a/Makefile b/Makefile index 3c491dea6..30e721747 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),de # Make sure this isn't being run as root unless installing (no whoami on Windows, but that is ok here) ifeq ($(shell whoami 2>/dev/null),root) - ifeq ($(filter install install_qt,$(MAKECMDGOALS)),) + ifeq ($(filter install all_clean,$(MAKECMDGOALS)),) $(error You should not be running this as root) endif endif @@ -783,9 +783,6 @@ ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),) export PACKAGE_NAME := OpenPilot export PACKAGE_SEP := - - # Copy the Qt libraries regardless whether the building machine needs them to run GCS - export FORCE_COPY_QT := true - # We can only package release builds ifneq ($(GCS_BUILD_CONF),release) $(error Packaging is currently supported for release builds only) @@ -950,13 +947,6 @@ install: $(V1) rm $(DESTDIR)/$(datadir)/openpilotgcs/translations/Makefile -.PHONY: install_qt -install_qt: - @$(ECHO) " INSTALLING QT TO $(DESTDIR)/)" - $(V1) $(MKDIR) -p $(DESTDIR)$(libdir) - $(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/lib/qt5 $(DESTDIR)$(libdir) - - ############################## # # Help message, the default Makefile goal @@ -1094,7 +1084,6 @@ help: @$(ECHO) " opfw_resource - Generate resources to embed firmware binaries into the GCS" @$(ECHO) " dist - Generate source archive for distribution" @$(ECHO) " install - Install GCS to \"DESTDIR\" with prefix \"prefix\" (Linux only)" - @$(ECHO) " install_qt - Install QT to \"DESTDIR\" with prefix \"prefix\" (Linux only)" @$(ECHO) @$(ECHO) " [Code Formatting]" @$(ECHO) " uncrustify_ - Reformat code according to the project's standards" diff --git a/ground/openpilotgcs/openpilotgcs.pri b/ground/openpilotgcs/openpilotgcs.pri index 943dac262..e3da91f79 100644 --- a/ground/openpilotgcs/openpilotgcs.pri +++ b/ground/openpilotgcs/openpilotgcs.pri @@ -96,7 +96,15 @@ macx { copydata = 1 copyqt = 1 } else { + GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs + GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins + GCS_LIBEXEC_PATH = $$GCS_APP_PATH # FIXME + GCS_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs + GCS_DATA_BASENAME = share/openpilotgcs + GCS_DOC_PATH = $$GCS_BUILD_TREE/share/doc + !isEqual(GCS_SOURCE_TREE, $$GCS_BUILD_TREE):copydata = 1 + win32 { SDL_DIR = $$(SDL_DIR) isEmpty(SDL_DIR):SDL_DIR = $${TOOLS_DIR}/SDL-1.2.15 @@ -112,26 +120,18 @@ macx { copyqt = $$copydata } else { GCS_APP_TARGET = openpilotgcs - GCS_QT_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5 - GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins - GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml + GCS_QT_BASEPATH = $$GCS_LIBRARY_PATH/qt5 + GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib + GCS_QT_PLUGINS_PATH = $$GCS_QT_BASEPATH/plugins + GCS_QT_QML_PATH = $$GCS_QT_BASEPATH/qml QT_INSTALL_DIR = $$clean_path($$[QT_INSTALL_LIBS]/../../../..) equals(QT_INSTALL_DIR, $$TOOLS_DIR) { copyqt = 1 } else { - copyqt = 0 + copyqt = 0 } - - FORCE_COPY_QT = $$(FORCE_COPY_QT) - !isEmpty(FORCE_COPY_QT):copyqt = 1 } - GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs - GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins - GCS_LIBEXEC_PATH = $$GCS_APP_PATH # FIXME - GCS_DATA_PATH = $$GCS_BUILD_TREE/share/openpilotgcs - GCS_DATA_BASENAME = share/openpilotgcs - GCS_DOC_PATH = $$GCS_BUILD_TREE/share/doc } diff --git a/package/Linux.mk b/package/Linux.mk index 59145265a..0acb9d2d5 100644 --- a/package/Linux.mk +++ b/package/Linux.mk @@ -6,54 +6,22 @@ ifndef OPENPILOT_IS_COOL $(error Top level Makefile must be used to build this target) endif -# Update this number for every formal release. The Deb packaging system relies on this to know to update a -# package or not. Otherwise, the user has to uninstall first. -# 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_VER := $(PACKAGE_LBL)-1 +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)/ +SED_SCRIPT = s//$(DEB_VER)/;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)) +DEB_ARCH := $(shell dpkg --print-architecture) +DEB_PACKAGE_NAME := openpilot_$(DEB_VER)_$(DEB_ARCH) .PHONY: package -package: $(ALL_DEB_FILES) +package: $(V1) echo "Building Linux package, please wait..." - $(V1) mkdir -p $(DEB_BUILD_DIR) + $(V1) cp -rL $(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/deb_common/changelog deleted file mode 100644 index c6f9e1519..000000000 --- a/package/linux/deb_common/changelog +++ /dev/null @@ -1,5 +0,0 @@ -openpilot () unstable; urgency=low - - * Initial release (testing - unstable) - - -- naiiawah diff --git a/package/linux/deb_common/compat b/package/linux/deb_common/compat deleted file mode 100644 index 7f8f011eb..000000000 --- a/package/linux/deb_common/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/package/linux/deb_common/docs b/package/linux/deb_common/docs deleted file mode 100644 index e69de29bb..000000000 diff --git a/package/linux/deb_common/init.d.ex b/package/linux/deb_common/init.d.ex deleted file mode 100644 index fb3e26243..000000000 --- a/package/linux/deb_common/init.d.ex +++ /dev/null @@ -1,154 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: openpilot -# Required-Start: $network $local_fs -# Required-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: -# Description: -# <...> -# <...> -### END INIT INFO - -# Author: naiiawah - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin -DESC=openpilot # Introduce a short description here -NAME=openpilot # Introduce the short server's name here -DAEMON=/usr/sbin/openpilot # Introduce the server's location here -DAEMON_ARGS="" # Arguments to run the daemon with -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x $DAEMON ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $DAEMON_ARGS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" -} - -# -# Function that sends a SIGHUP to the daemon/service -# -do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $? - ;; - #reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - #log_daemon_msg "Reloading $DESC" "$NAME" - #do_reload - #log_end_msg $? - #;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 - exit 3 - ;; -esac - -: diff --git a/package/linux/deb_common/manpage.1.ex b/package/linux/deb_common/manpage.1.ex deleted file mode 100644 index 1d0199483..000000000 --- a/package/linux/deb_common/manpage.1.ex +++ /dev/null @@ -1,59 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.\" First parameter, NAME, should be all caps -.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -.\" other parameters are allowed: see man(7), man(1) -.TH OPENPILOT SECTION "October 27, 2011" -.\" Please adjust this date whenever revising the manpage. -.\" -.\" Some roff macros, for reference: -.\" .nh disable hyphenation -.\" .hy enable hyphenation -.\" .ad l left justify -.\" .ad b justify to both left and right margins -.\" .nf disable filling -.\" .fi enable filling -.\" .br insert line break -.\" .sp insert n+1 empty lines -.\" for manpage-specific macros, see man(7) -.SH NAME -openpilot \- program to do something -.SH SYNOPSIS -.B openpilot -.RI [ options ] " files" ... -.br -.B bar -.RI [ options ] " files" ... -.SH DESCRIPTION -This manual page documents briefly the -.B openpilot -and -.B bar -commands. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invode bold face and italics, -.\" respectively. -\fBopenpilot\fP is a program that... -.SH OPTIONS -These programs follow the usual GNU command line syntax, with long -options starting with two dashes (`-'). -A summary of options is included below. -For a complete description, see the Info files. -.TP -.B \-h, \-\-help -Show summary of options. -.TP -.B \-v, \-\-version -Show version of program. -.SH SEE ALSO -.BR bar (1), -.BR baz (1). -.br -The programs are documented fully by -.IR "The Rise and Fall of a Fooish Bar" , -available via the Info system. -.SH AUTHOR -openpilot was written by . -.PP -This manual page was written by naiiawah , -for the Debian project (and may be used by others). diff --git a/package/linux/deb_common/manpage.sgml.ex b/package/linux/deb_common/manpage.sgml.ex deleted file mode 100644 index 76b474e3e..000000000 --- a/package/linux/deb_common/manpage.sgml.ex +++ /dev/null @@ -1,154 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - FIRSTNAME"> - SURNAME"> - - October 27, 2011"> - - SECTION"> - naiiawah@none"> - - OPENPILOT"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2003 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - program to do something - - - - &dhpackage; - - - - - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage; and bar - commands. - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - Instead, it has documentation in the &gnu; - Info format; see below. - - &dhpackage; is a program that... - - - - OPTIONS - - These programs follow the usual &gnu; command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - Info files. - - - - - - - - Show summary of options. - - - - - - - - Show version of program. - - - - - - SEE ALSO - - bar (1), baz (1). - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - Info system. - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (and may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - - diff --git a/package/linux/deb_common/manpage.xml.ex b/package/linux/deb_common/manpage.xml.ex deleted file mode 100644 index b8c0d8411..000000000 --- a/package/linux/deb_common/manpage.xml.ex +++ /dev/null @@ -1,291 +0,0 @@ - -.
will be generated. You may view the -manual page with: nroff -man .
| less'. A typical entry -in a Makefile or Makefile.am is: - -DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/docbook-xsl/manpages/docbook.xsl -XP = xsltproc -''-nonet -''-param man.charmap.use.subset "0" - -manpage.1: manpage.xml - $(XP) $(DB2MAN) $< - -The xsltproc binary is found in the xsltproc package. The XSL files are in -docbook-xsl. A description of the parameters you can use can be found in the -docbook-xsl-doc-* packages. Please remember that if you create the nroff -version in one of the debian/rules file targets (such as build), you will need -to include xsltproc and docbook-xsl in your Build-Depends control field. -Alternatively use the xmlto command/package. That will also automatically -pull in xsltproc and docbook-xsl. - -Notes for using docbook2x: docbook2x-man does not automatically create the -AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as - ... . - -To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections -read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be -found in the docbook-xsl-doc-html package. - -Validation can be done using: `xmllint -''-noout -''-valid manpage.xml` - -General documentation about man-pages and man-page-formatting: -man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/ - ---> - - - - - - - - - - - - - -]> - - - - &dhtitle; - &dhpackage; - - - &dhfirstname; - &dhsurname; - Wrote this manpage for the Debian system. -
- &dhemail; -
- - - - 2007 - &dhusername; - - - This manual page was written for the Debian system - (and may be used by others). - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU General Public License, - Version 2 or (at your option) any later version published by - the Free Software Foundation. - On Debian systems, the complete text of the GNU General Public - License can be found in - /usr/share/common-licenses/GPL. - - - - &dhucpackage; - &dhsection; - - - &dhpackage; - program to do something - - - - &dhpackage; - - - - - - - - - this - - - - - - - - this - that - - - - - &dhpackage; - - - - - - - - - - - - - - - - - - - DESCRIPTION - This manual page documents briefly the - &dhpackage; and bar - commands. - This manual page was written for the Debian distribution - because the original program does not have a manual page. - Instead, it has documentation in the GNU - info - 1 - format; see below. - &dhpackage; is a program that... - - - OPTIONS - The program follows the usual GNU command line syntax, - with long options starting with two dashes (`-'). A summary of - options is included below. For a complete description, see the - - info - 1 - files. - - - - - - - Does this and that. - - - - - - - Show summary of options. - - - - - - - Show version of program. - - - - - - FILES - - - /etc/foo.conf - - The system-wide configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - ${HOME}/.foo.conf - - The per-user configuration file to control the - behaviour of &dhpackage;. See - - foo.conf - 5 - for further details. - - - - - - ENVIONMENT - - - FOO_CONF - - If used, the defined file is used as configuration - file (see also ). - - - - - - DIAGNOSTICS - The following diagnostics may be issued - on stderr: - - - Bad configuration file. Exiting. - - The configuration file seems to contain a broken configuration - line. Use the option, to get more info. - - - - - &dhpackage; provides some return codes, that can - be used in scripts: - - Code - Diagnostic - - 0 - Program exited successfully. - - - 1 - The configuration file seems to be broken. - - - - - - BUGS - The program is currently limited to only work - with the foobar library. - The upstreams BTS can be found - at . - - - SEE ALSO - - - bar - 1 - , - baz - 1 - , - foo.conf - 5 - - The programs are documented fully by The Rise and - Fall of a Fooish Bar available via the - info - 1 - system. - - - diff --git a/package/linux/deb_common/menu.ex b/package/linux/deb_common/menu.ex deleted file mode 100644 index c5a80a7bc..000000000 --- a/package/linux/deb_common/menu.ex +++ /dev/null @@ -1,2 +0,0 @@ -?package(openpilot):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\ - title="openpilot" command="/usr/bin/openpilot" diff --git a/package/linux/deb_common/openpilot.cron.d.ex b/package/linux/deb_common/openpilot.cron.d.ex deleted file mode 100644 index bc3507489..000000000 --- a/package/linux/deb_common/openpilot.cron.d.ex +++ /dev/null @@ -1,4 +0,0 @@ -# -# Regular cron jobs for the openpilot package -# -0 4 * * * root [ -x /usr/bin/openpilot_maintenance ] && /usr/bin/openpilot_maintenance diff --git a/package/linux/deb_common/openpilot.debhelper.log b/package/linux/deb_common/openpilot.debhelper.log deleted file mode 100644 index 34de80b19..000000000 --- a/package/linux/deb_common/openpilot.debhelper.log +++ /dev/null @@ -1,15 +0,0 @@ -dh_prep -dh_installdirs -dh_installchangelogs -dh_installdocs -dh_installexamples -dh_installman -dh_link -dh_strip -dh_compress -dh_fixperms -dh_installdeb -dh_shlibdeps -dh_gencontrol -dh_md5sums -dh_builddeb diff --git a/package/linux/deb_common/openpilot.default.ex b/package/linux/deb_common/openpilot.default.ex deleted file mode 100644 index 0b172a1fc..000000000 --- a/package/linux/deb_common/openpilot.default.ex +++ /dev/null @@ -1,10 +0,0 @@ -# Defaults for openpilot initscript -# sourced by /etc/init.d/openpilot -# installed at /etc/default/openpilot by the maintainer scripts - -# -# This is a POSIX shell fragment -# - -# Additional options that are passed to the Daemon. -DAEMON_OPTS="" diff --git a/package/linux/deb_common/openpilot.dirs b/package/linux/deb_common/openpilot.dirs deleted file mode 100644 index eeed699b2..000000000 --- a/package/linux/deb_common/openpilot.dirs +++ /dev/null @@ -1,6 +0,0 @@ -etc/xdg/menus/applications-merged -usr/share/applications -usr/share/pixmaps -usr/share/desktop-directories -usr/bin -usr/local/OpenPilot diff --git a/package/linux/deb_common/openpilot.doc-base.EX b/package/linux/deb_common/openpilot.doc-base.EX deleted file mode 100644 index 9e24da0dc..000000000 --- a/package/linux/deb_common/openpilot.doc-base.EX +++ /dev/null @@ -1,20 +0,0 @@ -Document: openpilot -Title: Debian openpilot Manual -Author: -Abstract: This manual describes what openpilot is - and how it can be used to - manage online manuals on Debian systems. -Section: unknown - -Format: debiandoc-sgml -Files: /usr/share/doc/openpilot/openpilot.sgml.gz - -Format: postscript -Files: /usr/share/doc/openpilot/openpilot.ps.gz - -Format: text -Files: /usr/share/doc/openpilot/openpilot.text.gz - -Format: HTML -Index: /usr/share/doc/openpilot/html/index.html -Files: /usr/share/doc/openpilot/html/*.html diff --git a/package/linux/deb_common/openpilot.substvars b/package/linux/deb_common/openpilot.substvars deleted file mode 100644 index 22a936a92..000000000 --- a/package/linux/deb_common/openpilot.substvars +++ /dev/null @@ -1,2 +0,0 @@ -shlibs:Depends=libc6, libgcc1, libgl1-mesa-glx | libgl1, libglu1-mesa | libglu1, libsdl1.2debian, libstdc++6, libudev0 | libudev1, libusb-1.0-0 -misc:Depends= diff --git a/package/linux/deb_common/openpilot.udev b/package/linux/deb_common/openpilot.udev deleted file mode 100644 index fdca37665..000000000 --- a/package/linux/deb_common/openpilot.udev +++ /dev/null @@ -1,41 +0,0 @@ -# Skip this section below if this device is not connected by USB -SUBSYSTEM!="usb", GOTO="op_rules_end" - -# OpenPilot openpilot flight control board -SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4117", GOTO="op_rules" -SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415a", GOTO="op_rules" - -# OpenPilot coptercontrol flight control board -SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415b", GOTO="op_rules" - -# OpenPilot OPLink Mini radio modem board -SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415c", GOTO="op_rules" - -# OpenPilot Revolution board -SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415e", GOTO="op_rules" - -# Other OpenPilot reserved pids -SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="415d", GOTO="op_rules" -SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4194", GOTO="op_rules" -SUBSYSTEM=="usb", ATTRS{idVendor}=="20a0", ATTRS{idProduct}=="4195", GOTO="op_rules" - - -# unprogrammed openpilot flight control board -SUBSYSTEM=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="5750", GOTO="op_rules" -# FTDI FT2232C Dual USB-UART/FIFO IC -SUBSYSTEM=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6010", GOTO="op_rules" -# Olimex Ltd. OpenOCD JTAG TINY -SUBSYSTEM=="usb", ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="0004", GOTO="op_rules" - -GOTO="op_rules_end" - -LABEL="op_rules" -# Allow any seated user to access the board. -# uaccess: modern ACL-enabled udev -# udev-acl: for Ubuntu 12.10 and older -TAG+="uaccess", TAG+="udev-acl" - -# Grant members of the "plugdev" group access to receiver (useful for SSH users) -#MODE="0664", GROUP="plugdev" - -LABEL="op_rules_end" diff --git a/package/linux/deb_common/postinst.ex b/package/linux/deb_common/postinst.ex deleted file mode 100644 index e8295471c..000000000 --- a/package/linux/deb_common/postinst.ex +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# postinst script for openpilot -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/package/linux/deb_common/postrm.ex b/package/linux/deb_common/postrm.ex deleted file mode 100644 index 7494eff83..000000000 --- a/package/linux/deb_common/postrm.ex +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# postrm script for openpilot -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/package/linux/deb_common/preinst.ex b/package/linux/deb_common/preinst.ex deleted file mode 100644 index 32ac40cc3..000000000 --- a/package/linux/deb_common/preinst.ex +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# preinst script for openpilot -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `install' -# * `install' -# * `upgrade' -# * `abort-upgrade' -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - install|upgrade) - ;; - - abort-upgrade) - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/package/linux/deb_common/prerm.ex b/package/linux/deb_common/prerm.ex deleted file mode 100644 index a46c87175..000000000 --- a/package/linux/deb_common/prerm.ex +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# prerm script for openpilot -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `upgrade' -# * `failed-upgrade' -# * `remove' `in-favour' -# * `deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - remove|upgrade|deconfigure) - ;; - - failed-upgrade) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/package/linux/deb_common/rules b/package/linux/deb_common/rules deleted file mode 100644 index eed06d551..000000000 --- a/package/linux/deb_common/rules +++ /dev/null @@ -1,78 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 - -# Uncomment this to turn on verbose mode. -# export DH_VERBOSE=1 - -# This has to be exported to make some magic below work. -export DH_OPTIONS=-v - -#%: -# dh $@ - -clean: - dh_testdir - dh_testroot - dh_clean - -install: - dh_testdir - dh_testroot - dh_prep - dh_installdirs - dh_installudev --priority=45 - # Add here commands to install the package into debian/ - cp -arp build/openpilotgcs_release/bin debian/openpilot/usr/local/OpenPilot - cp -arp build/openpilotgcs_release/lib debian/openpilot/usr/local/OpenPilot - cp -arp build/openpilotgcs_release/share debian/openpilot/usr/local/OpenPilot - cp -arp package/linux/qt.conf debian/openpilot/usr/local/OpenPilot/bin - cp -arp package/linux/openpilot.desktop debian/openpilot/usr/share/applications - cp -arp package/linux/openpilot.png debian/openpilot/usr/share/pixmaps - cp -arp package/linux/openpilot_menu.png debian/openpilot/usr/share/pixmaps - cp -arp package/linux/openpilot_menu.menu debian/openpilot/etc/xdg/menus/applications-merged - cp -arp package/linux/openpilot_menu.directory debian/openpilot/usr/share/desktop-directories - ln -s /usr/local/OpenPilot/bin/openpilotgcs `pwd`/debian/openpilot/usr/bin/openpilotgcs - rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/sounds/sounds - rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/pfd/pfd - rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/models/models - rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/mapicons/mapicons - rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/dials/dials - rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/diagrams/diagrams -# Removing leaked files from the dist - find debian/openpilot -name Makefile -exec rm -f {} \; - -# Build architecture-independent files here. -binary-indep: install - -# We have nothing to build by default. Got taken care of by OPs build system -# Build architecture-dependent files here. -binary-arch: install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps -l/usr/local/OpenPilot/lib/openpilotgcs:/usr/local/OpenPilot/lib/qt5 --dpkg-shlibdeps-params="--ignore-missing-info -v" - dh_gencontrol - dh_md5sums - dh_builddeb -- -Zbzip2 - -binary: binary-indep binary-arch - -.PHONY: clean binary-indep binary-arch binary install - diff --git a/package/linux/deb_common/watch.ex b/package/linux/deb_common/watch.ex deleted file mode 100644 index 7e9872e99..000000000 --- a/package/linux/deb_common/watch.ex +++ /dev/null @@ -1,23 +0,0 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file -version=3 - -# Uncomment to examine a Webpage -# -#http://www.example.com/downloads.php openpilot-(.*)\.tar\.gz - -# Uncomment to examine a Webserver directory -#http://www.example.com/pub/openpilot-(.*)\.tar\.gz - -# Uncommment to examine a FTP server -#ftp://ftp.example.com/pub/openpilot-(.*)\.tar\.gz debian uupdate - -# Uncomment to find new files on sourceforge, for devscripts >= 2.9 -# http://sf.net/openpilot/openpilot-(.*)\.tar\.gz - -# Uncomment to find new files on GooglePages -# http://example.googlepages.com/foo.html openpilot-(.*)\.tar\.gz diff --git a/package/linux/debian/changelog b/package/linux/debian/changelog new file mode 100644 index 000000000..9c205bb68 --- /dev/null +++ b/package/linux/debian/changelog @@ -0,0 +1,5 @@ +openpilot () unstable; urgency=low + + * Release from upstream Git (testing - unstable) + + -- James Duley diff --git a/package/linux/debian/compat b/package/linux/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/package/linux/debian/compat @@ -0,0 +1 @@ +9 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..3ac0c681a 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/debian/openpilot.udev b/package/linux/debian/openpilot.udev new file mode 120000 index 000000000..8f7360cfa --- /dev/null +++ b/package/linux/debian/openpilot.udev @@ -0,0 +1 @@ +../45-openpilot-permissions.rules \ No newline at end of file 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/debian/rules b/package/linux/debian/rules new file mode 100644 index 000000000..7bcf5650a --- /dev/null +++ b/package/linux/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + + +%: + dh $@ + +# Disabled because OpenPilot makefile cleans and builds. +override_dh_auto_clean: + #$(MAKE) all_clean + +override_dh_auto_build: + #dh_auto_build -- all + +override_dh_auto_test: + # Fails non-silently because it is run under fakeroot. + +override_dh_auto_install: + dh_auto_install -- prefix=/usr diff --git a/package/linux/openpilot_menu.directory b/package/linux/openpilot_menu.directory deleted file mode 100644 index 7175a8915..000000000 --- a/package/linux/openpilot_menu.directory +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Directory -Encoding=UTF-8 -Name=OpenPilot -Icon=openpilot_menu.png diff --git a/package/linux/openpilot_menu.menu b/package/linux/openpilot_menu.menu deleted file mode 100644 index 9e35577ec..000000000 --- a/package/linux/openpilot_menu.menu +++ /dev/null @@ -1,12 +0,0 @@ - - - Applications - - OpenPilot - openpilot_menu.directory - - OpenPilotMenu - - - diff --git a/package/linux/openpilot_menu.png b/package/linux/openpilot_menu.png deleted file mode 100644 index b5e10befa..000000000 Binary files a/package/linux/openpilot_menu.png and /dev/null differ