Add python-lxns subproject

AUR users won't need to install it independently.

2 files changed, 36 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 430b7b2d5cbd..f341d394ceb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = bubblejail-git
 	pkgdesc = Bubblewrap based sandboxing utility
-	pkgver = 0.8.RC2.r473.150c1e8
+	pkgver = 0.8.3.r534.fd731b2
 	pkgrel = 1
 	url = https://github.com/igo95862/bubblejail
 	arch = any
@@ -9,6 +9,8 @@ pkgbase = bubblejail-git
 	makedepends = meson
 	makedepends = python-jinja
 	makedepends = scdoc
+	makedepends = gcc
+	makedepends = linux-headers
 	depends = python
 	depends = python-pyxdg
 	depends = bubblewrap
@@ -24,6 +26,8 @@ pkgbase = bubblejail-git
 	provides = bubblejail
 	conflicts = bubblejail
 	source = bubblejail-git::git+https://github.com/igo95862/bubblejail
+	source = python-lxns::git+https://github.com/igo95862/python-lxns
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = bubblejail-git
diff --git a/PKGBUILD b/PKGBUILD
index c931971efd75..a4bad96e8b61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: igo95862 <address at domain dot tld>
 pkgname=bubblejail-git
-pkgver=0.8.RC2.r473.150c1e8
+pkgver=0.8.3.r534.fd731b2
 pkgrel=1
 pkgdesc="Bubblewrap based sandboxing utility"
 arch=('any')
@@ -20,25 +20,45 @@ depends=(
 provides=('bubblejail')
 conflicts=('bubblejail')
 optdepends=(
-	'bash-completion: completions for bash shell'
-	'fish: completions for fish shell'
-	'slirp4netns: Namespaced networking stack'
-	)
-makedepends=('git' 'meson' 'python-jinja' 'scdoc')
-source=("$pkgname"::"git+https://github.com/igo95862/bubblejail")
-md5sums=('SKIP')
+  'bash-completion: completions for bash shell'
+  'fish: completions for fish shell'
+  'slirp4netns: Namespaced networking stack'
+)
+makedepends=(
+  'git'
+  'meson'
+  'python-jinja'
+  'scdoc'
+  # For python-lxns
+  'gcc'
+  'linux-headers'
+)
+source=(
+  "$pkgname"::"git+https://github.com/igo95862/bubblejail"
+  "python-lxns"::"git+https://github.com/igo95862/python-lxns"
+)
+md5sums=('SKIP' 'SKIP')
 
 pkgver() {
   cd "$srcdir/$pkgname"
   printf "%s.r%s.%s" "$(git describe --abbrev=0 --tags)" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "$srcdir/$pkgname"
+  git submodule init
+  git config submodule.subprojects/python-lxns.url "$srcdir/python-lxns"
+  git -c protocol.file.allow=always submodule update
+}
 
 build () {
-	arch-meson "$srcdir/$pkgname" build -Dversion_display="AUR-git $pkgver"
-	ninja -C build
+  arch-meson "$srcdir/$pkgname" build \
+    -Duse-vendored-python-lxns=enabled \
+    -Dversion_display="AUR-git $pkgver" \
+    --wipe
+  meson compile -C build
 }
 
 package() {
-	DESTDIR="$pkgdir" meson install -C build
+  DESTDIR="$pkgdir" meson install -C build
 }