Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: freifunk-gluon/gluon
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 07cba34cc24a237ae031107e555729aa11aa4472
Choose a base ref
..
head repository: freifunk-gluon/gluon
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 488303e505b11a9b3d656add7de6717182e86d34
Choose a head ref
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -48,6 +48,6 @@ existing commit messages to get the idea.


[packages]: https://gluon.readthedocs.io/en/latest/user/site.html#packages
[#gluon]: https://webirc.hackint.org/#gluon
[#gluon]: https://chat.hackint.org/?join=gluon
[mailing list]: mailto:gluon@luebeck.freifunk.net
[list of rejected features]: https://github.com/freifunk-gluon/gluon/issues?q=label%3A%222.+status%3A+rejected%22
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ If you're new to Gluon and ready to get your feet wet, have a look at the
[Getting Started Guide](https://gluon.readthedocs.io/en/latest/user/getting_started.html).

Gluon's developers frequent an IRC chatroom at [#gluon](ircs://irc.hackint.org/#gluon)
on [hackint](https://hackint.org/). There is also a [webchat](https://webirc.hackint.org/#irc://irc.hackint.org/#gluon)
on [hackint](https://hackint.org/). There is also a [webchat](https://chat.hackint.org/?join=gluon)
that allows for uncomplicated access from within your browser. This channel is also available as a bridged Matrix Room at [#gluon:hackint.org](https://matrix.to/#/#gluon:hackint.org).

## Issues & Feature requests
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@
# used to mark channel names and do not exist. Regular links are not effected.
linkcheck_ignore = [
'http://192.168.1.1',
'https://webirc.hackint.org/#'
'https://chat.hackint.org'
]


2 changes: 1 addition & 1 deletion docs/dev/basics.rst
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ web browser. You're welcome to join us!

.. _#gluon: ircs://irc.hackint.org/#gluon
.. _hackint: https://hackint.org/
.. _webchat: https://webirc.hackint.org/#irc://irc.hackint.org/#gluon
.. _webchat: https://chat.hackint.org/?join=gluon

.. _working-with-repositories:

5 changes: 5 additions & 0 deletions docs/user/supported_devices.rst
Original file line number Diff line number Diff line change
@@ -267,6 +267,10 @@ ipq806x-generic

- R7800

* Ubiquiti

- UniFi AC HD

lantiq-xrx200
-------------

@@ -460,6 +464,7 @@ ramips-mt7621
- EdgeRouter X
- EdgeRouter X-SFP
- UniFi 6 Lite
- UniFi nanoHD

* Wavlink

Original file line number Diff line number Diff line change
@@ -122,6 +122,7 @@ local primary_addrs = {
}},
{'kirkwood', 'generic', {
'linksys,e4200-v2',
'linksys,ea4500',
}},
{'mpc85xx', 'p1020', {
'aerohive,hiveap-330',
4 changes: 4 additions & 0 deletions package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
Original file line number Diff line number Diff line change
@@ -67,6 +67,10 @@ elseif platform.match('ipq40xx', 'generic', {
'avm,fritzbox-7530',
}) then
lan_ifname, wan_ifname = 'lan2 lan3 lan4', 'lan1'
elseif platform.match('ipq806x', 'generic', {
'ubnt,unifi-ac-hd',
}) then
lan_ifname, wan_ifname = 'eth1', 'eth0'
elseif platform.match('ramips', 'mt7621', {
'netgear,wac104',
}) then
Original file line number Diff line number Diff line change
@@ -111,7 +111,7 @@ uci:foreach("system", "gpio_switch", function(si)
["active_low"] = false,
},
-- Typo in AP-303H (ipq40xx-generic)
["^PoE Passtrough disable$"] = {
["^POE passtrough disable$"] = {
["func"] = function() return translate("Enable PoE Passthrough") end,
["active_low"] = true,
},
2 changes: 2 additions & 0 deletions targets/generic
Original file line number Diff line number Diff line change
@@ -82,6 +82,8 @@ config('TARGET_PER_DEVICE_ROOTFS', true)

config('GLUON_MULTIDOMAIN', istrue(env.GLUON_MULTIDOMAIN))

try_config('GRUB_TITLE', 'Gluon')

config('AUTOREMOVE', istrue(env.GLUON_AUTOREMOVE))

if (tonumber(env.GLUON_DEBUG) or 0) > 1 then
6 changes: 6 additions & 0 deletions targets/ipq806x-generic
Original file line number Diff line number Diff line change
@@ -26,3 +26,9 @@ device('netgear-nighthawk-x4s-r7800', 'netgear_r7800', {
factory_ext = '.img',
packages = QCA9984_PACKAGES,
})

-- Ubiquiti
device('ubiquiti-unifi-ac-hd', 'ubnt_unifi-ac-hd', {
packages = QCA9984_PACKAGES,
factory = false,
})
6 changes: 5 additions & 1 deletion targets/kirkwood-generic
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
-- Linksys

device('linksys-e4200-v2-viper', 'linksys_e4200-v2', {
broken = true, -- 802.11s untested
broken = true, -- no 802.11s support
})

device('linksys-ea4500-viper', 'linksys_ea4500', {
broken = true, -- no 802.11s support
})
4 changes: 4 additions & 0 deletions targets/ramips-mt7621
Original file line number Diff line number Diff line change
@@ -112,6 +112,10 @@ device('ubiquiti-unifi-6-lite', 'ubnt_unifi-6-lite', {
factory = false,
})

device('ubiquiti-unifi-nanohd', 'ubnt_unifi-nanohd', {
factory = false,
})


-- Wavlink

2 changes: 1 addition & 1 deletion targets/targets.mk
Original file line number Diff line number Diff line change
@@ -29,6 +29,6 @@ $(eval $(call GluonTarget,x86,64))
ifeq ($(BROKEN),1)
$(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
$(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: No 11s support, no reset button, sys LED issues
$(eval $(call GluonTarget,kirkwood,generic)) # BROKEN: 11s support untested
$(eval $(call GluonTarget,kirkwood,generic)) # BROKEN: No devices with 11s support
$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
endif