From 47156dfcf84448a5ea0e27516bef56ea27bde348 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Wed, 27 Jul 2016 19:59:51 +0100
Subject: [PATCH] Install tomb on mesh images
---
src/freedombone-image-customise | 1 +
src/freedombone-utils-filesystem | 29 +++++++++++++++++++++++++++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index ea23bc408..a02a22a1c 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -533,6 +533,7 @@ initialise_mesh() {
configure_firewall
install_avahi
install_batman
+ install_tomb
install_tox
install_web_server
install_zeronet
diff --git a/src/freedombone-utils-filesystem b/src/freedombone-utils-filesystem
index c753399ed..0b67735a1 100755
--- a/src/freedombone-utils-filesystem
+++ b/src/freedombone-utils-filesystem
@@ -31,7 +31,33 @@
TOMB_REPO="https://github.com/dyne/Tomb"
TOMB_COMMIT='c80ebd6d6ed77980eb5b559757e03ea13a29bdd1'
+function mesh_install_tomb {
+ chroot ${rootdir} apt-get -y install cryptsetup zsh
+
+ if [ ! -d ${rootdir}/$INSTALL_DIR ]; then
+ mkdir -p ${rootdir}/$INSTALL_DIR
+ fi
+
+ git_clone $TOMB_REPO ${rootdir}/$INSTALL_DIR/tomb
+ cd ${rootdir}/$INSTALL_DIR/tomb
+
+ git checkout $TOMB_COMMIT -b $TOMB_COMMIT
+
+ chroot ${rootdir} /bin/bash -x <<EOF
+cd $INSTALL_DIR/tomb
+make install
+EOF
+ if [ ! -f ${rootdir}/usr/local/bin/tomb ]; then
+ exit 93462
+ fi
+}
+
function install_tomb {
+ if [ $INSTALLING_MESH ]; then
+ mesh_install_tomb
+ return
+ fi
+
function_check set_repo_commit
set_repo_commit $INSTALL_DIR/tomb "Tomb commit" "$TOMB_COMMIT" $TOMB_REPO
@@ -46,9 +72,8 @@ function install_tomb {
if [ ! -d $INSTALL_DIR ]; then
mkdir -p $INSTALL_DIR
fi
- cd $INSTALL_DIR
- git_clone $TOMB_REPO tomb
+ git_clone $TOMB_REPO $INSTALL_DIR/tomb
cd $INSTALL_DIR/tomb
git checkout $TOMB_COMMIT -b $TOMB_COMMIT
--
GitLab