Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon
Commits
3a0b0b06
Unverified
Commit
3a0b0b06
authored
1 year ago
by
David Bauer
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #2825 from blocktrron/upstream-master-updates
modules: update to latest Git HEAD
parents
1c6405a7
44e79fc5
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules
+3
-3
3 additions, 3 deletions
modules
patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
+7
-7
7 additions, 7 deletions
...4-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
with
10 additions
and
10 deletions
modules
+
3
−
3
View file @
3a0b0b06
...
@@ -2,15 +2,15 @@ GLUON_FEEDS='packages routing gluon'
...
@@ -2,15 +2,15 @@ GLUON_FEEDS='packages routing gluon'
OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-22.03
OPENWRT_BRANCH=openwrt-22.03
OPENWRT_COMMIT=
0a32f66fea95cabc5d21c945678d918bed8cca47
OPENWRT_COMMIT=
f5db04e8ea8377046a86885fdd5a83e948b54918
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-22.03
PACKAGES_PACKAGES_BRANCH=openwrt-22.03
PACKAGES_PACKAGES_COMMIT=
f06652bc117bb5af42db5f87fe5371a071a38064
PACKAGES_PACKAGES_COMMIT=
0d566071c90f7c1088fdc09360dc4216bef6765e
PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_BRANCH=openwrt-22.03
PACKAGES_ROUTING_BRANCH=openwrt-22.03
PACKAGES_ROUTING_COMMIT=cc
1dd763e08cc03926883a8943212f7edf2bf2ce
PACKAGES_ROUTING_COMMIT=
1
cc
7676b9f32acc30ec47f15fcb70380d5d6ef01
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff
PACKAGES_GLUON_COMMIT=04d2b6ffbb6ee02012f2733b7752d8db0d12eaff
This diff is collapsed.
Click to expand it.
patches/openwrt/0004-ramips-mt7621-make-DSA-images-swconfig-upgradable.patch
+
7
−
7
View file @
3a0b0b06
...
@@ -3,7 +3,7 @@ Date: Sun, 5 Jun 2022 23:43:38 +0200
...
@@ -3,7 +3,7 @@ Date: Sun, 5 Jun 2022 23:43:38 +0200
Subject: ramips-mt7621: make DSA images swconfig upgradable
Subject: ramips-mt7621: make DSA images swconfig upgradable
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index
961f8a3b7514a3658f8d4795c13
6d50
69830126f..982ca6b9196853df2ab5070c26f175ade6567eaa
100644
index
df2b935c88
6d
f
50
badb2cfed64d803e36f995894..70286a5ce17581672467408dc001f4f33966503c
100644
--- a/target/linux/ramips/image/mt7621.mk
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -179,7 +179,6 @@
endef
@@ -179,7 +179,6 @@
endef
...
@@ -14,7 +14,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
...
@@ -14,7 +14,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
DEVICE_VENDOR := ASUS
DEVICE_VENDOR := ASUS
DEVICE_MODEL := RT-AC57U
DEVICE_MODEL := RT-AC57U
DEVICE_ALT0_VENDOR := ASUS
DEVICE_ALT0_VENDOR := ASUS
@@ -12
33
,7 +12
32
,6 @@
endef
@@ -12
46
,7 +12
45
,6 @@
endef
TARGET_DEVICES += mts_wg430223
TARGET_DEVICES += mts_wg430223
define Device/netgear_ex6150
define Device/netgear_ex6150
...
@@ -22,7 +22,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
...
@@ -22,7 +22,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
$(Device/uimage-lzma-loader)
$(Device/uimage-lzma-loader)
DEVICE_VENDOR := NETGEAR
DEVICE_VENDOR := NETGEAR
DEVICE_MODEL := EX6150
DEVICE_MODEL := EX6150
@@ -12
46
,7 +12
44
,6 @@
endef
@@ -12
59
,7 +12
57
,6 @@
endef
TARGET_DEVICES += netgear_ex6150
TARGET_DEVICES += netgear_ex6150
define Device/netgear_sercomm_nand
define Device/netgear_sercomm_nand
...
@@ -30,7 +30,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
...
@@ -30,7 +30,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
$(Device/uimage-lzma-loader)
$(Device/uimage-lzma-loader)
BLOCKSIZE := 128k
BLOCKSIZE := 128k
PAGESIZE := 2048
PAGESIZE := 2048
@@ -142
9
,7 +14
26
,6 @@
endef
@@ -14
4
2,7 +14
39
,6 @@
endef
TARGET_DEVICES += netgear_wax202
TARGET_DEVICES += netgear_wax202
define Device/netgear_wndr3700-v5
define Device/netgear_wndr3700-v5
...
@@ -38,7 +38,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
...
@@ -38,7 +38,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
$(Device/netgear_sercomm_nor)
$(Device/netgear_sercomm_nor)
$(Device/uimage-lzma-loader)
$(Device/uimage-lzma-loader)
IMAGE_SIZE := 15232k
IMAGE_SIZE := 15232k
@@ -17
54
,7 +175
0
,6 @@
endef
@@ -17
79
,7 +17
7
5,6 @@
endef
TARGET_DEVICES += tplink_tl-wpa8631p-v3
TARGET_DEVICES += tplink_tl-wpa8631p-v3
define Device/ubnt_edgerouter_common
define Device/ubnt_edgerouter_common
...
@@ -46,7 +46,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
...
@@ -46,7 +46,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
$(Device/uimage-lzma-loader)
$(Device/uimage-lzma-loader)
DEVICE_VENDOR := Ubiquiti
DEVICE_VENDOR := Ubiquiti
IMAGE_SIZE := 256768k
IMAGE_SIZE := 256768k
@@ -21
70
,7 +21
65
,6 @@
endef
@@ -21
95
,7 +21
90
,6 @@
endef
TARGET_DEVICES += zbtlink_zbt-wg2626
TARGET_DEVICES += zbtlink_zbt-wg2626
define Device/zbtlink_zbt-wg3526-16m
define Device/zbtlink_zbt-wg3526-16m
...
@@ -54,7 +54,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
...
@@ -54,7 +54,7 @@ index 961f8a3b7514a3658f8d4795c136d5069830126f..982ca6b9196853df2ab5070c26f175ad
$(Device/uimage-lzma-loader)
$(Device/uimage-lzma-loader)
IMAGE_SIZE := 16064k
IMAGE_SIZE := 16064k
DEVICE_VENDOR := Zbtlink
DEVICE_VENDOR := Zbtlink
@@ -2
183
,7 +2
177
,6 @@
endef
@@ -2
208
,7 +2
202
,6 @@
endef
TARGET_DEVICES += zbtlink_zbt-wg3526-16m
TARGET_DEVICES += zbtlink_zbt-wg3526-16m
define Device/zbtlink_zbt-wg3526-32m
define Device/zbtlink_zbt-wg3526-32m
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment