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

Changeset - fa159b5b9447

Parent rev.

Child rev.

[Not reviewed]

0 6 0

x - 4 months ago 2025-01-07 01:12:55
xbr@c3l.lu

Revert "Add new xbr signing keys // 2023.1.0 20240714"

This reverts commit 228ce089848887a8525d78e83798182ac128ffcb.
Signing keys were found.

6 files changed with 12 insertions and 12 deletions:

site_config/beta/site/site.conf

site_config/beta/site/site.mk

site_config/experimental/site/site.conf

site_config/experimental/site/site.mk

site_config/stable/site/site.conf

site_config/stable/site/site.mk

0 comments (0 inline, 0 general)

site_config/beta/site/site.conf

➞

Show inline comments

@@ @@ -135,25 +135,25 @@ @@
 	        '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
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+	    '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       beta = {
         name = 'beta',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade',
@@ @@ -161,25 +161,25 @@ @@
 		'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
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       experimental = {
         name = 'experimental',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade',
@@ @@ -187,25 +187,25 @@ @@
 		'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
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
     },
   },
   bandwidth_limit = {
       -- The bandwidth limit can be enabled by default here.
       enabled = false,

site_config/beta/site/site.mk

➞

Show inline comments

@@ @@ -49,25 +49,25 @@ GLUON_SITE_PACKAGES := \ @@
 		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
 #			opkg compare-versions "$1" '>>' "$2"
 #		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.0.0~beta20240714
+DEFAULT_GLUON_RELEASE := 2023.1.0.0~beta20240711
 ##	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)

site_config/experimental/site/site.conf

➞

Show inline comments

@@ @@ -135,25 +135,25 @@ @@
 	        '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
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+	    '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       beta = {
         name = 'beta',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade',
@@ @@ -161,25 +161,25 @@ @@
 		'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
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       experimental = {
         name = 'experimental',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade',
@@ @@ -187,25 +187,25 @@ @@
 		'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
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
     },
   },
   bandwidth_limit = {
       -- The bandwidth limit can be enabled by default here.
       enabled = false,

site_config/experimental/site/site.mk

➞

Show inline comments

@@ @@ -49,25 +49,25 @@ GLUON_SITE_PACKAGES := \ @@
 		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
 #			opkg compare-versions "$1" '>>' "$2"
 #		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.0.0~exp20240714
+DEFAULT_GLUON_RELEASE := 2023.1.0.0~exp20240710
 ##	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)

site_config/stable/site/site.conf

➞

Show inline comments

@@ @@ -135,25 +135,25 @@ @@
 	        '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
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+	    '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       beta = {
         name = 'beta',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/beta/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/beta/sysupgrade',
@@ @@ -161,25 +161,25 @@ @@
 		'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
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
       experimental = {
         name = 'experimental',
         -- List of mirrors to fetch images from. IPv6 required!
         mirrors = {
 		'http://[fd4e:f2d7:88d2:fffe::11]/experimental/sysupgrade',
 		'http://[fd4e:f2d7:88d2:fffe::12]/experimental/sysupgrade',
@@ @@ -187,25 +187,25 @@ @@
 		'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
-            '34a890bccca9aeba6c991653ba3c0a8c7e011b7f483c2c9e0477a28c67673411', -- xbr
+            '45c0d4a3d60c03f81ea75dd887474d99b29cd541f30807465e01de6c1b721b54', -- xbr
             '0e6c109a94d062fb5d03c49d42a7e13db5a5c6f7639922e4da38d30026ee7164', -- metalgamer
             '6e70a4bff82d70bb4f7d19ab170bf9f9aee64181567fefee040995fb9e5c1547' -- fantawams
         },
       },
     },
   },
   bandwidth_limit = {
       -- The bandwidth limit can be enabled by default here.
       enabled = false,

site_config/stable/site/site.mk

➞

Show inline comments

@@ @@ -49,25 +49,25 @@ GLUON_SITE_PACKAGES := \ @@
 		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
 #			opkg compare-versions "$1" '>>' "$2"
 #		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.0~stable20240714
+DEFAULT_GLUON_RELEASE := 2023.1.0~stable20240711
 ##	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)

0 comments (0 inline, 0 general)