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

Changeset - ae2d94d71987

Parent rev.

Child rev.

[Not reviewed]

0 6 0

Max Wahl (Fantawams) - 4 years ago 2021-01-04 18:33:03
fantawams@c3l.lu

updated beta and experimental site config for Gluon 2020.2.2

6 files changed with 62 insertions and 29 deletions:

site_config/beta/site/i18n/en.po

site_config/beta/site/site.conf

site_config/beta/site/site.mk

site_config/experimental/site/i18n/en.po

site_config/experimental/site/site.conf

site_config/experimental/site/site.mk

0 comments (0 inline, 0 general)

site_config/beta/site/i18n/en.po

➞

Show inline comments

@@ @@ -6,25 +6,45 @@ msgstr "" @@
 "Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
 "Language-Team: English\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 msgid "gluon-config-mode:welcome"
 msgstr ""
 "Welcome the the setup wizard of your new Freifunk Luxembourg node. "
 "Please fill out the following form and transmit it."
 msgid "gluon-config-mode:contact-help"
 msgstr ""
 "You may input your contact mail here. This is needed so we may contact you in case of an emergency."
 "If you not wich to provide here an contact mail, please subscribe into our <a href=\"https://lists.c3l.lu/listinfo/freifunk_luxembourg\">our user maillinf list</a>."
 "There we share all inportant information with our community."
 msgid "gluon-config-mode:hostname-help"
 "Insert a hostname for your freifunk node. Please start with fflux-"
 msgid "gluon-config-mode:geo-location-help"
 msgstr ""
 "Insert here your coordinates, where your Freifunk is physcally installed. This is optional."
 msgid "gluon-config-mode:altitude-label"
 msgstr ""
 "altitude"
 msgstr ""
 " Hostname Help"
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "<!-- empty -->"
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>The node is currently rebooting and will try to connect to other "
 "nearby Freifunk Luxembourg nodes after that. "
 "You can find lots of information on the Freifunk Luxembourg community on "
 "<a href=\"https://luxembourg.freifunk.net/\">our homepage</a>.</p>"
 "<p>To get back to this configuration interface, press the reset button for "
 "3 seconds during normal operation. The device will then reboot into config "
 "mode.</p>"

site_config/beta/site/site.conf

➞

Show inline comments

@@ @@ -22,25 +22,25 @@ @@
   -- Prefixes used within the mesh. Both are required.
   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
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   -- List of NTP servers in your community.
   -- Must be reachable using IPv6!
