...
 
Commits (35)
variables:
GLUON_BRANCH: "nightly"
ECDSA_PRIVAT_KEY: "d8b6b90da391e2b8fdf1fec1499539937a35abcea79f2c3c15ae2f9edb5c455f"
GLUON_VERSION: "v2016.1.3"
GLUON_VERSION: "v2016.1.x"
stages:
- build
- sign
- deploy
build:ar71xx-generic:
build:gluon:
stage: build
only:
- master
......@@ -16,7 +16,7 @@ build:ar71xx-generic:
tags:
- firmware
script:
- bash build/build-ar71xx-generic.sh $GLUON_BRANCH $GLUON_VERSION
- bash build/build.sh $GLUON_BRANCH $GLUON_VERSION
artifacts:
paths:
- output/images/factory/*wr841*
......@@ -24,13 +24,6 @@ build:ar71xx-generic:
- output/images/sysupgrade/*wr841*
- contrib/
#build:ar71xx-nand:
# stage: build
# tags:
# - firmware
# script:
# - bash build/build-ar71xx-nand.sh
sign:
stage: sign
only:
......@@ -41,8 +34,7 @@ sign:
script:
- bash build/sign.sh $GLUON_BRANCH $ECDSA_PRIVAT_KEY
dependencies:
- build:ar71xx-generic
# - build:ar71xx-nand
- build:gluon
artifacts:
paths:
- output/images/
......
#!/bin/sh
#https://stackoverflow.com/questions/2870992/automatic-exit-from-bash-shell-script-on-error
set -e
GLUON_BRANCH="$1"
GLUON_VERSION="$2"
# Make Folder site
mkdir site
# Move Files into site folder
mv i18n/ site/
mv modules site/
mv site.conf site/
mv site.mk site/
mv .git site/
# Clone Gluon repo
git clone https://github.com/freifunk-gluon/gluon.git ./gluon -b $GLUON_VERSION
mv gluon/* ./
make update || exit 1
make GLUON_TARGET=ar71xx-generic || exit 1
make manifest GLUON_BRANCH=$GLUON_BRANCH
#!/bin/sh
# Make Folder site
mkdir site
# Move Files into site folder
mv i18n/ site/
mv modules site/
mv site.conf site/
mv site.mk site/
mv .git site/
# Clone Gluon repo
GLUON_VERSION=`cat GLUON_VERSION`
git clone https://github.com/freifunk-gluon/gluon.git ./gluon -b $GLUON_VERSION
mv gluon/* ./
make update
make GLUON_TARGET=ar71xx-nand
#!/bin/sh
#https://stackoverflow.com/questions/2870992/automatic-exit-from-bash-shell-script-on-error
set -e
GLUON_BRANCH="$1"
GLUON_VERSION="$2"
#check installed debendenciece
if [ -f /etc/debian_version ]; then
echo "Checking for git..."
if ! command -v git 2&> /dev/null; then
echo "git is not installed"
exit 1
fi
echo "Detected git..."
echo "Checking for subversion..."
if ! command -v svn > /dev/null; then
echo "subversion is not installed"
exit 1
fi
echo "Detected subversion..."
echo "Checking for python..."
if ! which python > /dev/null; then
echo "python is not installed"
exit 1
fi
echo "Detected python..."
echo "Checking for build-essential..."
if ! dpkg -s build-essential > /dev/null; then
echo "build-essential is not installed"
exit 1
fi
echo "Detected build-essential..."
echo "Checking for gawk..."
if ! dpkg -s gawk > /dev/null; then
echo "gawk is not installed"
exit 1
fi
echo "Detected gawk..."
echo "Checking for unzip..."
if ! dpkg -s unzip > /dev/null; then
echo "unzip is not installed"
exit 1
fi
echo "Detected unzip..."
echo "Checking for libncurses5-dev..."
if ! dpkg -s libncurses5-dev > /dev/null; then
echo "libncurses5-dev is not installed"
exit 1
fi
echo "Detected libncurses5-dev..."
echo "Checking for zlib1g-dev..."
if ! dpkg -s zlib1g-dev > /dev/null; then
echo "zlib1g-dev is not installed"
exit 1
fi
echo "Detected zlib1g-dev..."
echo "Checking for libssl-dev..."
if ! dpkg -s libssl-dev > /dev/null; then
echo "libssl-dev is not installed"
exit 1
fi
echo "Detected libssl-dev..."
fi
# Make Folder site
mkdir site
# Move Files into site folder
mv i18n/ site/
mv modules site/
mv site.conf site/
mv site.mk site/
mv .git site/
# Clone Gluon repo
git clone https://github.com/freifunk-gluon/gluon.git ./gluon -b $GLUON_VERSION
mv gluon/* ./
make update || exit 1
CPUS=$(grep -c processor /proc/cpuinfo)
while read line; do
if [[ $line == *GluonTarget* ]]; then
targ=$(echo $line | sed -e 's/^.*GluonTarget//' -e 's/^,//' -e 's/)).*//' -e 's/[,]/-/')
make -j $((CPUS*2)) GLUON_TARGET=$targ BROKEN=1 GLUON_BRANCH=$GLUON_BRANCH || exit 1
fi;
done < "targets/targets.mk"
make manifest GLUON_BRANCH=$GLUON_BRANCH
......@@ -18,18 +18,18 @@ msgstr ""
msgid "gluon-config-mode:pubkey"
msgstr ""
"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Erst nachdem "
"er auf den Servern des Nordwest Freifunk-Projektes eingetragen wurde, "
"kann sich dein Knoten mit dem Nordwest Mesh-VPN verbinden. Der schlüssel wird "
"automatisch an die Freifunk Nordwest Server geschickt. "
"<p>Dies ist der öffentliche Schlüssel deines Freifunk-Knotens. Es ist kein "
"weiteres Einschreiten von dir nötig. Der Router wird sich automatisch "
"mit unseren Servern verbinden. Der Key ist dafür da, dass sich dein Router "
"an unsere Server authorisieren kann. Nachfolgend findest du den Key:"
"<div class=\"the-key\">"
" # <%= hostname %>"
" <br/>"
"<%= pubkey %>"
"</div>"
" <br/>"
"Bei Fragen oder Problemen kannst du uns gerne eine Mail an "
"<a href=\"mailto:info@nordwest.freifunk.net\">info@nordwest.freifunk.net</a> schicken."
"Bei Fragen oder Problemen helfen wir dir gerne weiter"
"<a href=\"https://ffnw.de\">https://ffnw.de</a>"
"</p>"
msgid "gluon-config-mode:reboot"
......@@ -38,7 +38,7 @@ msgstr ""
"sich mit anderen Freifunkknoten in seiner Nähe zu "
"verbinden. Weitere Informationen zur "
"Nordwest Freifunk-Community findest du auf "
"<a href=\"https://nordwest.freifunk.net/\">unserer Webseite</a>.</p>"
"<a href=\"https://ffnw.de/\">unserer Webseite</a>.</p>"
"<p>Um zu dieser Konfigurationsseite zurückzugelangen, drücke im normalen "
"Betrieb für 10 Sekunden den Reset-Button. Das Gerät wird dann im Config "
"Mode neustarten.</p>"
......
GLUON_SITE_FEEDS='ffnw'
PACKAGES_FFNW_REPO=https://git.nordwest.freifunk.net/ffnw-firmware/packages.git
PACKAGES_FFNW_BRANCH=master
PACKAGES_FFNW_COMMIT=1e00147dc145d6020b9c0fd5bab4f4e0433b1919
PACKAGES_FFNW_BRANCH=1.1
PACKAGES_FFNW_COMMIT=d64b88749ef3b17975a89c76042c319d6171ae46
......@@ -7,7 +7,7 @@
openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
},
prefix4 = '10.18.0.0/17',
prefix4 = '10.18.0.0/16',
prefix6 = 'fd74:fdaa:9dc4::/64',
mesh_on_wan = false,
......@@ -24,12 +24,12 @@
channel = 6,
htmode = 'HT40+',
ap = {
ssid = 'testing.nordwest.freifunk.net',
ssid = 'nordwest.freifunk.net',
},
ibss = {
ssid = 'testing.mesh.ffnw',
bssid = '02:CA:FF:EE:BA:BE',
ssid = 'mesh.ffnw',
bssid = '02:CA:FF:EE:BA:BF',
mcast_rate = 12000,
},
......@@ -42,12 +42,12 @@
channel = 44,
htmode = 'HT40+',
ap = {
ssid = 'testing.nordwest.freifunk.net',
ssid = 'nordwest.freifunk.net',
},
ibss = {
ssid = 'testing.mesh.ffnw',
bssid = '02:CA:FF:EE:BA:BE',
ssid = 'mesh.ffnw',
bssid = '02:CA:FF:EE:BA:BF',
mcast_rate = 12000,
},
......@@ -59,7 +59,7 @@
next_node = {
ip4 = '10.18.0.127',
ip6 = 'fd74:fdaa:9dc4:127',
ip6 = 'fd74:fdaa:9dc4::127',
mac = '16:41:95:40:f7:dc',
},
......@@ -148,7 +148,7 @@
},
},
nightly_master = {
name = 'nightly-master',
name = 'nightly_master',
mirrors = {
'http://autoupdate.ffnw/nightly/master/',
},
......