Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
freedombone
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Context Sensitive Group
freedombone
Commits
d6ee4bce
Commit
d6ee4bce
authored
8 years ago
by
Bob Mottram
Browse files
Options
Downloads
Patches
Plain Diff
Fixing mesh build
parent
350ab268
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/freedombone-app-tox
+57
-13
57 additions, 13 deletions
src/freedombone-app-tox
src/freedombone-app-zeronet
+61
-0
61 additions, 0 deletions
src/freedombone-app-zeronet
with
118 additions
and
13 deletions
src/freedombone-app-tox
+
57
−
13
View file @
d6ee4bce
...
...
@@ -334,6 +334,43 @@ function install_tox_client {
}
function
mesh_tox_node
{
# obtain commits from the main file
TOXCORE_COMMIT_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-tox
|
grep
"TOXCORE_COMMIT="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
if
[
${#
TOXCORE_COMMIT_MAIN
}
-gt
10
]
;
then
TOXCORE_COMMIT
=
$TOXCORE_COMMIT_MAIN
fi
if
[
!
$TOXCORE_COMMIT
]
;
then
echo
$'No Tox commit was specified'
exit
76325
fi
TOXID_REPO_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-tox
|
grep
"TOXID_REPO="
|
head
-n
1 |
awk
-F
'"'
'{print $2}'
)
if
[
${#
TOXID_REPO_MAIN
}
-gt
5
]
;
then
TOXID_REPO
=
$TOXID_REPO_MAIN
fi
if
[
!
$TOXID_REPO
]
;
then
echo
$'No ToxID repo was specified'
exit
78252
fi
TOX_PORT_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-tox
|
grep
"TOX_PORT="
|
head
-n
1 |
awk
-F
'='
'{print $2}'
)
if
[
${#
TOX_PORT_MAIN
}
-gt
2
]
;
then
TOX_PORT
=
$TOX_PORT_MAIN
fi
if
[
!
$TOX_PORT
]
;
then
echo
$'No Tox port was specified'
exit
32856
fi
TOXCORE_REPO_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-tox
|
grep
"TOXCORE_REPO="
|
head
-n
1 |
awk
-F
'"'
'{print $2}'
)
if
[
${#
TOXCORE_REPO_MAIN
}
-gt
10
]
;
then
TOXCORE_REPO
=
$TOXCORE_REPO_MAIN
fi
if
[
!
$TOXCORE_REPO
]
;
then
echo
$'No Tox repo was specified'
exit
16865
fi
if
[
!
$TOXCORE_COMMIT
]
;
then
echo
$'No Tox commit was specified'
exit
76325
...
...
@@ -347,21 +384,27 @@ function mesh_tox_node {
chroot
"
$rootdir
"
apt-get
-y
install
build-essential libtool autotools-dev
chroot
"
$rootdir
"
apt-get
-y
install
automake checkinstall check git yasm
chroot
"
$rootdir
"
apt-get
-y
install
libsodium13 libsodium-dev libcap2-bin
chroot
"
$rootdir
"
apt-get
-y
install
libconfig9 libconfig-dev
chroot
"
$rootdir
"
apt-get
-y
install
libconfig9 libconfig-dev
autoconf
TEMP_SCRIPT_NAME
=
fbtmp37272.sh
TEMP_SCRIPT
=
/tmp/
$TEMP_SCRIPT_NAME
mkdir
-p
${
rootdir
}${
INSTALL_DIR
}
git clone
${
TOXCORE_REPO
}
${
rootdir
}${
INSTALL_DIR
}
/toxcore
chroot
"
$rootdir
"
cd
$INSTALL_DIR
/toxcore
&&
git checkout
$TOXCORE_COMMIT
-b
$TOXCORE_COMMIT
chroot
"
$rootdir
"
cd
$INSTALL_DIR
/toxcore
&&
autoreconf
-i
chroot
"
$rootdir
"
cd
$INSTALL_DIR
/toxcore
&&
./configure
--enable-daemon
--disable-av
chroot
"
$rootdir
"
cd
$INSTALL_DIR
/toxcore
&&
make
if
[
!
"
$?
"
=
"0"
]
;
then
exit
4292
8
5
exit
42925
2
fi
chroot
"
$rootdir
"
cd
$INSTALL_DIR
/toxcore
&&
make
install
cd
${
rootdir
}
$INSTALL_DIR
/toxcore
git checkout
$TOXCORE_COMMIT
-b
$TOXCORE_COMMIT
chroot
"
$rootdir
"
/bin/bash
-x
<<
EOF
cd
${
INSTALL_DIR
}
/toxcore
autoreconf -i
./configure --enable-daemon --disable-av
make
make install
EOF
cp
$rootdir
/usr/local/lib/libtoxcore
*
$rootdir
/usr/lib/
cp
${
rootdir
}${
INSTALL_DIR
}
/toxcore/other/bootstrap_daemon/tox-bootstrapd.service
$rootdir
/etc/systemd/system/
sed
-i
's|ExecStart=.*|ExecStart=/usr/local/bin/tox-bootstrapd --config /etc/tox-bootstrapd.conf|g'
$rootdir
/etc/systemd/system/tox-bootstrapd.service
...
...
@@ -447,12 +490,13 @@ function mesh_tox_avahi {
echo
$'Unable to clone toxid repo'
exit
768352
fi
chroot
"
$rootdir
"
cd
$INSTALL_DIR
/toxid
&&
make
if
[
!
"
$?
"
=
"0"
]
;
then
echo
$'Unable to make toxid'
exit
386823
fi
chroot
"
$rootdir
"
cd
$INSTALL_DIR
/toxid
&&
make
install
chroot
"
$rootdir
"
/bin/bash
-x
<<
EOF
cd
${
INSTALL_DIR
}
/toxid
make
make install
EOF
if
[
!
-f
$rootdir
/usr/local/bin/toxavahi
]
;
then
exit
3621729
fi
...
...
This diff is collapsed.
Click to expand it.
src/freedombone-app-zeronet
+
61
−
0
View file @
d6ee4bce
...
...
@@ -30,6 +30,8 @@
VARIANTS
=
'mesh'
MESH_INSTALL_DIR
=
/var/lib
ZERONET_REPO
=
"https://github.com/HelloZeroNet/ZeroNet.git"
ZERONET_COMMIT
=
'675bd462556c541d65e2d95f91f899146a373aad'
ZERONET_BLOG_REPO
=
"https://github.com/HelloZeroNet/ZeroBlog"
...
...
@@ -461,6 +463,33 @@ function install_zeronet_main {
}
function
mesh_zeronet
{
ZERONET_REPO_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_REPO="
|
head
-n
1 |
awk
-F
'"'
'{print $2}'
)
if
[
${#
ZERONET_REPO_MAIN
}
-gt
4
]
;
then
ZERONET_REPO
=
$ZERONET_REPO_MAIN
fi
if
[
!
$ZERONET_REPO
]
;
then
echo
$'No ZeroNet repo was specified'
exit
723539
fi
ZERONET_COMMIT_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_COMMIT="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
if
[
${#
ZERONET_COMMIT_MAIN
}
-gt
4
]
;
then
ZERONET_COMMIT
=
$ZERONET_COMMIT_MAIN
fi
if
[
!
$ZERONET_COMMIT
]
;
then
echo
$'No ZeroNet commit was specified'
exit
490439
fi
MESH_INSTALL_DIR_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"MESH_INSTALL_DIR="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
if
[
${#
MESH_INSTALL_DIR_MAIN
}
-gt
4
]
;
then
MESH_INSTALL_DIR
=
$MESH_INSTALL_DIR_MAIN
fi
if
[
!
$MESH_INSTALL_DIR
]
;
then
echo
$'No mesh install dir was specified'
exit
432052
fi
chroot
"
$rootdir
"
apt-get
-y
install
python python-msgpack python-gevent
chroot
"
$rootdir
"
apt-get
-y
install
python-pip bittornado
chroot
"
$rootdir
"
pip
install
msgpack-python
--upgrade
...
...
@@ -535,6 +564,14 @@ function mesh_zeronet {
function
mesh_zeronet_blog
{
ZERONET_BLOG_REPO
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_BLOG_REPO="
|
head
-n
1 |
awk
-F
'"'
'{print $2}'
)
ZERONET_BLOG_COMMIT
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_BLOG_COMMIT="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
MESH_INSTALL_DIR_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"MESH_INSTALL_DIR="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
if
[
${#
MESH_INSTALL_DIR_MAIN
}
-gt
4
]
;
then
MESH_INSTALL_DIR
=
$MESH_INSTALL_DIR_MAIN
fi
if
[
!
$MESH_INSTALL_DIR
]
;
then
echo
$'No mesh install dir was specified'
exit
432052
fi
git clone
$ZERONET_BLOG_REPO
$rootdir$MESH_INSTALL_DIR
/zeronet/ZeroBlog
if
[
!
-d
$rootdir$MESH_INSTALL_DIR
/zeronet/ZeroBlog
]
;
then
...
...
@@ -549,6 +586,14 @@ function mesh_zeronet_blog {
function
mesh_zeronet_mail
{
ZERONET_MAIL_REPO
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_MAIL_REPO="
|
head
-n
1 |
awk
-F
'"'
'{print $2}'
)
ZERONET_MAIL_COMMIT
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_MAIL_COMMIT="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
MESH_INSTALL_DIR_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"MESH_INSTALL_DIR="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
if
[
${#
MESH_INSTALL_DIR_MAIN
}
-gt
4
]
;
then
MESH_INSTALL_DIR
=
$MESH_INSTALL_DIR_MAIN
fi
if
[
!
$MESH_INSTALL_DIR
]
;
then
echo
$'No mesh install dir was specified'
exit
432052
fi
git clone
$ZERONET_MAIL_REPO
$rootdir$MESH_INSTALL_DIR
/zeronet/ZeroMail
if
[
!
-d
$rootdir$MESH_INSTALL_DIR
/zeronet/ZeroMail
]
;
then
...
...
@@ -563,6 +608,14 @@ function mesh_zeronet_mail {
function
mesh_zeronet_forum
{
ZERONET_FORUM_REPO
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_FORUM_REPO="
|
head
-n
1 |
awk
-F
'"'
'{print $2}'
)
ZERONET_FORUM_COMMIT
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_FORUM_COMMIT="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
MESH_INSTALL_DIR_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"MESH_INSTALL_DIR="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
if
[
${#
MESH_INSTALL_DIR_MAIN
}
-gt
4
]
;
then
MESH_INSTALL_DIR
=
$MESH_INSTALL_DIR_MAIN
fi
if
[
!
$MESH_INSTALL_DIR
]
;
then
echo
$'No mesh install dir was specified'
exit
432052
fi
git clone
$ZERONET_FORUM_REPO
$rootdir$MESH_INSTALL_DIR
/zeronet/ZeroTalk
if
[
!
-d
$rootdir$MESH_INSTALL_DIR
/zeronet/ZeroTalk
]
;
then
...
...
@@ -577,6 +630,14 @@ function mesh_zeronet_forum {
function
mesh_zeronet_id
{
ZERONET_ID_REPO
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_ID_REPO="
|
head
-n
1 |
awk
-F
'"'
'{print $2}'
)
ZERONET_ID_COMMIT
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"ZERONET_ID_COMMIT="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
MESH_INSTALL_DIR_MAIN
=
$(
cat
/usr/share/
${
PROJECT_NAME
}
/apps/
${
PROJECT_NAME
}
-app-zeronet
|
grep
"MESH_INSTALL_DIR="
|
head
-n
1 |
awk
-F
"'"
'{print $2}'
)
if
[
${#
MESH_INSTALL_DIR_MAIN
}
-gt
4
]
;
then
MESH_INSTALL_DIR
=
$MESH_INSTALL_DIR_MAIN
fi
if
[
!
$MESH_INSTALL_DIR
]
;
then
echo
$'No mesh install dir was specified'
exit
432052
fi
git clone
$ZERONET_ID_REPO
$rootdir$MESH_INSTALL_DIR
/zeronet/ZeroID
if
[
!
-d
$rootdir$MESH_INSTALL_DIR
/zeronet/ZeroID
]
;
then
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment