Updated so it works now that pymavlink is a sub-module of mavlink.

2 files changed, 16 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fe83d55dc02f..4fa4dcb56f9c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Apr  5 04:08:20 UTC 2016
+# Sat Oct  1 17:13:59 UTC 2016
 pkgbase = python2-pymavlink-git
 	pkgdesc = Python bindings for MAVLink micro air vehicle marshalling / communication library.
-	pkgver = r1866.4a85883
+	pkgver = r2072.984cbd2
 	pkgrel = 1
 	url = http://qgroundcontrol.org/mavlink/start
 	arch = any
@@ -12,6 +12,8 @@ pkgbase = python2-pymavlink-git
 	provides = python2-pymavlink
 	conflicts = python2-pymavlink
 	source = git+https://github.com/mavlink/mavlink.git
+	source = git+https://github.com/ArduPilot/pymavlink.git
+	sha256sums = SKIP
 	sha256sums = SKIP
 
 pkgname = python2-pymavlink-git
diff --git a/PKGBUILD b/PKGBUILD
index 1d3d6a6a6629..54836c142fd5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname="python2-pymavlink"
 pkgname="$_pkgname-git"
-pkgver=r1866.4a85883
+pkgver=r2072.984cbd2
 pkgrel=1
 pkgdesc="Python bindings for MAVLink micro air vehicle marshalling / communication library."
 arch=('any')
@@ -12,11 +12,19 @@ depends=('python2-pyserial')
 makedepends=('git')
 provides=($_pkgname)
 conflicts=($_pkgname)
-source=("git+https://github.com/mavlink/mavlink.git")
-sha256sums=('SKIP')
+source=("git+https://github.com/mavlink/mavlink.git"
+        "git+https://github.com/ArduPilot/pymavlink.git")
+sha256sums=('SKIP' 'SKIP')
 
-pkgver() {
+prepare() {
   cd "mavlink"
+  git submodule init
+  git config submodule.pymavlink.url "$srcdir/pymavlink"
+  git submodule update
+}
+
+pkgver() {
+  cd "mavlink/pymavlink"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }