rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

LP-80 extend linux packaging: rework distro selection

Browse Source 
Change-Id: I476f52296de254b3b04a200c14a3924a2832e452
This commit is contained in:
James Duley 2015-08-01 09:30:28 +01:00
parent 7bb70e203a
commit 8714a34238
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/Linux.mk
View File

@ -7,17 +7,13 @@ ifndef TOP_LEVEL_MAKEFILE
endif endif
# Are we using a debian based distro? # Are we using a debian based distro?
ifneq ($(shell which dpkg 2> /dev/null),) ifneq ($(wildcard /etc/apt/sources.list),)
include $(ROOT_DIR)/package/linux/deb.mk include $(ROOT_DIR)/package/linux/deb.mk
endif
# Are we using a rpm based distro? # Are we using a rpm based distro?
ifneq ($(shell which rpm 2> /dev/null),) else ifneq ($(wildcard /etc/yum.repos.d/*),)
include $(ROOT_DIR)/package/linux/rpm.mk include $(ROOT_DIR)/package/linux/rpm.mk
endif
# Are we using an Arch based distro? # Are we using an Arch based distro?
ifneq ($(shell which makepkg 2> /dev/null),) else ifneq ($(wildcard /etc/pacman.conf),)
$(info TODO: built in arch package) $(info TODO: built in arch package)
endif endif

10
package/linux/rpmspec.in
View File

@ -1,7 +1,7 @@
Name: <NAME> Name: <NAME>
Summary: Ground Control Station Summary: Ground Control Station
Version: <VERSION> Version: <VERSION>
Release: <RELEASE> Release: <RELEASE>%{?dist}
Group: Applications/Scientific Group: Applications/Scientific
License: GPLv3+ License: GPLv3+
@ -49,12 +49,11 @@ and ease of use.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n <ARCHIVE_PREFIX>
%build %build
make %{?_smp_mflags} gcs QMAKE=qmake-qt5 CC=%{__cc} CXX=%{__cxx} libbasename=%{_lib} make %{?_smp_mflags} gcs QMAKE=qmake-qt5 CC=%{__cc} CXX=%{__cxx} libbasename=%{_lib}
#make -j1 opfw_resource
%install %install
@ -75,11 +74,12 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%doc README.txt GPLv3.txt %doc README.md CREDITS.txt WHATSNEW.txt
%doc GPLv3.txt
%{_bindir}/librepilot-gcs %{_bindir}/librepilot-gcs
%{_udevrulesdir}/45-librepilot.rules %{_udevrulesdir}/45-librepilot.rules
%{_datadir}/applications/librepilot.desktop %{_datadir}/applications/librepilot.desktop
%{_datadir}/librepilot-gcs//* %{_datadir}/librepilot-gcs/*
%{_datadir}/pixmaps/librepilot.png %{_datadir}/pixmaps/librepilot.png
%{_libdir}/librepilot-gcs/plugins/OpenPilot/*.pluginspec %{_libdir}/librepilot-gcs/plugins/OpenPilot/*.pluginspec
%{_libdir}/librepilot-gcs/plugins/OpenPilot/*.so %{_libdir}/librepilot-gcs/plugins/OpenPilot/*.so