-  ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::12'},
+  ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::13'},
   -- Wireless regulatory domain of your community.
   regdom = 'LU',
   -- Wireless configuratoin for 2.4 GHz interfaces.
   wifi24 = {
     -- Wireless channel.
     channel = 1,
 	ap = {
 	  ssid = 'luxembourg.freifunk.net',
 	},
@@ @@ -58,28 +58,26 @@ @@
     channel = 36;
 	ap = {
 	  ssid = 'luxembourg.freifunk.net',
 	},
 	mesh = {
 	  id = 'freifunk-mesh',
 	  mcast_rate = 12000,
 	},
   },
   mesh = {
     vxlan = true,
     filter_membership_reports = false,
     batman_adv = {
       routing_algo = 'BATMAN_IV',
       gw_sel_class = 1,
      },
    },
   -- The next node feature allows clients to always reach the node it is
   -- connected to using a known IP address.
   next_node = {
     -- anycast IPs of all nodes
     ip4 = '10.24.128.1',
     ip6 = 'fd4e:f2d7:88d2:fffe::1',
     -- anycast MAC of all nodes
     mac = '32:3d:f9:8f:01:53',
@@ @@ -92,101 +90,101 @@ @@
     mtu = 1406,
    fastd = {
     configurable = true,
     -- List of crypto-methods to use.
     methods = {'salsa2012+umac'},
     groups = {
       backbone = {
         -- Limit number of connected peers to reduce bandwidth.
         limit = 1,
         -- List of peers.
         peers = {
       gw2= {
 	    key = '2797c078ab5176ec27951cbe9d685e3212320217042494a37d8252fcb1a3029c',
 	    remotes = {'ipv4 "fflux-gw2.c3l.lu" port 10000'},
       gw1= {
 	    key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6',
 	    remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'},
       },
 	  gw3= {
 	    key = '8e15baeaca68163c60fe97292cb4268616e16710d51f9d4605cd70c00ad0c7eb',
 	    remotes = {'ipv4 "fflux-gw3.c3l.lu" port 10000'},
+	  }
         },
       },
     },
    },
   },
   autoupdater = {
     enabled = true,
     -- Default branch. Don't forget to set GLUON_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::12]/firmware/stable/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/firmware/stable/sysupgrade',
 	        'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/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 = {
             '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta
         },
       },
       beta = {
         name = 'beta',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
             'http://[fd4e:f2d7:88d2:fffe::12]/firmware/beta/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/firmware/beta/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/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 = {
 		    '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta
         },
       },
       experimental = {
         name = 'experimental',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
             'http://[fd4e:f2d7:88d2:fffe::12]/firmware/experimental/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/firmware/experimental/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/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 = {
 		    '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid

site_config/beta/site/site.mk

➞

Show inline comments

@@ @@ -38,33 +38,32 @@ GLUON_SITE_PACKAGES := \ @@
 		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 \
 		iptables \
 		haveged
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
 #		gluon relies on
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
-DEFAULT_GLUON_RELEASE := 2020.1.4~beta20201118
+DEFAULT_GLUON_RELEASE := 2020.2.2.0~beta20201230
 ##	GLUON_RELEASE
 #		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
 #		e.g.:
 #			$ make images GLUON_RELEASE=23.42+5
 #		would generate images named like this:
 #			gluon-ff%site_code%-23.42+5-%router_model%.bin
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
@@ @@ -104,13 +103,12 @@ USB_X86_GENERIC_NETWORK_MODULES := \ @@
 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

site_config/experimental/site/i18n/en.po

➞

Show inline comments

@@ @@ -6,25 +6,45 @@ msgstr "" @@
 "Last-Translator: Matthias Schiffer <mschiffer@universe-factory.net>\n"
 "Language-Team: English\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 msgid "gluon-config-mode:welcome"
 msgstr ""
 "Welcome the the setup wizard of your new Freifunk Luxembourg node. "
 "Please fill out the following form and transmit it."
 msgid "gluon-config-mode:contact-help"
 msgstr ""
 "You may input your contact mail here. This is needed so we may contact you in case of an emergency."
 "If you not wich to provide here an contact mail, please subscribe into our <a href=\"https://lists.c3l.lu/listinfo/freifunk_luxembourg\">our user maillinf list</a>."
 "There we share all inportant information with our community."
 msgid "gluon-config-mode:hostname-help"
 "Insert a hostname for your freifunk node. Please start with fflux-"
 msgid "gluon-config-mode:geo-location-help"
 msgstr ""
 "Insert here your coordinates, where your Freifunk is physcally installed. This is optional."
 msgid "gluon-config-mode:altitude-label"
 msgstr ""
 "altitude"
 msgstr ""
 " Hostname Help"
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 "<!-- empty -->"
 msgid "gluon-config-mode:reboot"
 msgstr ""
 "<p>The node is currently rebooting and will try to connect to other "
 "nearby Freifunk Luxembourg nodes after that. "
 "You can find lots of information on the Freifunk Luxembourg community on "
 "<a href=\"https://luxembourg.freifunk.net/\">our homepage</a>.</p>"
 "<p>To get back to this configuration interface, press the reset button for "
 "3 seconds during normal operation. The device will then reboot into config "
 "mode.</p>"

site_config/experimental/site/site.conf

➞

Show inline comments

@@ @@ -22,25 +22,25 @@ @@
   -- Prefixes used within the mesh. Both are required.
   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
   timezone = 'CET-1CEST,M3.5.0,M10.5.0/3',
   -- List of NTP servers in your community.
   -- Must be reachable using IPv6!
-  ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::12'},
+  ntp_servers = {'fd4e:f2d7:88d2:fffe::11','fd4e:f2d7:88d2:fffe::13'},
   -- Wireless regulatory domain of your community.
   regdom = 'LU',
   -- Wireless configuratoin for 2.4 GHz interfaces.
   wifi24 = {
     -- Wireless channel.
     channel = 1,
 	ap = {
 	  ssid = 'luxembourg.freifunk.net',
 	},
@@ @@ -58,28 +58,26 @@ @@
     channel = 36;
 	ap = {
 	  ssid = 'luxembourg.freifunk.net',
 	},
 	mesh = {
 	  id = 'freifunk-mesh',
 	  mcast_rate = 12000,
 	},
   },
   mesh = {
     vxlan = true,
     filter_membership_reports = false,
     batman_adv = {
       routing_algo = 'BATMAN_IV',
       gw_sel_class = 1,
      },
    },
   -- The next node feature allows clients to always reach the node it is
   -- connected to using a known IP address.
   next_node = {
     -- anycast IPs of all nodes
     ip4 = '10.24.128.1',
     ip6 = 'fd4e:f2d7:88d2:fffe::1',
     -- anycast MAC of all nodes
     mac = '32:3d:f9:8f:01:53',
@@ @@ -92,101 +90,101 @@ @@
     mtu = 1406,
    fastd = {
     configurable = true,
     -- List of crypto-methods to use.
     methods = {'salsa2012+umac'},
     groups = {
       backbone = {
         -- Limit number of connected peers to reduce bandwidth.
         limit = 1,
         -- List of peers.
         peers = {
       gw2= {
 	    key = '2797c078ab5176ec27951cbe9d685e3212320217042494a37d8252fcb1a3029c',
 	    remotes = {'ipv4 "fflux-gw2.c3l.lu" port 10000'},
       gw1= {
 	    key = 'd5af753220451b6c181cca469835da9c67d3ca9603465e13a5adb9b64f89f3c6',
 	    remotes = {'ipv4 "fflux-gw1.freifunk.lu" port 10000'},
       },
 	  gw3= {
 	    key = '8e15baeaca68163c60fe97292cb4268616e16710d51f9d4605cd70c00ad0c7eb',
 	    remotes = {'ipv4 "fflux-gw3.c3l.lu" port 10000'},
+	  }
         },
       },
     },
    },
   },
   autoupdater = {
     enabled = true,
     -- Default branch. Don't forget to set GLUON_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::12]/firmware/stable/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/firmware/stable/sysupgrade',
 	        'http://[fd4e:f2d7:88d2:fffe::11]/stable/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/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 = {
             '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta
         },
       },
       beta = {
         name = 'beta',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
             'http://[fd4e:f2d7:88d2:fffe::12]/firmware/beta/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/firmware/beta/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/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 = {
 		    '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgames
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fanta
         },
       },
       experimental = {
         name = 'experimental',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
             'http://[fd4e:f2d7:88d2:fffe::12]/firmware/experimental/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/firmware/experimental/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
             'http://[fd4e:f2d7:88d2:fffe::13]/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 = {
 		    '4da854e34689c428c9a71e3022c598e88134bce859ae385c1f38e9131d3e9cb5', -- sid

site_config/experimental/site/site.mk

➞

Show inline comments

@@ @@ -45,25 +45,25 @@ GLUON_SITE_PACKAGES := \ @@
 		gluon-status-page \
 		gluon-ssid-changer \
 		respondd-module-airtime \
 		iwinfo \
 		iptables \
 ##	DEFAULT_GLUON_RELEASE
 #		version string to use for images
 #		gluon relies on
 #			opkg compare-versions "$1" '>>' "$2"
 #		to decide if a version is newer or not.
 #DEFAULT_GLUON_RELEASE := sid~exp$(shell date '+%Y%m%d')
-DEFAULT_GLUON_RELEASE := 2020.2.0.0~exp20201118
+DEFAULT_GLUON_RELEASE := 2020.2.2.3~exp20201229
 ##	GLUON_RELEASE
 #		call make with custom GLUON_RELEASE flag, to use your own release version scheme.
 #		e.g.:
 #			$ make images GLUON_RELEASE=23.42+5
 #		would generate images named like this:
 #			gluon-ff%site_code%-23.42+5-%router_model%.bin
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
@@ @@ -103,13 +103,12 @@ USB_X86_GENERIC_NETWORK_MODULES := \ @@
 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)