Skip to content

Commit 0fdb544

Browse files
authored
Merge pull request #118 from ffac/add_packages
update installed packages
2 parents 89383a0 + 1249e73 commit 0fdb544

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

image-customization.lua

+4-3
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if device({
5050
'web-cellular',
5151
}
5252
packages {
53-
'ffac-private-wan-dhcp',
53+
'ffac-web-private-wan-dhcp',
5454
}
5555
end
5656

@@ -179,6 +179,7 @@ if include_usb then
179179
packages(pkgs_usb_net)
180180
packages(pkgs_usb_serial)
181181
packages(pkgs_usb_storage)
182+
packages {'ffka-gluon-web-usb-wan-hotplug', 'ffac-update-location-gps'}
182183
end
183184

184185
-- device has no reset button and requires a special package to go into setup mode
@@ -207,8 +208,8 @@ if target('bcm27xx') then
207208
packages(pkgs_hid)
208209
end
209210

210-
if target('ramips', 'mt7621') or target('mediatek', 'filogic') then
211-
-- reload wifi firmware twice a day
211+
if target('ramips', 'mt7621') or target('ramips', 'mt7622') or target('mediatek', 'filogic') then
212+
-- restart device if mt7915e driver shows known failure symptom
212213
packages {
213214
'ffac-mt7915-hotfix',
214215
}

modules

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
GLUON_SITE_FEEDS="ffac community"
2-
3-
PACKAGES_FFAC_REPO=https://github.com/ffac/gluon-packages.git
4-
PACKAGES_FFAC_COMMIT=e3e0b5aac4ed0d610eb06161061b907b5bb2117d
5-
PACKAGES_FFAC_BRANCH=main
1+
GLUON_SITE_FEEDS="community ffac"
62

73
PACKAGES_COMMUNITY_REPO=https://github.com/freifunk-gluon/community-packages.git
8-
PACKAGES_COMMUNITY_COMMIT=ed68c7060e6122537038ece7de920d199aeed9b0
9-
PACKAGES_COMMUNITY_BRANCH=master
4+
PACKAGES_COMMUNITY_COMMIT=106ff0544832fcc5573a1bea504c0b0a536cb1cd
5+
PACKAGES_COMMUNITY_BRANCH=update-location-gps
6+
7+
PACKAGES_FFAC_REPO=https://github.com/ffac/gluon-packages.git
8+
PACKAGES_FFAC_COMMIT=b7ccdae873eebaa01aa555ec2a356d370e8d3908
9+
PACKAGES_FFAC_BRANCH=private-wan-dhcp-web

release.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
2-
GLUON_GIT_REF := v2023.2.3 # v2023.2.x
2+
GLUON_GIT_REF := 05b36ba7608f7ac83373cd4bdfc34ef142e05c76 # v2023.2.x

0 commit comments

Comments
 (0)