commit
7a100b291a
28
Makefile
28
Makefile
@ -1,13 +1,17 @@
|
||||
GLUON_BUILD_DIR := gluon-build
|
||||
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
|
||||
GLUON_GIT_REF := v2015.1
|
||||
GLUON_GIT_REF := 14ccbd2f5ddbd451638330d90af241f99dc3acd0
|
||||
|
||||
#https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
|
||||
|
||||
SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
|
||||
|
||||
GLUON_TARGETS ?= \
|
||||
ar71xx-generic \
|
||||
ar71xx-nand \
|
||||
x86-kvm_guest
|
||||
mpc85xx-generic \
|
||||
x86-64 \
|
||||
x86-generic
|
||||
|
||||
GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
|
||||
ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
|
||||
@ -18,11 +22,11 @@ endif
|
||||
|
||||
JOBS ?= $(shell cat /proc/cpuinfo | grep processor | wc -l)
|
||||
|
||||
JOBS = 1
|
||||
#JOBS = 1
|
||||
|
||||
GLUON_MAKE := ${MAKE} -j ${JOBS} -C ${GLUON_BUILD_DIR} \
|
||||
GLUON_MAKE := ${MAKE} V=s -j ${JOBS} -C ${GLUON_BUILD_DIR} \
|
||||
GLUON_RELEASE=${GLUON_RELEASE} \
|
||||
GLUON_BRANCH=${GLUON_BRANCH}
|
||||
GLUON_BRANCH=${GLUON_BRANCH} \
|
||||
|
||||
all: info
|
||||
${MAKE} manifest
|
||||
@ -41,9 +45,16 @@ build: gluon-prepare
|
||||
${GLUON_MAKE} GLUON_TARGET="$$target"; \
|
||||
done
|
||||
|
||||
buildonly:
|
||||
for target in ${GLUON_TARGETS}; do \
|
||||
echo ""Building target $$target""; \
|
||||
${GLUON_MAKE} GLUON_TARGET="$$target"; \
|
||||
done
|
||||
|
||||
|
||||
manifest: build
|
||||
${GLUON_MAKE} manifest
|
||||
mv ${GLUON_BUILD_DIR}/images .
|
||||
mv ${GLUON_BUILD_DIR}/output .
|
||||
|
||||
sign: manifest
|
||||
${GLUON_BUILD_DIR}/contrib/sign.sh ${SECRET_KEY_FILE} images/sysupgrade/${GLUON_BRANCH}.manifest
|
||||
@ -52,7 +63,10 @@ ${GLUON_BUILD_DIR}:
|
||||
git clone ${GLUON_GIT_URL} ${GLUON_BUILD_DIR}
|
||||
|
||||
gluon-prepare: images-clean ${GLUON_BUILD_DIR}
|
||||
(cd ${GLUON_BUILD_DIR} && git fetch origin && git checkout -q ${GLUON_GIT_REF})
|
||||
(cd ${GLUON_BUILD_DIR} \
|
||||
&& git remote set-url origin ${GLUON_GIT_URL} \
|
||||
&& git fetch origin \
|
||||
&& git checkout -q ${GLUON_GIT_REF})
|
||||
ln -sfT .. ${GLUON_BUILD_DIR}/site
|
||||
${GLUON_MAKE} update
|
||||
|
||||
|
||||
@ -14,10 +14,13 @@ msgid "gluon-config-mode:welcome"
|
||||
msgstr ""
|
||||
"Willkommen zum Einrichtungsassistenten für deinen neuen Regensburger "
|
||||
"Freifunk-Knoten. Fülle das folgende Formular deinen Vorstellungen "
|
||||
"entsprechend aus und sende es ab."
|
||||
"entsprechend aus und sende es ab. Die Angabe einer Kontaktmöglichkeit "
|
||||
"ist optional, ist jedoch nicht öffentlich einsehbar. Daher wäre es gut, "
|
||||
"wenn wir eine Möglichkeit haben, euch zu kontaktieren. "
|
||||
|
||||
msgid "gluon-config-mode:pubkey"
|
||||
msgstr ""
|
||||
" "
|
||||
|
||||
msgid "gluon-config-mode:reboot"
|
||||
msgstr ""
|
||||
|
||||
@ -17,6 +17,7 @@ msgstr ""
|
||||
|
||||
msgid "gluon-config-mode:pubkey"
|
||||
msgstr ""
|
||||
" "
|
||||
|
||||
msgid "gluon-config-mode:reboot"
|
||||
msgstr ""
|
||||
|
||||
4
modules
4
modules
@ -1,3 +1,3 @@
|
||||
GLUON_SITE_FEEDS='ffmuc_packages'
|
||||
PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/freifunkMUC/gluon-packages.git
|
||||
PACKAGES_FFMUC_PACKAGES_COMMIT=82e721ad5d7c9eca8728954cfa1ab1d5b9168487
|
||||
PACKAGES_FFMUC_PACKAGES_REPO=https://github.com/ffrgb/gluon-packages.git
|
||||
PACKAGES_FFMUC_PACKAGES_COMMIT=3441ee26433d2bd35a27440add6d6b686c1f4b38
|
||||
|
||||
55
site.conf
55
site.conf
@ -1,8 +1,11 @@
|
||||
{
|
||||
hostname_prefix = 'freifunk',
|
||||
hostname_prefix = '',
|
||||
site_name = 'Freifunk Regensburg',
|
||||
site_code = 'ffrgb-bat15',
|
||||
opkg_repo = 'http://openwrt.draic.info/barrier_breaker/14.07/%S/packages',
|
||||
|
||||
opkg = {
|
||||
openwrt = 'http://openwrt.draic.info/%n/%v/%S/packages',
|
||||
},
|
||||
|
||||
prefix4 = '10.90.0.0/16',
|
||||
prefix6 = 'fdef:f00f:1337:cafe/64',
|
||||
@ -15,21 +18,27 @@
|
||||
regdom = 'DE',
|
||||
|
||||
wifi24 = {
|
||||
ssid = 'regensburg.freifunk.net',
|
||||
channel = 1,
|
||||
htmode = 'HT40+',
|
||||
mesh_ssid = 'mesh.ffrgb',
|
||||
mesh_bssid = '02:0E:8E:1E:61:17',
|
||||
mesh_mcast_rate = 12000,
|
||||
ap = {
|
||||
ssid = 'regensburg.freifunk.net',
|
||||
},
|
||||
ibss = {
|
||||
ssid = 'mesh.ffrgb',
|
||||
bssid = '02:0E:8E:1E:61:17',
|
||||
mcast_rate = 12000,
|
||||
},
|
||||
},
|
||||
|
||||
wifi5 = {
|
||||
ssid = 'regensburg.freifunk.net',
|
||||
channel = 44,
|
||||
htmode = 'HT40+',
|
||||
mesh_ssid = 'mesh.ffrgb',
|
||||
mesh_bssid = '02:0E:8E:1E:61:17',
|
||||
mesh_mcast_rate = 12000,
|
||||
ap = {
|
||||
ssid = 'regensburg.freifunk.net',
|
||||
},
|
||||
ibss = {
|
||||
ssid = 'mesh.ffrgb',
|
||||
bssid = '02:0E:8E:1E:61:17',
|
||||
mcast_rate = 12000,
|
||||
}
|
||||
},
|
||||
|
||||
next_node = {
|
||||
@ -40,6 +49,11 @@
|
||||
|
||||
|
||||
fastd_mesh_vpn = {
|
||||
bandwidth_limit = {
|
||||
enabled = false,
|
||||
ingress = 12000,
|
||||
egress = 1200,
|
||||
},
|
||||
methods = {'salsa2012+umac'},
|
||||
mtu = 1426,
|
||||
groups = {
|
||||
@ -52,6 +66,12 @@
|
||||
'ipv4 "78.47.168.108" port 10000',
|
||||
},
|
||||
},
|
||||
gw02 = { --[[ alamar ]]
|
||||
key = 'aa87e56e1e4d54fc8f4bfac755216425916d188d6fafc6a66ff90272c6b64214',
|
||||
remotes = {
|
||||
'ipv4 "185.53.218.23" port 10000',
|
||||
},
|
||||
},
|
||||
gw04 = { --[[ mephisto ]]
|
||||
key = '40ebfaf04da006d9150d3d8adeaab0dfa62ca645b416403537cb009bbf2125b5',
|
||||
remotes = {
|
||||
@ -77,6 +97,7 @@
|
||||
pubkeys = {
|
||||
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
|
||||
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
|
||||
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
|
||||
},
|
||||
},
|
||||
experimental = {
|
||||
@ -89,18 +110,10 @@
|
||||
pubkeys = {
|
||||
'4d6b1a8e2ecfdb59469c38c3659916dd6046cd5270ddd31c3319b21c508eaa07', -- mephisto
|
||||
'130ff01b6c8df0349c977a5c9539775209493bc771b713e5b3e58cc1d7c4145a', -- sven
|
||||
'dc024622f48f25f3e11881eab29a2a015950f31c884f0043ddc78156dcfab9da', -- xaver
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
simple_tc = {
|
||||
mesh_vpn = {
|
||||
ifname = 'mesh-vpn',
|
||||
enabled = false,
|
||||
limit_egress = 1200,
|
||||
limit_ingress = 12000,
|
||||
},
|
||||
},
|
||||
}
|
||||
-- vim: set ft=lua:ts=2:sw=2:et
|
||||
|
||||
171
site.mk
171
site.mk
@ -1,7 +1,7 @@
|
||||
GLUON_SITE_PACKAGES := \
|
||||
gluon-mesh-batman-adv-15 \
|
||||
gluon-alfred \
|
||||
gluon-announced \
|
||||
gluon-respondd \
|
||||
gluon-autoupdater \
|
||||
gluon-config-mode-core \
|
||||
gluon-config-mode-autoupdater \
|
||||
@ -28,6 +28,175 @@ GLUON_SITE_PACKAGES := \
|
||||
gluon-ebtables-filter-multicast-ffmuc
|
||||
|
||||
|
||||
# basic support for USB stack
|
||||
USB_PACKAGES_BASIC := \
|
||||
kmod-usb-core \
|
||||
kmod-usb2
|
||||
|
||||
# storage support for USB devices
|
||||
USB_PACKAGES_STORAGE := \
|
||||
block-mount \
|
||||
blkid \
|
||||
kmod-fs-ext4 \
|
||||
kmod-fs-vfat \
|
||||
kmod-usb-storage \
|
||||
kmod-usb-storage-extras \
|
||||
kmod-nls-cp1250 \
|
||||
kmod-nls-cp1251 \
|
||||
kmod-nls-cp437 \
|
||||
kmod-nls-cp775 \
|
||||
kmod-nls-cp850 \
|
||||
kmod-nls-cp852 \
|
||||
kmod-nls-cp866 \
|
||||
kmod-nls-iso8859-1 \
|
||||
kmod-nls-iso8859-13 \
|
||||
kmod-nls-iso8859-15 \
|
||||
kmod-nls-iso8859-2 \
|
||||
kmod-nls-koi8r \
|
||||
kmod-nls-utf8 \
|
||||
swap-utils
|
||||
|
||||
# network support for USB devices
|
||||
USB_PACKAGES_NET := \
|
||||
kmod-mii \
|
||||
kmod-nls-base \
|
||||
kmod-usb-net \
|
||||
kmod-usb-net-asix \
|
||||
kmod-usb-net-asix-ax88179 \
|
||||
kmod-usb-net-cdc-eem \
|
||||
kmod-usb-net-cdc-ether \
|
||||
kmod-usb-net-cdc-mbim \
|
||||
kmod-usb-net-cdc-ncm \
|
||||
kmod-usb-net-cdc-subset \
|
||||
kmod-usb-net-dm9601-ether \
|
||||
kmod-usb-net-hso \
|
||||
kmod-usb-net-huawei-cdc-ncm \
|
||||
kmod-usb-net-ipheth \
|
||||
kmod-usb-net-kalmia \
|
||||
kmod-usb-net-kaweth \
|
||||
kmod-usb-net-mcs7830 \
|
||||
kmod-usb-net-pegasus \
|
||||
kmod-usb-net-qmi-wwan \
|
||||
kmod-usb-net-rndis \
|
||||
kmod-usb-net-rtl8152 \
|
||||
kmod-usb-net-sierrawireless \
|
||||
kmod-usb-net-smsc95xx
|
||||
# broken
|
||||
# kmod-usb-net-rtl8150 \
|
||||
# additional USB network devices (ie Edimax)
|
||||
USB_PACKAGES_NET_ADD := \
|
||||
kmod-rtl8192cu \
|
||||
kmod-rtl8187 \
|
||||
kmod-ath9k-htc \
|
||||
kmod-ath9k-common \
|
||||
kmod-ath \
|
||||
kmod-rt73-usb \
|
||||
kmod-carl9170 \
|
||||
kmod-brcmfmac
|
||||
|
||||
# network support for PCI devices
|
||||
PCI_PACKAGES_NET := \
|
||||
kmod-3c59x \
|
||||
kmod-e100 \
|
||||
kmod-e1000 \
|
||||
kmod-e1000e \
|
||||
kmod-forcedeth \
|
||||
kmod-natsemi \
|
||||
kmod-ne2k-pci \
|
||||
kmod-pcnet32 \
|
||||
kmod-r8169 \
|
||||
kmod-sis900 \
|
||||
kmod-sky2 \
|
||||
kmod-tg3 \
|
||||
kmod-tulip \
|
||||
kmod-via-rhine
|
||||
# broken
|
||||
# kmod-ixgbe \
|
||||
# kmod-r8139too \
|
||||
# additional packages
|
||||
TOOLS_PACKAGES := \
|
||||
iperf \
|
||||
socat \
|
||||
tcpdump \
|
||||
usbutils \
|
||||
vnstat
|
||||
# broken
|
||||
# pciutils \
|
||||
|
||||
#
|
||||
# $(GLUON_TARGET) specific settings:
|
||||
#
|
||||
|
||||
# x86-generic
|
||||
ifeq ($(GLUON_TARGET),x86-generic)
|
||||
# support the usb stack on x86 devices
|
||||
# and add a few common USB and PCI NICs
|
||||
GLUON_SITE_PACKAGES += \
|
||||
kmod-usb-hid \
|
||||
kmod-hid-generic \
|
||||
$(USB_PACKAGES_BASIC) \
|
||||
$(USB_PACKAGES_STORAGE) \
|
||||
$(USB_PACKAGES_NET) \
|
||||
$(PCI_PACKAGES_NET) \
|
||||
$(TOOLS_PACKAGES) \
|
||||
$(USB_PACKAGES_NET_ADD)
|
||||
endif
|
||||
|
||||
# x86-64
|
||||
ifeq ($(GLUON_TARGET),x86-64)
|
||||
# support the usb stack on x86-64 devices
|
||||
# and add a few common USB and PCI NICs
|
||||
GLUON_SITE_PACKAGES += \
|
||||
kmod-usb-hid \
|
||||
kmod-hid-generic \
|
||||
$(USB_PACKAGES_BASIC) \
|
||||
$(USB_PACKAGES_STORAGE) \
|
||||
$(USB_PACKAGES_NET) \
|
||||
$(PCI_PACKAGES_NET) \
|
||||
$(TOOLS_PACKAGES) \
|
||||
$(USB_PACKAGES_NET_ADD)
|
||||
endif
|
||||
|
||||
# Raspberry Pi A/B/B+
|
||||
ifeq ($(GLUON_TARGET),brcm2708-bcm2708)
|
||||
GLUON_SITE_PACKAGES += \
|
||||
kmod-usb-hid \
|
||||
kmod-hid-generic \
|
||||
$(USB_PACKAGES_BASIC) \
|
||||
$(USB_PACKAGES_STORAGE) \
|
||||
$(USB_PACKAGES_NET) \
|
||||
$(TOOLS_PACKAGES) \
|
||||
$(USB_PACKAGES_NET_ADD)
|
||||
endif
|
||||
|
||||
# Raspberry Pi 2
|
||||
ifeq ($(GLUON_TARGET),brcm2708-bcm2709)
|
||||
GLUON_SITE_PACKAGES += \
|
||||
kmod-usb-hid \
|
||||
kmod-hid-generic \
|
||||
$(USB_PACKAGES_BASIC) \
|
||||
$(USB_PACKAGES_STORAGE) \
|
||||
$(USB_PACKAGES_NET) \
|
||||
$(TOOLS_PACKAGES) \
|
||||
$(USB_PACKAGES_NET_ADD)
|
||||
endif
|
||||
|
||||
# ar71xx-generic
|
||||
GLUON_TLWR842_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
GLUON_TLWR1043_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
GLUON_TLWR2543_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
GLUON_TLWDR4300_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
GLUON_WNDR3700_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
GLUON_WRT160NL_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
GLUON_ARCHERC7_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
GLUON_GLINET_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
GLUON_WZRHPG450H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
GLUON_WZRHPAG300H_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
|
||||
# mpc85xx-generic
|
||||
GLUON_TLWDR4900_SITE_PACKAGES := $(USB_PACKAGES_BASIC) $(TOOLS_PACKAGES) $(USB_PACKAGES_STORAGE)
|
||||
|
||||
|
||||
DEFAULT_GLUON_RELEASE := snapshot~$(shell date '+%Y%m%d')
|
||||
|
||||
# Allow overriding the release number from the command line
|
||||
|
||||
Loading…
Reference in New Issue
Block a user