init babel

2018-07-15 17:44:10 +02:00 · 2018-07-15 17:44:10 +02:00 · 4b567c6a96
parent a40f442e65
commit 4b567c6a96
6 changed files with 79 additions and 66 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,3 @@
 [submodule "gluon"]
 	path = gluon
-	url = https://github.com/freifunk-gluon/gluon.git
+	url = https://github.com/freifunk-ffm/gluon.git
--- a/build.sh
+++ b/build.sh
@ -26,24 +26,20 @@ fi
 for target in $GLUON_TARGETS; do
    echo "Building target ${target}"
    schedtool -B -e \
-        make --jobs=$(grep -c '^processor' /proc/cpuinfo) --output-sync=recurse \
-            GLUON_TARGET="$target" V=s
+        make --jobs=$(grep -c '^processor' /proc/cpuinfo) GLUON_TARGET="$target" || \
+        make -j1 --output-sync=recurse GLUON_TARGET="$target" V=s
 done

 # generate manifests
 make manifest

 if [ -z "${GLUON_BRANCH:-}" ]; then
-    make manifest GLUON_BRANCH=testing GLUON_PRIORITY=0
-    # add BRANCH=nightly line below BRANCH=testing line
-    sed -i -e "/^BRANCH=testing/ a BRANCH=nightly" \
-        "${GLUON_DIR}/output/images/sysupgrade/testing.manifest"
-    ln -sf testing.manifest "${GLUON_DIR}/output/images/sysupgrade/nightly.manifest"
-    ln -sf testing.manifest "${GLUON_DIR}/output/images/sysupgrade/manifest"
+    make manifest GLUON_BRANCH=babel GLUON_PRIORITY=0
+    ln -sf babel.manifest "${GLUON_DIR}/output/images/sysupgrade/manifest"
 fi

 # sign testing/nightly manifest if key is present
 if [ -n "$KEYFILE" -a -r "$KEYFILE" ]; then
    "${GLUON_DIR}/contrib/sign.sh" "$KEYFILE" \
-        "${GLUON_DIR}/output/images/sysupgrade/testing.manifest"
+        "${GLUON_DIR}/output/images/sysupgrade/manifest"
 fi
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit f01037384d2cbbec975635c1526c45b5126664b5
+Subproject commit ecfed1939e927425c32678b1f3dbac0ddc028677
--- a/14
+++ b/14
@ -1,4 +1,16 @@
-GLUON_SITE_FEEDS='ffhb'
+GLUON_SITE_FEEDS='ffhb ffffmpackages christfopenwrt christfddhcp'

 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
 PACKAGES_FFHB_COMMIT=e314a51ebbd5e8b6da3ab2744354869b7740913a
+
+PACKAGES_FFFFMPACKAGES_REPO=git://github.com/freifunk-ffm/packages.git
+PACKAGES_FFFFMPACKAGES_COMMIT=155140775e39933eef4634ca108817401f0437b8
+PACKAGES_FFFFMPACKAGES_BRANCH=master
+
+PACKAGES_CHRISTFOPENWRT_REPO=https://github.com/christf/packages-2.git
+PACKAGES_CHRISTFOPENWRT_COMMIT=195777327886718695351187760abc81c9234cba
+PACKAGES_CHRISTFOPENWRT_BRANCH=add_nltrace
+
+PACKAGES_CHRISTFDDHCP_REPO=https://github.com/christf/gluon-sargon.git
+PACKAGES_CHRISTFDDHCP_COMMIT=d81a81af9f593dfd6aa5f7afbdb076c7c144c901
+PACKAGES_CHRISTFDDHCP_BRANCH=bump
--- a/site.conf
+++ b/site.conf
@ -4,15 +4,15 @@
 	domain_seed = '9c689a5be0e7610716aa9952d3c186345bd8d72dfa8950977e255e26ea24d978',

 	prefix4 = '10.196.0.0/17',
-	prefix6 = 'fd2f:5119:0f2c::/64',
+	prefix6 = '2a06:8782:ffbb:bab1::/64',	-- (freifunk wide ip)
+	node_prefix6 = '2a06:8782:ffbb:bab0::/64',	-- (freifunk wide inter node ip)
+	node_client_prefix6 = 'fd2f:5119:f2c::/64',	-- infrastructure net (ULA) for node-client-ip addresses (node wide ip)
+	clat_range = 'fd2f:5119:f2c:426::/48',	-- infrastructure net (ULA) from which a /96 clat prefix will be generated (for ipv4 - 464xlat).
+	plat_range = 'fd2f:5119:f2c:624::/48',	-- infrastructure net (ULA) from which a /96 plat prefix will be generated (for ipv6 - 464xlat).

 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3', -- Europe/Berlin
 	ntp_servers = {
-		'1.ntp.bremen.freifunk.net',
-		'2.ntp.bremen.freifunk.net',
-		'3.ntp.bremen.freifunk.net',
 		'5.ntp.bremen.freifunk.net',
-		'6.ntp.bremen.freifunk.net',
 	},
 	regdom = 'DE',

@ -21,36 +21,22 @@
 		supported_rates = {6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000},
 		basic_rate = {6000, 9000, 18000, 36000, 54000},
 		ap = {
-			ssid = 'bremen.freifunk.net',
+			ssid = 'babel.freifunk.net',
 		},
-		ibss = {
-			ssid = 'mesh.ffhb.de',
-			bssid = '32:06:1C:1F:B9:E8',
-			mcast_rate = 6000,
+		mesh = {
+			id = 'meshb.ffhb.de',
+			mcast_rate = 12000,
 		},
-		--mesh = {
-		--	id = 'mesh.ffhb.de',
-		--	mcast_rate = 6000,
-		--},
 	},
 	wifi5 = {
 		channel = 44,
 		ap = {
-			ssid = 'bremen.freifunk.net',
+			ssid = 'babel.freifunk.net',
 		},
-		ibss = {
-			ssid = 'mesh.ffhb.de',
-			bssid = '32:06:1C:1F:B9:E8',
-			mcast_rate = 6000,
+		mesh = {
+			id = 'meshb.ffhb.de',
+			mcast_rate = 12000,
 		},
-		--mesh = {
-		--	id = 'mesh.ffhb.de',
-		--	mcast_rate = 6000,
-		--},
-	},
-
-	mesh = {
-		vxlan = false,
 	},

 	next_node = {
@ -59,9 +45,14 @@
 			'node.bremen.freifunk.net',
 		},
 		ip4 = '10.196.0.127',
-		ip6 = 'fd2f:5119:0f2c::127',
+		ip6 = '2a06:8782:ffbb:bab1::127',
 		mac = '16:41:95:40:f7:dc',
 	},
