add pymavlink submodule

2 files changed, 18 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c0b0f937dc5a..0e3b5c496989 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mavlink
 	pkgdesc = Marshalling / communication library for drones.
 	pkgver = 1.0.12
-	pkgrel = 1
+	pkgrel = 2
 	url = https://mavlink.io
 	arch = i686
 	arch = x86_64
@@ -10,8 +10,9 @@ pkgbase = mavlink
 	depends = python
 	depends = python-future
 	depends = python-pymavlink
-	source = mavlink-1.0.12::https://github.com/mavlink/mavlink/archive/1.0.12.tar.gz
-	sha256sums = 940ac31416d826f959d7f62fd4696ce6f23cf3e8c71c80a678a33ad93b4bf66d
+	source = mavlink-1.0.12::git+https://github.com/mavlink/mavlink.git#tag=1.0.12
+	source = mavlink-pymavlink::git+https://github.com/ardupilot/pymavlink.git
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = mavlink
-
diff --git a/PKGBUILD b/PKGBUILD
index 86ad937df8bb..962aa504d98a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,23 @@ pkgver=1.0.12
 pkgdesc="Marshalling / communication library for drones."
 url='https://mavlink.io'
 arch=('i686' 'x86_64')
-pkgrel=1
+pkgrel=2
 license=('GPLv3')
 makedepends=('cmake')
 depends=('python' 'python-future' 'python-pymavlink')
 optdepends=()
-source=("${pkgname}-${pkgver}::https://github.com/mavlink/mavlink/archive/${pkgver}.tar.gz")
-sha256sums=('940ac31416d826f959d7f62fd4696ce6f23cf3e8c71c80a678a33ad93b4bf66d')
+source=("${pkgname}-${pkgver}::git+https://github.com/mavlink/mavlink.git#tag=${pkgver}"
+        "${pkgname}-pymavlink::git+https://github.com/ardupilot/pymavlink.git")
+sha256sums=('SKIP'
+            'SKIP')
+
+prepare() {
+  cd "$srcdir/${pkgname}-${pkgver}"
+
+  git submodule init
+  git config submodule."pymavlink".url "${srcdir}/${pkgname}"-pymavlink
+  git submodule update --init --recursive
+}
 
 build() {
   mkdir -p ${srcdir}/${pkgname}-${pkgver}/build