freifunk/Firmware-building Changeset - 0a756ca071d0 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 0a756ca071d0

Parent rev.

Child rev.

[Not reviewed]

0 3 1

x - 19 days ago 2025-10-15 14:48:21
xbr@c3l.lu

beta: v2023.2.5 for 2025_10_15

Propagate experimental to beta, after a week in experimental.

4 files changed with 71 insertions and 133 deletions:

site_config/beta/site/image-customization.lua

site_config/beta/site/modules

site_config/beta/site/site.conf

site_config/beta/site/site.mk

0 comments (0 inline, 0 general)

site_config/beta/site/image-customization.lua

➞

Show inline comments

@@ new file 100644 @@
 features {
     'autoupdater',
     'ebtables-filter-multicast',
     'ebtables-filter-ra-dhcp',
     'ebtables-limit-arp',
     'mesh-batman-adv-15',
     'mesh-vpn-fastd',
     'respondd',
     'status-page',
     'web-advanced',
     'wireless-encryption-wpa3',
     'web-wizard',
+}
 packages {
     'gluon-mesh-batman-adv-15',
     'gluon-autoupdater',
     'gluon-config-mode-autoupdater',
     'gluon-config-mode-hostname',
     'gluon-config-mode-mesh-vpn',
     'gluon-config-mode-geo-location',
     'gluon-config-mode-contact-info',
     'gluon-config-mode-core',
     'gluon-ebtables-filter-multicast',
     'gluon-ebtables-filter-ra-dhcp',
     'gluon-web-admin',
     'gluon-web-autoupdater',
     'gluon-web-wifi-config',
     'gluon-web-private-wifi',
     'gluon-mesh-vpn-fastd',
     'gluon-radvd',
     'gluon-respondd',
     'gluon-setup-mode',
     'gluon-status-page',
     'ffac-ssid-changer',
     'respondd-module-airtime',
     'iwinfo',
+}

site_config/beta/site/modules

➞

Show inline comments

-GLUON_SITE_FEEDS="SSIDCHANGER"
+GLUON_SITE_FEEDS='community'
 PACKAGES_SSIDCHANGER_REPO=https://github.com/Freifunk-Nord/gluon-ssid-changer.git
 PACKAGES_SSIDCHANGER_COMMIT=3c6750ce8fc9cedabfa8a6f479fb12d343c6ecc2
 PACKAGES_SSIDCHANGER_BRANCH=2018.1.x
 PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
 PACKAGES_COMMUNITY_COMMIT=91e5fa8a253b1c5cf73fca7f5f519520cf6c90c2
 PACKAGES_COMMUNITY_BRANCH=v2023.2.x
@@ \ No newline at end of file @@

site_config/beta/site/site.conf

➞

Show inline comments

 -- This is an example site configuration for Gluon v2014.3.x
 --
 -- Take a look at the documentation located at
 -- http://gluon.readthedocs.org/ for details.
 --
 -- This configuration will not work as it. You're required to make
 -- community specific changes to it!
 -- See https://gluon.readthedocs.io/
+{
-  -- Used for generated hostnames, e.g. freifunk-abcdef123456.
+	-- Used for generated hostnames, e.g. freifunk-abcdef123456. (optional)
 	hostname_prefix = 'fflux-',
 	-- Name of the community.
@@ @@ -20,13 +14,13 @@ @@
 	-- Can be generated using: echo $(hexdump -v -n 32 -e '1/1 "%02x"' </dev/urandom)
 	domain_seed = '20d0d9c09a27d488c1291da65fe4dd4971ff8631dba0195be15805dbad01f78e',
   -- Prefixes used within the mesh. Both are required.
 	-- Prefixes used within the mesh.
 	-- prefix6 is required, prefix4 can be omitted if next_node.ip4 is not set.
 	prefix4 = '10.24.128.0/18',
 	prefix6 = 'fd4e:f2d7:88d2:fffe::/64',
 	-- Timezone of your community.
-  -- See http://wiki.openwrt.org/doc/uci/system#time.zones
+	-- See https://openwrt.org/docs/guide-user/base-system/system_configuration#time_zones
 	timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
 	-- List of NTP servers in your community.
@@ @@ -45,10 +39,11 @@ @@
 			ssid = 'luxembourg.freifunk.net',
 		},
 		mesh = {
 			-- usually you don't want users to connect to this mesh-SSID,
 			-- so use a cryptic id that no one will accidentally mistake for the client WiFi
 			id = 'freifunk-mesh',
 			mcast_rate = 12000,
 		},
 	},
 	-- Wireless configuration for 5 GHz interfaces.
@@ @@ -56,6 +51,7 @@ @@
 	-- for channel and htmode.
 	wifi5 = {
 		channel = 36;
 		ap = {
 			ssid = 'luxembourg.freifunk.net',
 		},
@@ @@ -83,15 +79,17 @@ @@
 		mac = '32:3d:f9:8f:01:53',
 	},
   -- Refer to http://fastd.readthedocs.org/en/latest/ to better understand
   -- what these options do.
 	mesh_vpn = {
 		enabled = true,
 		fastd = {
     mtu = 1406,
     configurable = true,
 			-- Refer to https://fastd.readthedocs.io/en/latest/ to better understand
 			-- what these options do.
 			-- List of crypto-methods to use.
 			methods = {'salsa2012+umac'},
 			mtu = 1406,
 			configurable = true,
 			groups = {
 				backbone = {
 					-- Limit number of connected peers to reduce bandwidth.
@@ @@ -109,39 +107,43 @@ @@
 						},
 						test = {
 							key = '95b22943135927cc1da6800ba152819ae5ee26cbb83d6354bc81a5ce632fcb5a',
-            remotes = {'ipv4 "fflux-test.freifunk.lu" port 10000'},
+							remotes = {'"fflux-test.freifunk.lu" port 10000'},
 						},
 					},
 				},
 			},
 		},
 		bandwidth_limit = {
 			-- preset can be enabled by default here
 			enabled = false,
 			-- in kbit/s
 			egress = 2560, -- 2 Mbit/
 			ingress = 10240, -- 10 Mbit/s
 		},
 	},
 	autoupdater = {
 		-- Set GLUON_AUTOUPDATER_ENABLED to enable the autoupdater by default for newly installed nodes.
 		enabled = true,
-    -- Default branch. Don't forget to set GLUON_BRANCH when building!
+		-- Default branch (optional), can be overridden by setting GLUON_AUTOUPDATER_BRANCH when building.
 		branch = 'stable',
     -- List of branches. You may define multiple branches.
 		branches = {
 			stable = {
 				name = 'stable',
 				-- List of mirrors to fetch images from. IPv6 required!
 				mirrors = {
 					'http://[fd4e:f2d7:88d2:fffe::10]/stable/sysupgrade',
 					'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade',
 					'http://[fd4e:f2d7:88d2:fffe::12]/stable/sysupgrade',
 					'http://[fd4e:f2d7:88d2:fffe::19]/stable/sysupgrade',
 					'http://firmware.freifunk.lu/stable/sysupgrade',
 				},
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
 				good_signatures = 1,
         -- List of public keys of maintainers.
 				pubkeys = {
 						'22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
 						'45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
@@ @@ -155,19 +157,15 @@ @@
 				-- List of mirrors to fetch images from. IPv6 required!
 				mirrors = {
 					'http://[fd4e:f2d7:88d2:fffe::10]/beta/sysupgrade',
 					'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
 					'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade',
 					'http://[fd4e:f2d7:88d2:fffe::19]/beta/sysupgrade',
 					'http://firmware.freifunk.lu/beta/sysupgrade',
 				},
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
 				good_signatures = 1,
         -- List of public keys of maintainers.
 				pubkeys = {
 					'22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
 					'45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
@@ @@ -181,19 +179,15 @@ @@
 				-- List of mirrors to fetch images from. IPv6 required!
 				mirrors = {
 					'http://[fd4e:f2d7:88d2:fffe::10]/experimental/sysupgrade',
 					'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
 					'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade',
 					'http://[fd4e:f2d7:88d2:fffe::19]/experimental/sysupgrade',
 					'http://firmware.freifunk.lu/experimental/sysupgrade',
 				},
         -- Number of good signatures required.
         -- Have multiple maintainers sign your build and only
         -- accept it when a sufficient number of them have
         -- signed it.
 				good_signatures = 1,
         -- List of public keys of maintainers.
 				pubkeys = {
 						'22e564fd31849637738ab5881469ea51cd4afd181c444244eb8a8ee04df40fef', -- orimpe
 						'45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
@@ @@ -201,19 +195,7 @@ @@
 						'6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
 				},
 			},
     },
 		},
   bandwidth_limit = {
       -- The bandwidth limit can be enabled by default here.
       enabled = false,
       -- Default upload limit (kbit/s).
       egress = 200,
       -- Default download limit (kbit/s).
       ingress = 3000,
 	},
 	ssid_changer = {

site_config/beta/site/site.mk

➞

Show inline comments

 ##	gluon site.mk makefile example
 ##      GLUON_FEATURES
 #               Specify Gluon features/packages to enable;
 #               Gluon will automatically enable a set of packages
 #               depending on the combination of features listed
 GLUON_FEATURES := \
         autoupdater \
         ebtables-filter-multicast \
         ebtables-filter-ra-dhcp \
         ebtables-limit-arp \
         mesh-batman-adv-15 \
         mesh-vpn-fastd \
         respondd \
         status-page \
         web-advanced \
 	wireless-encryption-wpa3 \
         web-wizard
 ##	GLUON_SITE_PACKAGES
 #		specify gluon/openwrt packages to include here
 #               The gluon-mesh-batman-adv-* package must come first because of the dependency resolution
 GLUON_SITE_PACKAGES := \
 		gluon-mesh-batman-adv-15 \
 		gluon-autoupdater \
 		gluon-config-mode-autoupdater \
 		gluon-config-mode-hostname \
 		gluon-config-mode-mesh-vpn \
 		gluon-config-mode-geo-location \
 		gluon-config-mode-contact-info \
 		gluon-config-mode-core \
 		gluon-ebtables-filter-multicast \
 		gluon-ebtables-filter-ra-dhcp \
 		gluon-web-admin \
 		gluon-web-autoupdater \
 		gluon-web-wifi-config \
 		gluon-web-private-wifi \
 		gluon-mesh-vpn-fastd \
 		gluon-radvd \
 		gluon-respondd \
 	        gluon-setup-mode \
 		gluon-status-page \
 		gluon-ssid-changer \
 		respondd-module-airtime \
 		iwinfo \
 		# freifunk-gluon/gluon #2046 - Builds fail with iptables in GLUON_SITE_PACKAGES
 		# Note that iptables is an OpenWrt core package that is included by default (which is what triggered this bug).
 		#iptables \
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
 #		gluon relies on
@@ @@ -58,7 +7,7 @@ GLUON_SITE_PACKAGES := \ @@
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
 # Naming after gluon: v2023.1 = 2023.1.0, as they might release v2023.1.1 = 2023.1.1
-DEFAULT_GLUON_RELEASE := 2023.1.2.0~beta20250223
+DEFAULT_GLUON_RELEASE := 2023.2.5.0~beta20251015
 ##	GLUON_RELEASE
@@ @@ -88,36 +37,5 @@ GLUON_LANGS ?= de en @@
 # define a region for specific devices like TP-Link Archer C7
 GLUON_REGION := eu
 USB_X86_GENERIC_NETWORK_MODULES := \
 		kmod-usb-ohci-pci \
 		kmod-sky2 \
 		kmod-atl2 \
 		kmod-igb \
 		kmod-3c59x \
 		kmod-e100 \
 		kmod-e1000 \
 		kmod-e1000e \
 		kmod-natsemi \
 		kmod-ne2k-pci \
 		kmod-pcnet32 \
 		kmod-8139too \
 		kmod-r8169 \
 		kmod-sis900 \
 		kmod-tg3 \
 		kmod-via-rhine \
 		kmod-via-velocity \
 		kmod-forcedeth \
 		kmod-iwlwifi
 ifeq ($(GLUON_TARGET),x86-generic)
 		GLUON_SITE_PACKAGES += \
 	$(USB_X86_GENERIC_NETWORK_MODULES)
 endif
 ifeq ($(GLUON_TARGET),x86-64)
               GLUON_SITE_PACKAGES += \
        $(USB_X86_GENERIC_NETWORK_MODULES)
 endif
 # Do not build images for deprecated devices
 GLUON_DEPRECATED ?= 0

0 comments (0 inline, 0 general)