Skip to content

Commit cbd5ffd

Browse files
authored
Merge pull request #78 from herbetom/bump-gluon-main-5777810c
changes for gluon v2025.1
2 parents 009d43b + f45cf26 commit cbd5ffd

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/build-info.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"gluon": {
33
"repository": "freifunk-gluon/gluon",
4-
"branch": "main",
5-
"commit": "d80e1c990f429562a140ebafd43098e7b380f614"
4+
"branch": "v2025.1.x",
5+
"commit": "5777810c92e56ef9ea0a57151c5f6d795a7e7642"
66
},
77
"container": {
8-
"version": "main"
8+
"version": "v2025.1.x"
99
},
1010
"build": {
1111
"targets": [

modules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ PACKAGES_FFRN_REPO=https://github.com/Freifunk-Rhein-Neckar/ffrn-packages.git
44
PACKAGES_FFRN_COMMIT=b50c8ff1616b80dc0180adbee0b578c97ae4d0b6
55

66
PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
7-
PACKAGES_COMMUNITY_COMMIT=4a90cd221e8eba254ffc8dc5addbf3374b830415
7+
PACKAGES_COMMUNITY_COMMIT=0f6d8131376528f5d9ddc1f88e3ea2f679a51f04

site.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# opkg compare-versions "$1" '>>' "$2"
88
# to decide if a version is newer or not.
99

10-
FFRN_SITE_VERSION := 2.3
10+
FFRN_SITE_VERSION := 2.4
1111

1212
DEFAULT_GLUON_RELEASE := $(FFRN_SITE_VERSION).x-$(shell date '+%Y%m%d')
1313
DEFAULT_GLUON_PRIORITY := 0

0 commit comments

Comments
 (0)