+	dns = {
+		servers = {
+			'2a06:8782:ffbb:bab0::5',
+		},
+	},

 	mesh_vpn = {
 		enabled = true,
@ -73,25 +64,9 @@
 				backbone = {
 					limit = 1,
 					peers = {
-						vpn01 = {
-							key = 'df444c4366880735d8101ec4e8bcd8288a7e617024c08f0f81027927ba794f9f',
-							remotes = {'"vpn01.bremen.freifunk.net" port 50000', '"vpn01.ffhb.de" port 50000'},
-						},
-						vpn02 = {
-							key = '93a15a14d85a165b86624c89d69c481043cb60542bfa3d2896615b66a57ab02c',
-							remotes = {'"vpn02.bremen.freifunk.net" port 50000', '"vpn02.ffhb.de" port 50000'},
-						},
-						vpn03 = {
-							key = '6c16136b58da06e3cc83bc92ef09bb19b7dfa787e390929a0ac0d4bbebddee2b',
-							remotes = {'"vpn03.bremen.freifunk.net" port 50000', '"vpn03.ffhb.de" port 50000'},
-						},
 						vpn05 = {
 							key = '6cff5957231ca2936aabaa75ae5a7985f4077246b8956273b2ce2da559f344a9',
-							remotes = {'"vpn05.bremen.freifunk.net" port 50000', '"vpn05.ffhb.de" port 50000'},
-						},
-						vpn06 = {
-							key = '99cb85ea2e6346b52abf5eb5ca824f7f037324d4e476f4f068c48b9da98f30e3',
-							remotes = {'"vpn06.bremen.freifunk.net" port 50000', '"vpn06.ffhb.de" port 50000'},
+							remotes = {'"vpn05.bremen.freifunk.net" port 50001', '"vpn05.ffhb.de" port 50001'},
 						},
 					},
 				},
@ -111,8 +86,18 @@
 	},

 	autoupdater = {
-		branch = 'stable',
+		branch = 'babel',
 		branches = {
+			babel = {
+				name = 'babel',
+				mirrors = {
+					'http://downloads.bremen.freifunk.net/firmware/babel/sysupgrade',
+				},
+				good_signatures = 1,
+				pubkeys = {
+					'4bc6c2c3f36f984a9c370558a453d8a91933323679dd6dbbf6568834133a6030', -- autobuilder
+				},
+			},
 			nightly = {
 				name = 'nightly',
 				mirrors = {
--- a/site.mk
+++ b/site.mk
@ -1,5 +1,6 @@
 GLUON_SITE_PACKAGES := \
-	gluon-mesh-batman-adv-14 \
+	gluon-mesh-babel \
+	gluon-l3roamd \
 	gluon-respondd \
 	respondd-module-airtime \
 	gluon-autoupdater \
@ -9,8 +10,6 @@ GLUON_SITE_PACKAGES := \
 	gluon-config-mode-mesh-vpn \
 	gluon-config-mode-geo-location \
 	gluon-config-mode-contact-info \
-	gluon-ebtables-filter-multicast \
-	gluon-ebtables-filter-ra-dhcp \
 	gluon-web-admin \
 	gluon-web-autoupdater \
 	gluon-web-mesh-vpn-fastd \
@ -18,7 +17,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-web-private-wifi \
 	gluon-web-wifi-config \
 	gluon-mesh-vpn-fastd \
-	gluon-radv-filterd \
+	gluon-client-bridge \
 	gluon-radvd \
 	gluon-setup-mode \
 	gluon-speedtest \
@ -26,13 +25,34 @@ GLUON_SITE_PACKAGES := \
 	iputils-ping6 \
 	iwinfo \
 	iptables \
-	firewall \
-	haveged
+	gluon-iptables-clamp-mss-to-pmtu \
+	kmod-nat46 \
+	babeldev \
+	ddhcpd \
+	gluon-ddhcpd
+#	gluon-xlat464-clat	# route back from jool to clients does not exist,	(ipv4)-tcp connections break with this package when roaming

 # Allow overriding the these variables from the command line
 GLUON_RELEASE ?= $(patsubst v%,%,$(shell git -C $(GLUON_SITEDIR) describe --tags --dirty=+))
-export GLUON_BRANCH ?= stable
+export GLUON_BRANCH ?= babel
 GLUON_PRIORITY ?= 0
 GLUON_LANGS ?= en de
 GLUON_REGION ?= eu
-GLUON_ATH10K_MESH ?= ibss
+GLUON_WLAN_MESH ?= 11s
+
+
+# Debug packages
+DEBUG_PACKAGES := \
+	tcpdump
+
+# x86-64
+ifeq ($(GLUON_TARGET),x86-64)
+GLUON_SITE_PACKAGES += \
+	$(DEBUG_PACKAGES)
+endif
+
+# digineo
+ifeq ($(GLUON_TARGET),ramips-mt7621)
+GLUON_SITE_PACKAGES += \
+	$(DEBUG_PACKAGES)
+endif