Merged librepilot/librepilot into next

Makefile

@@ -157,7 +157,7 @@ all_clean:
 	@$(ECHO) " CLEAN      $(call toprel, $(BUILD_DIR))"
 	$(V1) [ ! -d "$(BUILD_DIR)" ] || $(RM) -rf "$(BUILD_DIR)"
 
-.PONY: clean
+.PHONY: clean
 clean: all_clean
 
 

package/Linux.mk

@@ -57,7 +57,7 @@ package: debian
 debian: $(DEB_DIR)
 	$(V1) rm -rf debian
 	$(V1) cp -r $(DEB_DIR) debian
-	$(V1) cp -T package/linux/45-openpilot-permissions.rules debian/$(DEB_NAME).udev
+	$(V1) cp -T package/linux/45-uav.rules debian/$(DEB_NAME).udev
 	$(V1) $(SED_SCRIPT) debian/changelog debian/control
 ifeq ($(DEB_DIST), trusty)
 	$(V1) sed -i -e "$(TRUSTY_DEPS_SED)" debian/control
@@ -81,10 +81,12 @@ endif # Debian based distro?
 # Install OpenPilot
 #
 ##############################
-prefix  := /usr/local
+enable-udev-rules ?= no
-bindir  := $(prefix)/bin
+prefix       := /usr/local
-libdir  := $(prefix)/lib
+bindir       := $(prefix)/bin
-datadir := $(prefix)/share
+libdir       := $(prefix)/lib
+datadir      := $(prefix)/share
+udevrulesdir := /etc/udev/rules.d
 
 INSTALL = cp -a --no-preserve=ownership
 LN = ln
@@ -106,4 +108,7 @@ install:
 
 	$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/openpilot.png $(DESTDIR)$(datadir)/pixmaps/$(ORG_SMALL_NAME).png
 
-
+ifneq ($(enable-udev-rules), no)
+	$(V1) $(MKDIR) -p $(DESTDIR)$(udevrulesdir)
+	$(V1) $(INSTALL) -T $(ROOT_DIR)/package/linux/45-uav.rules $(DESTDIR)$(udevrulesdir)/45-$(ORG_SMALL_NAME).rules
+endif

package/linux/librepilot.spec

@@ -0,0 +1,106 @@
+
+%global gitrev g07deb66
+
+Name:           LibrePilot
+Summary:        Ground Control Station
+Version:        0.0
+Release:        1.git%{gitrev}%{?dist}
+
+Group:          Applications/Scientific
+License:        GPLv3+
+URL:            http://forum.librepilot.org/
+
+Source0:        https://github.com/librepilot/%{name}/archive/%{name}-%{version}-%{gitrev}.tar.gz
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+
+BuildRequires:  libusbx-devel
+BuildRequires:  mesa-libGL-devel
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtdeclarative-devel
+BuildRequires:  qt5-qtmultimedia-devel
+BuildRequires:  qt5-qtquick1-devel
+BuildRequires:  qt5-qtscript-devel
+BuildRequires:  qt5-qtserialport-devel
+BuildRequires:  qt5-qtsvg-devel
+BuildRequires:  qt5-qttools-devel
+BuildRequires:  dwz
+BuildRequires:  pkgconfig
+BuildRequires:  python
+BuildRequires:  SDL-devel
+BuildRequires:  systemd-devel
+
+Requires:       libusbx
+Requires:       SDL
+Requires:       qt5-qtdeclarative
+Requires:       qt5-qtmultimedia
+Requires:       qt5-qtscript
+Requires:       qt5-qtserialport
+Requires:       qt5-qtsvg
+
+
+%description
+LibrePilot is a next-generation Open Source UAV autopilot created by the
+LibrePilot Community. It is a highly capable platform for
+multirotors, helicopters, fixed wing aircraft, and other vehicles.
+It has been designed from the ground up by a community of passionate developers
+from around the globe, with its core design principles being quality, safety,
+and ease of use. 
+
+
+%prep
+%setup -q -n %{name}-%{version}-%{gitrev}
+
+# Fix hardcoded paths
+sed -i 's!lib/$$GCS_SMALL_NAME!%{_lib}/$$GCS_SMALL_NAME!g' ground/openpilotgcs/openpilotgcs.pri
+sed -i 's!lib/$(GCS_SMALL_NAME!%{_lib}/$(GCS_SMALL_NAME!g' package/Linux.mk
+
+
+%build
+make %{?_smp_mflags} gcs QMAKE=qmake-qt5 CC=%{__cc} CXX=%{__cxx} libdir=%{_libdir}
+#make -j1 opfw_resource
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT \
+    prefix=%{_prefix} \
+    libdir=%{_libdir} \
+    enable-udev-rules=yes \
+    udevrulesdir=%{_udevrulesdir}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc README.txt GPLv3.txt
+%{_bindir}/librepilot-gcs
+%{_udevrulesdir}/45-librepilot.rules
+%{_datadir}/applications/librepilot.desktop
+%{_datadir}/librepilot-gcs//*
+%{_datadir}/pixmaps/librepilot.png
+%{_libdir}/librepilot-gcs/plugins/OpenPilot/*.pluginspec
+%{_libdir}/librepilot-gcs/plugins/OpenPilot/*.so
+#
+%{_libdir}/librepilot-gcs/libAggregation.so.1*
+%{_libdir}/librepilot-gcs/libExtensionSystem.so.1*
+%{_libdir}/librepilot-gcs/libGLC_lib.so.1*
+%{_libdir}/librepilot-gcs/libopmapwidget.so.1*
+%{_libdir}/librepilot-gcs/libQScienceSpinBox.so.1*
+%{_libdir}/librepilot-gcs/libQtConcurrent.so.1*
+%{_libdir}/librepilot-gcs/libQwt.so.1*
+%{_libdir}/librepilot-gcs/libsdlgamepad.so.1*
+%{_libdir}/librepilot-gcs/libUtils.so.1*
+%{_libdir}/librepilot-gcs/libVersionInfo.so.1*
+#
+%{_libdir}/librepilot-gcs/lib*.so
+
+
+%changelog