Compare commits
44 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
c3eaef90ec | ||
|
a50cac3179 | ||
|
d1fe2d56ad | ||
|
b84f1adc69 | ||
|
ebf3a4885d | ||
|
d86414e06d | ||
|
20f842ab1e | ||
|
40f95813dd | ||
|
0318d204a7 | ||
|
c18eb388ef | ||
|
20adee3227 | ||
|
9a84bbf6ba | ||
|
61cdb44c77 | ||
|
b56bf77979 | ||
|
1617442981 | ||
|
8647b782f7 | ||
|
d4862a0130 | ||
|
7202216495 | ||
|
0bb3742f51 | ||
|
42c895944f | ||
|
1649358d17 | ||
|
e107415949 | ||
|
ff38b5add7 | ||
|
aade4393fb | ||
|
faddb3d193 | ||
|
51b7928a55 | ||
|
4644f85bfc | ||
|
dddd2cd011 | ||
|
7408f04605 | ||
|
469e0107e2 | ||
|
ed3cb1f541 | ||
|
bc0d240d75 | ||
|
b4e87400ca | ||
|
6a3d5554c1 | ||
|
0cb98882d0 | ||
|
a0286d5641 | ||
|
aaef6163ff | ||
|
ea9a69f7da | ||
|
a7a5db9f54 | ||
|
658f1ea402 | ||
|
04c002a7c2 | ||
|
18aab98cf8 | ||
|
c28b797c91 | ||
|
098ca81df9 |
@ -19,7 +19,7 @@ the future development of Gluon.
|
||||
|
||||
Please refrain from using the `master` branch for anything else but development purposes!
|
||||
Use the most recent release instead. You can list all releases by running `git tag`
|
||||
and switch to one by running `git checkout v2018.1 && make update`.
|
||||
and switch to one by running `git checkout v2018.1.4 && make update`.
|
||||
|
||||
If you're using the autoupdater, do not autoupdate nodes with anything but releases.
|
||||
If you upgrade using random master commits the nodes *will break* eventually.
|
||||
|
@ -52,11 +52,7 @@ copyright = '2015-2018, Project Gluon'
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
# |version| and |release|, also used in various other places throughout the
|
||||
# built documents.
|
||||
#
|
||||
# The short X.Y version.
|
||||
version = '2018.1'
|
||||
# The full version, including alpha/beta/rc tags.
|
||||
release = '2018.1'
|
||||
version = release = '2018.1.4'
|
||||
|
||||
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||
# for a list of supported languages.
|
||||
|
@ -8,10 +8,10 @@ Building Images
|
||||
|
||||
By default, the autoupdater is disabled (as it is usually not helpful to have unexpected updates
|
||||
during development), but it can be enabled by setting the variable GLUON_BRANCH when building
|
||||
to override the default branch set in the set in the site configuration.
|
||||
to override the default branch set in the site configuration.
|
||||
|
||||
A manifest file for the updater can be generated with `make manifest`. A signing script (using
|
||||
``ecdsautils``) can by found in the `contrib` directory. When creating the manifest, the
|
||||
``ecdsautils``) can be found in the `contrib` directory. When creating the manifest, the
|
||||
``PRIORITY`` value may be defined by setting ``GLUON_PRIORITY`` on the command line or in ``site.mk``.
|
||||
|
||||
``GLUON_PRIORITY`` defines the maximum number of days that may pass between releasing an update and installation
|
||||
@ -35,9 +35,9 @@ A fully automated nightly build could use the following commands:
|
||||
::
|
||||
|
||||
git pull
|
||||
(cd site && git pull)
|
||||
(git -C site pull)
|
||||
make update
|
||||
make clean
|
||||
make clean GLUON_TARGET=ar71xx-generic
|
||||
NUM_CORES_PLUS_ONE=$(expr $(nproc) + 1)
|
||||
make -j$NUM_CORES_PLUS_ONE GLUON_TARGET=ar71xx-generic GLUON_BRANCH=experimental
|
||||
make manifest GLUON_BRANCH=$GLUON_BRANCH GLUON_RELEASE=$GLUON_RELEASE
|
||||
|
@ -160,8 +160,8 @@ site.conf only variables
|
||||
in a domain specific way:
|
||||
|
||||
- mesh_vpn.fastd.syslog_level
|
||||
- wifi*.ibss.supported_basic_rates
|
||||
- wifi*.mesh.supported_basic_rates
|
||||
- wifi*.supported_rates
|
||||
- wifi*.basic_rates
|
||||
- timezone
|
||||
- regdom
|
||||
|
||||
@ -214,20 +214,21 @@ domain.conf only variables
|
||||
|
||||
- wifi*.ap.ssid
|
||||
|
||||
- Some values should be only set in legacy domains and not in new domains.
|
||||
- Some values should be only set in legacy domains and not in new domains.
|
||||
|
||||
- mesh.vxlan
|
||||
|
||||
- By default, this value is `true`. It should be only set to `false`
|
||||
for one legacy domain, since vxlan prevents accidental wired
|
||||
merges of domains. For old domains this value is still available
|
||||
to keep compatibility between all nodes in one domain.
|
||||
- By default, this value is `true`. It should be only set to `false`
|
||||
for one legacy domain, since vxlan prevents accidental wired
|
||||
merges of domains. For old domains this value is still available
|
||||
to keep compatibility between all nodes in one domain.
|
||||
|
||||
- next_node.mac
|
||||
|
||||
- For new domains, the default value should be used, since there is
|
||||
no need for a special mac (or domain specific mac). For old domains
|
||||
this value is still available to keep compatibility between all
|
||||
nodes in one domain.
|
||||
- For new domains, the default value should be used, since there is
|
||||
no need for a special mac (or domain specific mac). For old domains
|
||||
this value is still available to keep compatibility between all
|
||||
nodes in one domain.
|
||||
|
||||
Example config
|
||||
--------------
|
||||
|
@ -37,7 +37,7 @@ increase throughput, although in practice the gain is minimal.
|
||||
|
||||
**Gateway configuration:**
|
||||
|
||||
1) Prepend the ``none`` cipher in fastds method list
|
||||
1) Prepend the ``null`` cipher in fastd's method list
|
||||
|
||||
|
||||
**Config Mode:**
|
||||
|
@ -70,6 +70,10 @@ Several Freifunk communities in Germany use Gluon as the foundation of their Fre
|
||||
:caption: Releases
|
||||
:maxdepth: 1
|
||||
|
||||
releases/v2018.1.4
|
||||
releases/v2018.1.3
|
||||
releases/v2018.1.2
|
||||
releases/v2018.1.1
|
||||
releases/v2018.1
|
||||
releases/v2017.1.8
|
||||
releases/v2017.1.7
|
||||
@ -285,13 +289,6 @@ brcm2708-bcm2709
|
||||
|
||||
* RaspberryPi 2
|
||||
|
||||
ipq806x
|
||||
^^^^^^^
|
||||
|
||||
* TP-Link
|
||||
|
||||
- Archer C2600 [#80211s]_
|
||||
|
||||
mpc85xx-generic
|
||||
^^^^^^^^^^^^^^^
|
||||
|
||||
|
54
docs/releases/v2018.1.1.rst
Normal file
54
docs/releases/v2018.1.1.rst
Normal file
@ -0,0 +1,54 @@
|
||||
Gluon 2018.1.1
|
||||
==============
|
||||
|
||||
Bugfixes
|
||||
~~~~~~~~
|
||||
|
||||
* Fix a bug leading to configuration loss on upgrade under certain circumstances
|
||||
(`#1496 <https://github.com/freifunk-gluon/gluon/issues/1496>`_)
|
||||
|
||||
The issue can only occur when upgrading from 2018.1 and there are multiple
|
||||
mirror entries in *site.conf* (specifically, an early failure for one of the
|
||||
mirrors, e.g. during DNS resolution, followed by a successful upgrade from a
|
||||
different mirror triggers the issue).
|
||||
|
||||
This is a regression in Gluon 2018.1.
|
||||
|
||||
* Fix next-node ARP issue
|
||||
(`#1488 <https://github.com/freifunk-gluon/gluon/issues/1488>`_)
|
||||
|
||||
A routing table issue led to ARP requests being sent from the next-node IPv4 address, but with
|
||||
a node-specific source MAC address. This could make the next-node IPv4 address unreachable.
|
||||
|
||||
This is a regression in Gluon 2018.1.
|
||||
|
||||
* Fix build on hosts with glibc 2.28
|
||||
|
||||
Fixed by various tool upgrades in LEDE (*bison*, *e2fsutils*, ...)
|
||||
|
||||
Other changes
|
||||
~~~~~~~~~~~~~
|
||||
|
||||
* Linux kernel has been updated to v4.4.148
|
||||
|
||||
Known issues
|
||||
~~~~~~~~~~~~
|
||||
|
||||
* Default TX power on many Ubiquiti devices is too high, correct offsets are unknown (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
|
||||
|
||||
Reducing the TX power in the Advanced Settings is recommended.
|
||||
|
||||
* The MAC address of the WAN interface is modified even when Mesh-on-WAN is disabled (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
|
||||
|
||||
This may lead to issues in environments where a fixed MAC address is expected (like VMware when promicious mode is disallowed).
|
||||
|
||||
* Inconsistent respondd API (`#522 <https://github.com/freifunk-gluon/gluon/issues/522>`_)
|
||||
|
||||
The current API is inconsistent and will be replaced eventually. The old API will still be supported for a while.
|
||||
|
||||
* Frequent reboots due to out-of-memory or high load due to memory pressure on weak hardware specially in larger meshes
|
||||
(`#1243 <https://github.com/freifunk-gluon/gluon/issues/1243>`_)
|
||||
|
||||
Optimizations in Gluon 2018.1 have significantly improved memory usage.
|
||||
There are still known bugs leading to unreasonably high load that we hope to
|
||||
solve in future releases.
|
60
docs/releases/v2018.1.2.rst
Normal file
60
docs/releases/v2018.1.2.rst
Normal file
@ -0,0 +1,60 @@
|
||||
Gluon 2018.1.2
|
||||
==============
|
||||
|
||||
Bugfixes
|
||||
~~~~~~~~
|
||||
|
||||
* Fix a bug leading to missing IPv6 addresses in respondd announcements
|
||||
(`#1523 <https://github.com/freifunk-gluon/gluon/issues/1523>`_)
|
||||
|
||||
The pattern that was used to match addresses from /proc/net/if_inet6
|
||||
did not expect interface indexes growing past two characters.
|
||||
|
||||
* Mark ipq806x target as broken for unstable client WiFi
|
||||
(`#1505 <https://github.com/freifunk-gluon/gluon/issues/1505>`_)
|
||||
|
||||
Station connections to the QCA9880 radio on the TP-Link C2600s are frequently
|
||||
disconnected, leading to an abysmal user experience.
|
||||
|
||||
* Fix button behaviour on FRITZ!Box 4020
|
||||
(`#1544 <https://github.com/freifunk-gluon/gluon/pull/1544>`_)
|
||||
|
||||
Buttons were triggering an instant reboot into config mode, fix by setting
|
||||
buttons to active low instead of active high.
|
||||
|
||||
* Prevent caching of redirects on config mode and status page
|
||||
(`#1530 <https://github.com/freifunk-gluon/gluon/issues/1530>`_)
|
||||
|
||||
As the path to both config mode and status page were changed between versions
|
||||
users could be affected by a redirect to a no more valid URL.
|
||||
|
||||
* batman-adv has received two bugfixes, which were `backported <https://github.com/openwrt-routing/packages/commit/7bf62cc8b556b5046f9bbd37687376fe9ea175bb>`_ from v2018.4
|
||||
|
||||
Other changes
|
||||
~~~~~~~~~~~~~
|
||||
|
||||
* Linux kernel has been updated to v4.4.153
|
||||
|
||||
Known issues
|
||||
~~~~~~~~~~~~
|
||||
|
||||
* Missing kernel module dependencies prevent batman-adv from being loaded on devices without WiFi drivers (`#1578 <https://github.com/freifunk-gluon/gluon/issues/1578>`_)
|
||||
|
||||
* Default TX power on many Ubiquiti devices is too high, correct offsets are unknown (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
|
||||
|
||||
Reducing the TX power in the Advanced Settings is recommended.
|
||||
|
||||
* The MAC address of the WAN interface is modified even when Mesh-on-WAN is disabled (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
|
||||
|
||||
This may lead to issues in environments where a fixed MAC address is expected (like VMware when promicious mode is disallowed).
|
||||
|
||||
* Inconsistent respondd API (`#522 <https://github.com/freifunk-gluon/gluon/issues/522>`_)
|
||||
|
||||
The current API is inconsistent and will be replaced eventually. The old API will still be supported for a while.
|
||||
|
||||
* Frequent reboots due to out-of-memory or high load due to memory pressure on weak hardware specially in larger meshes
|
||||
(`#1243 <https://github.com/freifunk-gluon/gluon/issues/1243>`_)
|
||||
|
||||
Optimizations in Gluon 2018.1 have significantly improved memory usage.
|
||||
There are still known bugs leading to unreasonably high load that we hope to
|
||||
solve in future releases.
|
31
docs/releases/v2018.1.3.rst
Normal file
31
docs/releases/v2018.1.3.rst
Normal file
@ -0,0 +1,31 @@
|
||||
Gluon 2018.1.3
|
||||
==============
|
||||
|
||||
Bugfixes
|
||||
~~~~~~~~
|
||||
|
||||
* Fix kernel module dependency collection for external modules (`#1580 <https://github.com/freifunk-gluon/gluon/pull/1580>`_)
|
||||
|
||||
A regression in v2018.1.2 prevented the batman-adv kmod from being loaded on devices without WiFi drivers.
|
||||
|
||||
Known issues
|
||||
~~~~~~~~~~~~
|
||||
|
||||
* Default TX power on many Ubiquiti devices is too high, correct offsets are unknown (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
|
||||
|
||||
Reducing the TX power in the Advanced Settings is recommended.
|
||||
|
||||
* The MAC address of the WAN interface is modified even when Mesh-on-WAN is disabled (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
|
||||
|
||||
This may lead to issues in environments where a fixed MAC address is expected (like VMware when promicious mode is disallowed).
|
||||
|
||||
* Inconsistent respondd API (`#522 <https://github.com/freifunk-gluon/gluon/issues/522>`_)
|
||||
|
||||
The current API is inconsistent and will be replaced eventually. The old API will still be supported for a while.
|
||||
|
||||
* Frequent reboots due to out-of-memory or high load due to memory pressure on weak hardware specially in larger meshes
|
||||
(`#1243 <https://github.com/freifunk-gluon/gluon/issues/1243>`_)
|
||||
|
||||
Optimizations in Gluon 2018.1 have significantly improved memory usage.
|
||||
There are still known bugs leading to unreasonably high load that we hope to
|
||||
solve in future releases.
|
49
docs/releases/v2018.1.4.rst
Normal file
49
docs/releases/v2018.1.4.rst
Normal file
@ -0,0 +1,49 @@
|
||||
Gluon 2018.1.4
|
||||
==============
|
||||
|
||||
Bugfixes
|
||||
~~~~~~~~
|
||||
|
||||
* Fix regression in autoupdater version comparison function
|
||||
|
||||
Due to a regression in Gluon 2018.1, the autoupdater would incorrectly
|
||||
consider certain version strings equal and not attempt to upgrade.
|
||||
In particular, any string and its prefix were considered equal when the
|
||||
prefix did not end with a digit. For example, the following relations were
|
||||
not evaluated correctly:
|
||||
|
||||
* ``1.0`` < ``1.0.1``
|
||||
* ``1.0~pre`` < ``1.0``
|
||||
|
||||
* Fix unintended difference between autoupdater version comparison and dpkg/opkg
|
||||
|
||||
Alphanumeric characters were considered less than end-of-string, when the
|
||||
intended bahaviour (as implemented by dpkg and opkg) is that only ``~`` is
|
||||
less than end-of-string. This broke relations like the following:
|
||||
|
||||
* ``1.0`` < ``1.0a``
|
||||
* ``1.0a`` < ``1.0ab``
|
||||
* ``1.0a`` < ``1.0a1``
|
||||
|
||||
|
||||
Known issues
|
||||
~~~~~~~~~~~~
|
||||
|
||||
* Default TX power on many Ubiquiti devices is too high, correct offsets are unknown (`#94 <https://github.com/freifunk-gluon/gluon/issues/94>`_)
|
||||
|
||||
Reducing the TX power in the Advanced Settings is recommended.
|
||||
|
||||
* The MAC address of the WAN interface is modified even when Mesh-on-WAN is disabled (`#496 <https://github.com/freifunk-gluon/gluon/issues/496>`_)
|
||||
|
||||
This may lead to issues in environments where a fixed MAC address is expected (like VMware when promicious mode is disallowed).
|
||||
|
||||
* Inconsistent respondd API (`#522 <https://github.com/freifunk-gluon/gluon/issues/522>`_)
|
||||
|
||||
The current API is inconsistent and will be replaced eventually. The old API will still be supported for a while.
|
||||
|
||||
* Frequent reboots due to out-of-memory or high load due to memory pressure on weak hardware specially in larger meshes
|
||||
(`#1243 <https://github.com/freifunk-gluon/gluon/issues/1243>`_)
|
||||
|
||||
Optimizations in Gluon 2018.1 have significantly improved memory usage.
|
||||
There are still known bugs leading to unreasonably high load that we hope to
|
||||
solve in future releases.
|
@ -92,9 +92,9 @@ ramips-rt305x [#newtarget]_ [#noibss]_
|
||||
sunxi [#newtarget]_
|
||||
===================
|
||||
|
||||
* LeMaker
|
||||
* LeMaker/SinoVoip
|
||||
|
||||
- Lamobo r1
|
||||
- Banana Pi (M1)
|
||||
|
||||
|
||||
.. [#newtarget]
|
||||
@ -207,6 +207,7 @@ site.mk
|
||||
* We recommend to use *GLUON_FEATURES* for all Gluon packages, and rely on
|
||||
*GLUON_SITE_PACKAGES* for non-Gluon (OpenWrt) packages only, as explained
|
||||
in :ref:`user-site-feature-flags`.
|
||||
* The `GLUON_ATH10K_MESH` variable was renamed to `GLUON_WLAN_MESH`.
|
||||
|
||||
site.conf
|
||||
=========
|
||||
@ -268,6 +269,20 @@ must be made:
|
||||
When shown, the password form requires a minimum password length of 12 characters now. This requirement
|
||||
can be modified using the *config_mode.remote_login.min_password_length* setting.
|
||||
|
||||
* Next-node hostnames
|
||||
|
||||
The builtin DNS resolver of Gluon can be configured to resolve a next-node hostname to the
|
||||
next-node IP address without querying an upstream DNS server. Since Gluon v2018.1, multiple
|
||||
names can be specified. Old configurations setting *next_node.name* to a string must be
|
||||
updated to provide an array of strings instead:
|
||||
|
||||
.. code-block:: lua
|
||||
|
||||
next_node = {
|
||||
name = { 'nextnode.location.community.example.org' },
|
||||
-- ...
|
||||
},
|
||||
|
||||
i18n
|
||||
====
|
||||
|
||||
@ -287,7 +302,19 @@ The status page has been rewritten to simplify the code and reduce its size. Rat
|
||||
having a static frontend and retrieving all information via JavaScript, all static information
|
||||
in the status page is now generated on the node, and JavaScript is only used for dynamic data.
|
||||
|
||||
To achieve this, the status page was ported to the gluon-web framework. The new status page
|
||||
Many status page API endpoints have been removed; for all remaining endpoints, CORS
|
||||
(Cross-Origin Resource Sharing) has been disabled, as it led to a privacy issues:
|
||||
malicious websites could access the API via cross-site scripting, determining which
|
||||
node a user was connected to.
|
||||
|
||||
The removal of CORS breaks compatibility with the node switching feature of the
|
||||
old status page implementation: In the new status page, switching to another node will
|
||||
reload the whole status page from the target node, while the old implementation would
|
||||
only switch to another backend host. While this will facilitate future updates, as
|
||||
frontend and backend always come from the same node and no stable API needs to be maintained,
|
||||
it prevents switching from the old status page to nodes running the new version.
|
||||
|
||||
To achieve all this, the status page was ported to the gluon-web framework. The new status page
|
||||
also makes use of Gluon's usual i18n facilities now. In addition, the gluon-web-model
|
||||
package was split out of the gluon-web core package, as model support is only required
|
||||
for config mode packages, but not for the new status page.
|
||||
@ -374,3 +401,21 @@ Known issues
|
||||
Optimizations in Gluon 2018.1 have significantly improved memory usage.
|
||||
There are still known bugs leading to unreasonably high load that we hope to
|
||||
solve in future releases.
|
||||
|
||||
* Configuration loss on upgrade under certain circumstances
|
||||
(`#1496 <https://github.com/freifunk-gluon/gluon/issues/1496>`_)
|
||||
|
||||
The issue can only occur when upgrading from 2018.1 and there are multiple
|
||||
mirror entries in *site.conf* (specifically, an early failure for one of the
|
||||
mirrors, e.g. during DNS resolution, followed by a successful upgrade from a
|
||||
different mirror triggers the issue).
|
||||
|
||||
This is a regression in Gluon 2018.1.
|
||||
|
||||
* Next-node ARP issue
|
||||
(`#1488 <https://github.com/freifunk-gluon/gluon/issues/1488>`_)
|
||||
|
||||
A routing table issue leads to ARP requests being sent from the next-node IPv4 address, but with
|
||||
a node-specific source MAC address. This can make the next-node IPv4 address unreachable.
|
||||
|
||||
This is a regression in Gluon 2018.1.
|
||||
|
@ -1,4 +1,4 @@
|
||||
-- This is an example site configuration for Gluon v2018.1
|
||||
-- This is an example site configuration for Gluon v2018.1.4
|
||||
--
|
||||
-- Take a look at the documentation located at
|
||||
-- http://gluon.readthedocs.org/ for details.
|
||||
|
@ -8,7 +8,7 @@ Gluon's releases are managed using `Git tags`_. If you are just getting
|
||||
started with Gluon we recommend to use the latest stable release of Gluon.
|
||||
|
||||
Take a look at the `list of gluon releases`_ and notice the latest release,
|
||||
e.g. *v2018.1*. Always get Gluon using git and don't try to download it
|
||||
e.g. *v2018.1.4*. Always get Gluon using git and don't try to download it
|
||||
as a Zip archive as the archive will be missing version information.
|
||||
|
||||
Please keep in mind that there is no "default Gluon" build; a site configuration
|
||||
@ -43,7 +43,7 @@ Building the images
|
||||
-------------------
|
||||
|
||||
To build Gluon, first check out the repository. Replace *RELEASE* with the
|
||||
version you'd like to checkout, e.g. *v2018.1*.
|
||||
version you'd like to checkout, e.g. *v2018.1.4*.
|
||||
|
||||
::
|
||||
|
||||
|
@ -104,7 +104,7 @@ wifi24 \: optional
|
||||
WLAN configuration for 2.4 GHz devices.
|
||||
``channel`` must be set to a valid wireless channel for your radio.
|
||||
|
||||
There are currently three interface types available. You many choose to
|
||||
There are currently three interface types available. You may choose to
|
||||
configure any subset of them:
|
||||
|
||||
- ``ap`` creates a master interface where clients may connect
|
||||
@ -118,8 +118,15 @@ wifi24 \: optional
|
||||
Additionally it is possible to configure the ``supported_rates`` and ``basic_rate``
|
||||
of each radio. Both are optional, by default hostapd/driver dictate the rates.
|
||||
If ``supported_rates`` is set, ``basic_rate`` is required, because ``basic_rate``
|
||||
has to be a subset of ``supported_rates``.
|
||||
The example below disables 802.11b rates.
|
||||
has to be a subset of ``supported_rates``. Possible values are:
|
||||
|
||||
- 6000, 9000, 12000, 18000, 24000, 36000, 48000, 54000 (OFDM)
|
||||
- 1000, 5500, 11000 (legacy 802.11b, DSSS)
|
||||
|
||||
The example below disables legacy 802.11b rates (DSSS) for performance reasons.
|
||||
For backwards compatibility in 802.11, this setting only effects 802.11a/b/g rates.
|
||||
I.e in 802.11n 6 MBit/s is announced all time. In 802.11ac the field is used to
|
||||
derive the length of a packet.
|
||||
|
||||
``ap`` requires a single parameter, a string, named ``ssid`` which sets the
|
||||
interface's ESSID. This is the WiFi the clients connect to.
|
||||
@ -211,15 +218,31 @@ mesh
|
||||
In addition, options specific to the batman-adv routing protocol can be set
|
||||
in the *batman_adv* section:
|
||||
|
||||
The optional value *gw_sel_class* sets the gateway selection class. The
|
||||
default is class 20, which is based on the link quality (TQ) only; class 1
|
||||
is calculated from both the TQ and the announced bandwidth.
|
||||
The optional value *routing_algo* allows to set up ``BATMAN_V`` based meshes.
|
||||
If unset, the routing algorithm will default to ``BATMAN_IV``.
|
||||
|
||||
The optional value *gw_sel_class* sets the gateway selection class, the
|
||||
default is ``20`` for B.A.T.M.A.N. IV and ``5000`` kbit/s for B.A.T.M.A.N. V.
|
||||
|
||||
- **B.A.T.M.A.N. IV:** with the value ``20`` the gateway is selected based
|
||||
on the link quality (TQ) only; with class ``1`` it is calculated from
|
||||
both, the TQ and the announced bandwidth.
|
||||
- **B.A.T.M.A.N. V:** with the value ``1500`` the gateway is selected if the
|
||||
throughput is at least 1500 kbit/s faster than the throughput of the
|
||||
currently selected gateway.
|
||||
|
||||
For details on determining the threshhold, when to switch to a new gateway,
|
||||
see `batctl manpage`_, section "gw_mode".
|
||||
|
||||
.. _batctl manpage: https://www.open-mesh.org/projects/batman-adv/wiki/Gateways
|
||||
|
||||
::
|
||||
|
||||
mesh = {
|
||||
vxlan = true,
|
||||
filter_membership_reports = false,
|
||||
batman_adv = {
|
||||
routing_algo = 'BATMAN_IV',
|
||||
gw_sel_class = 1,
|
||||
},
|
||||
}
|
||||
@ -667,41 +690,5 @@ modules
|
||||
site-repos in the wild
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
This is a non-exhaustive list of site-repos from various communities:
|
||||
|
||||
* `site-ffa <https://github.com/tecff/site-ffa>`_ (Altdorf, Landshut & Umgebung)
|
||||
* `site-ffac <https://github.com/ffac/site>`_ (Regio Aachen)
|
||||
* `site-ffbs <https://github.com/ffbs/site-ffbs>`_ (Braunschweig)
|
||||
* `site-ffhb <https://github.com/FreifunkBremen/gluon-site-ffhb>`_ (Bremen)
|
||||
* `site-ffda <https://git.darmstadt.ccc.de/ffda/site>`_ (Darmstadt)
|
||||
* `site-ff3l <https://github.com/ff3l/site-ff3l>`_ (Dreiländereck)
|
||||
* `site-ffeh <https://github.com/freifunk-ehingen/site-ffeh>`_ (Ehingen)
|
||||
* `site-fffl <https://github.com/freifunk-flensburg/site-fffl>`_ (Flensburg)
|
||||
* `site-ffgoe <https://github.com/freifunk-goettingen/site-ffgoe>`_ (Göttingen)
|
||||
* `site-ffgt-rhw <https://github.com/ffgtso/site-ffgt-rhw>`_ (Guetersloh)
|
||||
* `site-ffhh <https://github.com/freifunkhamburg/site-ffhh>`_ (Hamburg)
|
||||
* `site-ffho <https://git.ffho.net/freifunkhochstift/ffho-site>`_ (Hochstift)
|
||||
* `site-ffhgw <https://github.com/lorenzo-greifswald/site-ffhgw>`_ (Greifswald)
|
||||
* `site-ffka <https://github.com/ffka/site-ffka>`_ (Karlsruhe)
|
||||
* `site-ffki <https://git.freifunk.in-kiel.de/ffki-site/>`_ (Kiel)
|
||||
* `site-fflz <https://github.com/freifunk-lausitz/site-fflz>`_ (Lausitz)
|
||||
* `site-ffl <https://github.com/freifunk-leipzig/freifunk-gluon-leipzig>`_ (Leipzig)
|
||||
* `site-ffhl <https://github.com/freifunk-luebeck/site-ffhl>`_ (Lübeck)
|
||||
* `site-fflg <https://github.com/kartenkarsten/site-fflg>`_ (Lüneburg)
|
||||
* `site-ffmd <https://github.com/FreifunkMD/site-ffmd>`_ (Magdeburg)
|
||||
* `site-ffmwu <https://github.com/freifunk-mwu/sites-ffmwu>`_ (Mainz, Wiesbaden & Umgebung)
|
||||
* `site-ffmyk <https://github.com/FreifunkMYK/site-ffmyk>`_ (Mayen-Koblenz)
|
||||
* `site-ffmo <https://github.com/ffruhr/site-ffmo>`_ (Moers)
|
||||
* `site-ffmg <https://github.com/ffruhr/site-ffmg>`_ (Mönchengladbach)
|
||||
* `site-ffm <https://github.com/freifunkMUC/site-ffm>`_ (München)
|
||||
* `site-ffhmue <https://github.com/Freifunk-Muenden/site-conf>`_ (Münden)
|
||||
* `site-ffms <https://github.com/FreiFunkMuenster/site-ffms>`_ (Münsterland)
|
||||
* `site-neuss <https://github.com/ffne/site-neuss>`_ (Neuss)
|
||||
* `site-ffniers <https://github.com/ffruhr/site-ffniers>`_ (Niersufer)
|
||||
* `site-ffndh <https://github.com/freifunk-nordheide/ffnordheide/tree/ffnh-lede/ffndh-site>`_ (Nordheide)
|
||||
* `site-ffnw <https://git.nordwest.freifunk.net/ffnw-firmware/siteconf/tree/master>`_ (Nordwest)
|
||||
* `site-ffrgb <https://github.com/ffrgb/site-ffrgb>`_ (Regensburg)
|
||||
* `site-ffrn <https://github.com/Freifunk-Rhein-Neckar/site-ffrn>`_ (Rhein-Neckar)
|
||||
* `site-ffruhr <https://github.com/ffruhr?utf8=✓&query=site>`_ (Ruhrgebiet, Multi-Communities)
|
||||
* `site-ffs <https://github.com/freifunk-stuttgart/site-ffs>`_ (Stuttgart)
|
||||
* `site-fftr <https://github.com/freifunktrier/site-fftr>`_ (Trier)
|
||||
A non-exhaustive list of site-repos from various communities can be found on the
|
||||
wiki: https://github.com/freifunk-gluon/gluon/wiki/Site-Configurations
|
||||
|
9
modules
9
modules
@ -2,18 +2,19 @@ GLUON_FEEDS='openwrt gluon routing luci'
|
||||
|
||||
LEDE_REPO=https://git.openwrt.org/openwrt/openwrt.git
|
||||
LEDE_BRANCH=lede-17.01
|
||||
LEDE_COMMIT=b6a1f43075f96b0028e33ed1af1fe31068791d24
|
||||
LEDE_COMMIT=184fe11483b9595f31a028356f8cc18fb18536e3
|
||||
|
||||
PACKAGES_OPENWRT_REPO=https://github.com/openwrt/packages.git
|
||||
PACKAGES_OPENWRT_BRANCH=lede-17.01
|
||||
PACKAGES_OPENWRT_COMMIT=338690b2f79e2c7090be4e9adbb19b452c9e3c36
|
||||
PACKAGES_OPENWRT_COMMIT=40da7ecf21ffe1f3523ffa430c406e1db58ce3d4
|
||||
|
||||
PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
|
||||
PACKAGES_GLUON_COMMIT=be2c35785994e443d895225c7240474a46f64f5e
|
||||
PACKAGES_GLUON_BRANCH=v2018.1.x
|
||||
PACKAGES_GLUON_COMMIT=f49aef69e8e454f236215fdea19f0ef5864e9acc
|
||||
|
||||
PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git
|
||||
PACKAGES_ROUTING_BRANCH=openwrt-18.06
|
||||
PACKAGES_ROUTING_COMMIT=1b9d1c419f0ecefda51922a7845ab2183d6acd76
|
||||
PACKAGES_ROUTING_COMMIT=bc6e7f6903c8237c77131aedfc92dba40e1bc6ac
|
||||
|
||||
PACKAGES_LUCI_REPO=https://github.com/openwrt/luci.git
|
||||
PACKAGES_LUCI_BRANCH=lede-17.01
|
||||
|
@ -23,7 +23,8 @@ uci:section('network', 'device', 'local_node_dev', {
|
||||
local ip4, ip6
|
||||
|
||||
if next_node.ip4 then
|
||||
ip4 = next_node.ip4 .. '/32'
|
||||
local plen = site.prefix4():match('/%d+$')
|
||||
ip4 = next_node.ip4 .. plen
|
||||
end
|
||||
|
||||
if next_node.ip6 then
|
||||
|
@ -1,6 +1,9 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
|
||||
<meta http-equiv="Pragma" content="no-cache" />
|
||||
<meta http-equiv="Expires" content="0" />
|
||||
<meta http-equiv="refresh" content="0; URL=/cgi-bin/config" />
|
||||
</head>
|
||||
<body>
|
||||
|
@ -29,7 +29,7 @@ msgid ""
|
||||
"bandwidth available for the network. You can limit how much bandwidth the "
|
||||
"node will use at most."
|
||||
msgstr ""
|
||||
"Dein Knoten kann deine Internetverbindung nutzen um darüber eine "
|
||||
"Dein Knoten kann deine Internetverbindung nutzen, um darüber eine "
|
||||
"VPN-Verbindung zu anderen Knoten aufzubauen. Die dafür "
|
||||
"genutzte Bandbreite kannst du beschränken. Aktiviere die Option, falls keine "
|
||||
"per WLAN erreichbaren Nachbarknoten in deiner Nähe sind oder du deine "
|
||||
|
@ -15,6 +15,14 @@ rule('OUTPUT --logical-out br-client -o bat0 -s ' .. macaddr .. ' -j DROP')
|
||||
if next_node.ip4 then
|
||||
rule('FORWARD --logical-out br-client -o bat0 -p ARP --arp-ip-src ' .. next_node.ip4 .. ' -j DROP')
|
||||
rule('FORWARD --logical-out br-client -o bat0 -p ARP --arp-ip-dst ' .. next_node.ip4 .. ' -j DROP')
|
||||
rule('FORWARD --logical-out br-client -i bat0 -p ARP --arp-ip-src ' .. next_node.ip4 .. ' -j DROP')
|
||||
rule('FORWARD --logical-out br-client -i bat0 -p ARP --arp-ip-dst ' .. next_node.ip4 .. ' -j DROP')
|
||||
|
||||
rule('OUTPUT --logical-out br-client -o bat0 -p ARP --arp-ip-src ' .. next_node.ip4 .. ' -j DROP')
|
||||
rule('OUTPUT --logical-out br-client -o bat0 -p ARP --arp-ip-dst ' .. next_node.ip4 .. ' -j DROP')
|
||||
|
||||
rule('INPUT -i bat0 -p ARP --arp-ip-src ' .. next_node.ip4 .. ' -j DROP')
|
||||
rule('INPUT -i bat0 -p ARP --arp-ip-dst ' .. next_node.ip4 .. ' -j DROP')
|
||||
|
||||
rule('FORWARD --logical-out br-client -o bat0 -p IPv4 --ip-destination ' .. next_node.ip4 .. ' -j DROP')
|
||||
rule('OUTPUT --logical-out br-client -o bat0 -p IPv4 --ip-destination ' .. next_node.ip4 .. ' -j DROP')
|
||||
|
@ -25,10 +25,6 @@ uci:section('network', 'interface', 'client', {
|
||||
uci:delete('network', 'client_lan')
|
||||
|
||||
uci:delete('network', 'local_node_route')
|
||||
uci:section('network', 'route', 'local_node_route', {
|
||||
interface = 'client',
|
||||
target = site.prefix4(),
|
||||
})
|
||||
|
||||
uci:delete('network', 'local_node_route6')
|
||||
uci:section('network', 'route6', 'local_node_route6', {
|
||||
|
@ -94,7 +94,7 @@ static struct json_object * get_addresses(void) {
|
||||
if (sscanf(line,
|
||||
"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8
|
||||
"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8"%2"SCNx8
|
||||
" %*2x %*2x %*2x %2x %"STRINGIFY(IF_NAMESIZE)"s",
|
||||
" %*x %*x %*x %x %"STRINGIFY(IF_NAMESIZE)"s",
|
||||
&addr.s6_addr[0], &addr.s6_addr[1], &addr.s6_addr[2], &addr.s6_addr[3],
|
||||
&addr.s6_addr[4], &addr.s6_addr[5], &addr.s6_addr[6], &addr.s6_addr[7],
|
||||
&addr.s6_addr[8], &addr.s6_addr[9], &addr.s6_addr[10], &addr.s6_addr[11],
|
||||
|
@ -1,6 +1,9 @@
|
||||
<!DOCTYPE html>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
|
||||
<meta http-equiv="Pragma" content="no-cache" />
|
||||
<meta http-equiv="Expires" content="0" />
|
||||
<meta http-equiv="refresh" content="0; URL=/cgi-bin/status" />
|
||||
</head>
|
||||
<body>
|
||||
|
@ -12,7 +12,7 @@ as a separate package.
|
||||
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
|
||||
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
|
||||
index 4fbc9a265b535d850fe812085677b3f6aabf4e1f..c971de4deee7cd331ddcad6b87eb9fefd7af6a64 100644
|
||||
index 1d034fdede7598f15b1f802c47e834990e5852d9..f473ef732106eb8fa05e7c5b59df176fef33e42d 100644
|
||||
--- a/package/base-files/Makefile
|
||||
+++ b/package/base-files/Makefile
|
||||
@@ -19,7 +19,9 @@ PKG_BUILD_DEPENDS:=usign/host
|
||||
|
@ -64,10 +64,10 @@ index bc2fc2f774c4f2f0bbfa6e43d9b9a55e9b63153d..38cc5d7853c79f2a7800a387310a95ab
|
||||
mr16|\
|
||||
nbg6616|\
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
index b3e23c9a8f8c56870ef36fb55ae52e6b5ea61134..68f90de802ddd18e09a1da39c0d56292eea9489c 100644
|
||||
index 96ca65e694bb5ed449dcae8dbca1930d25612602..fc9eb005623fc029f839d7ce14788ffba32e42e5 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
@@ -92,6 +92,7 @@ case "$FIRMWARE" in
|
||||
@@ -98,6 +98,7 @@ case "$FIRMWARE" in
|
||||
ath10kcal_extract "art" 20480 2116
|
||||
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
|
||||
;;
|
||||
@ -102,7 +102,7 @@ index d2dc88127c02746cdecc4ced28f33548f35d037c..6258713dd0e3325ab109689f0ed3b51e
|
||||
c-55|\
|
||||
carambola2|\
|
||||
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
|
||||
index a8622454b421c1c74a8a71134b53c50399114aa5..e10401d42ae06506f82f2f5538fbc7df79fd4c65 100644
|
||||
index 91eb9f0de7ef6c472cdccf2022d888df53b75e46..d1d879cd764259571cce2a5e091ae99f0d7a6d6d 100644
|
||||
--- a/target/linux/ar71xx/config-4.4
|
||||
+++ b/target/linux/ar71xx/config-4.4
|
||||
@@ -51,6 +51,7 @@ CONFIG_ATH79_MACH_AP152=y
|
||||
|
@ -9,10 +9,10 @@ Based-on-patch-by: Henryk Heisig <hyniu@o2.pl>
|
||||
Signed-off-by: Andreas Ziegler <github@andreas-ziegler.de>
|
||||
|
||||
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
|
||||
index e10401d42ae06506f82f2f5538fbc7df79fd4c65..c82fcf09228be7063967f2517e0942651234afb8 100644
|
||||
index d1d879cd764259571cce2a5e091ae99f0d7a6d6d..e576fd2ec4f0a8d3613f00aa0a29586b8c65abe0 100644
|
||||
--- a/target/linux/ar71xx/config-4.4
|
||||
+++ b/target/linux/ar71xx/config-4.4
|
||||
@@ -272,6 +272,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
|
||||
@@ -273,6 +273,7 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIOLIB_IRQCHIP=y
|
||||
CONFIG_GPIO_DEVRES=y
|
||||
@ -20,7 +20,7 @@ index e10401d42ae06506f82f2f5538fbc7df79fd4c65..c82fcf09228be7063967f2517e094265
|
||||
# CONFIG_GPIO_LATCH is not set
|
||||
CONFIG_GPIO_NXP_74HC153=y
|
||||
CONFIG_GPIO_PCF857X=y
|
||||
@@ -429,6 +430,7 @@ CONFIG_SOC_QCA956X=y
|
||||
@@ -430,6 +431,7 @@ CONFIG_SOC_QCA956X=y
|
||||
CONFIG_SPI=y
|
||||
CONFIG_SPI_ATH79=y
|
||||
CONFIG_SPI_BITBANG=y
|
||||
|
@ -108,7 +108,7 @@ index 6258713dd0e3325ab109689f0ed3b51e27c41f89..774e3c8964ef724d1efbae56434aeaa9
|
||||
unifiac-lite|\
|
||||
unifiac-pro|\
|
||||
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
|
||||
index c82fcf09228be7063967f2517e0942651234afb8..57b6d2e541d7ef9dea8570ba8de72164d97b9775 100644
|
||||
index e576fd2ec4f0a8d3613f00aa0a29586b8c65abe0..6da3c323d300705a29355cdccff09fce1ce1bad7 100644
|
||||
--- a/target/linux/ar71xx/config-4.4
|
||||
+++ b/target/linux/ar71xx/config-4.4
|
||||
@@ -181,6 +181,7 @@ CONFIG_ATH79_MACH_TL_WR1041N_V2=y
|
||||
|
@ -92,10 +92,10 @@ index 61db387c9ecefd7090c25a5f5d75fdbf65a44d65..97372bed0ea2fadfab10f22916a1e0d6
|
||||
mr16|\
|
||||
nbg6616|\
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
index 68f90de802ddd18e09a1da39c0d56292eea9489c..96b8f6b9a4bdd6a1609a819e72ade315bccfb3c0 100644
|
||||
index fc9eb005623fc029f839d7ce14788ffba32e42e5..be818b78638b741fff963c222bab7c395996c608 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
@@ -92,6 +92,7 @@ case "$FIRMWARE" in
|
||||
@@ -98,6 +98,7 @@ case "$FIRMWARE" in
|
||||
ath10kcal_extract "art" 20480 2116
|
||||
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
|
||||
;;
|
||||
|
@ -12,10 +12,10 @@ every C7 v4 with LEDE carries the same MAC-Address on the 5GHz WiFi.
|
||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
index 96b8f6b9a4bdd6a1609a819e72ade315bccfb3c0..607bbd2c0ec4b59ba569550e9e0e87b80c7ddddb 100644
|
||||
index be818b78638b741fff963c222bab7c395996c608..697fcb68d246aa445ce029440643ad5950e48f6d 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
@@ -47,6 +47,10 @@ board=$(ar71xx_board_name)
|
||||
@@ -53,6 +53,10 @@ board=$(ar71xx_board_name)
|
||||
case "$FIRMWARE" in
|
||||
"ath10k/cal-pci-0000:00:00.0.bin")
|
||||
case $board in
|
||||
@ -26,7 +26,7 @@ index 96b8f6b9a4bdd6a1609a819e72ade315bccfb3c0..607bbd2c0ec4b59ba569550e9e0e87b8
|
||||
cf-e380ac-v1|\
|
||||
cf-e380ac-v2|\
|
||||
dlan-pro-1200-ac|\
|
||||
@@ -92,7 +96,6 @@ case "$FIRMWARE" in
|
||||
@@ -98,7 +102,6 @@ case "$FIRMWARE" in
|
||||
ath10kcal_extract "art" 20480 2116
|
||||
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
|
||||
;;
|
||||
|
@ -113,10 +113,10 @@ index 97372bed0ea2fadfab10f22916a1e0d6a9c65725..3aa1f054d4f791545a8b6644f7bd24f6
|
||||
mr16|\
|
||||
nbg6616|\
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
index 607bbd2c0ec4b59ba569550e9e0e87b80c7ddddb..5dd1d69e7e163c938759ce476846e4d985184b7b 100644
|
||||
index 697fcb68d246aa445ce029440643ad5950e48f6d..6c62f391e1aac2f052d3397fc25f8bddcca581dd 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
@@ -97,6 +97,8 @@ case "$FIRMWARE" in
|
||||
@@ -103,6 +103,8 @@ case "$FIRMWARE" in
|
||||
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -2)
|
||||
;;
|
||||
archer-c25-v1|\
|
||||
@ -156,7 +156,7 @@ index d6650e7719d268e1a500638b7eda2e15b9251aea..f4ac73e40e1acb800433a0b1348c8264
|
||||
c-55|\
|
||||
carambola2|\
|
||||
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
|
||||
index 57b6d2e541d7ef9dea8570ba8de72164d97b9775..5b33d48e52309b807dbdf2697524809ad08072ae 100644
|
||||
index 6da3c323d300705a29355cdccff09fce1ce1bad7..e335ef9b7dfe8f0250b4362542ea2518eac34cb4 100644
|
||||
--- a/target/linux/ar71xx/config-4.4
|
||||
+++ b/target/linux/ar71xx/config-4.4
|
||||
@@ -52,6 +52,8 @@ CONFIG_ATH79_MACH_AP152=y
|
||||
@ -168,7 +168,7 @@ index 57b6d2e541d7ef9dea8570ba8de72164d97b9775..5b33d48e52309b807dbdf2697524809a
|
||||
CONFIG_ATH79_MACH_ARCHER_C7=y
|
||||
CONFIG_ATH79_MACH_ARDUINO_YUN=y
|
||||
CONFIG_ATH79_MACH_AW_NR580=y
|
||||
@@ -272,6 +274,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
||||
@@ -273,6 +275,7 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
|
||||
CONFIG_GENERIC_TIME_VSYSCALL=y
|
||||
CONFIG_GPIOLIB=y
|
||||
CONFIG_GPIOLIB_IRQCHIP=y
|
||||
|
@ -85,10 +85,10 @@ index 3aa1f054d4f791545a8b6644f7bd24f64ed546a3..382500b75ee6dc1fe1126fb3121f4ae2
|
||||
archer-c60-v1|\
|
||||
mr12|\
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
index 5dd1d69e7e163c938759ce476846e4d985184b7b..538c86e4743109f7665096da32620d7862248aea 100644
|
||||
index 6c62f391e1aac2f052d3397fc25f8bddcca581dd..4ef5ba983d3fadc5e7842f707fff641a3c0cea8f 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
@@ -134,6 +134,13 @@ case "$FIRMWARE" in
|
||||
@@ -140,6 +140,13 @@ case "$FIRMWARE" in
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@ -156,7 +156,7 @@ index f4ac73e40e1acb800433a0b1348c8264a4639c30..5e8a06a7ae70ec349693c09deedbfce4
|
||||
archer-c60-v1|\
|
||||
bullet-m|\
|
||||
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
|
||||
index 5b33d48e52309b807dbdf2697524809ad08072ae..396a4fa02adb37c6e5f9f7f1cc40fd1014361654 100644
|
||||
index e335ef9b7dfe8f0250b4362542ea2518eac34cb4..b84e1cb584f3afce016d0685fb2397962ee85645 100644
|
||||
--- a/target/linux/ar71xx/config-4.4
|
||||
+++ b/target/linux/ar71xx/config-4.4
|
||||
@@ -52,6 +52,7 @@ CONFIG_ATH79_MACH_AP152=y
|
||||
|
@ -6,10 +6,10 @@ Signed-off-by: Henryk Heisig <hyniu@o2.pl>
|
||||
(cherry picked from commit e917e51bf91fc7cb5085bda5e67d62520801f9cc)
|
||||
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
index 538c86e4743109f7665096da32620d7862248aea..cfdc20455d61c3900473f57c3267b1a3fd10e150 100644
|
||||
index 4ef5ba983d3fadc5e7842f707fff641a3c0cea8f..8efe348498d4aaf5ae660a29073fc75ae7c9d72e 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
@@ -138,6 +138,8 @@ case "$FIRMWARE" in
|
||||
@@ -144,6 +144,8 @@ case "$FIRMWARE" in
|
||||
case $board in
|
||||
archer-c58-v1)
|
||||
ath10kcal_extract "art" 20480 12064
|
||||
|
@ -9,10 +9,10 @@ Signed-off-by: Henryk Heisig <hyniu@o2.pl>
|
||||
(cherry picked from commit 34958c826915cf864833ed8ba6e5b49d44c6cb41)
|
||||
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
index cfdc20455d61c3900473f57c3267b1a3fd10e150..91bdf0d3c591516f58030b165052b3dd2751314f 100644
|
||||
index 8efe348498d4aaf5ae660a29073fc75ae7c9d72e..65251284bba605afda8709c4799060e7a5554193 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
@@ -136,7 +136,9 @@ case "$FIRMWARE" in
|
||||
@@ -142,7 +142,9 @@ case "$FIRMWARE" in
|
||||
;;
|
||||
"ath10k/pre-cal-pci-0000:00:00.0.bin")
|
||||
case $board in
|
||||
|
@ -5,7 +5,7 @@ Subject: ar71xx: add unaligned access hacks for VXLAN
|
||||
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
|
||||
diff --git a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
|
||||
index 374f9be3b4b76984842d3673ea78b70aadc9476a..3b6ed31556cbd1fa81bb6b616fc78e19b56099c4 100644
|
||||
index f766850aebcbd53e6b0e94e654068afe8f5a81c4..d0cc7c52c06522ab2cad5bc3c14f06ad1530fc20 100644
|
||||
--- a/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
|
||||
+++ b/target/linux/ar71xx/patches-4.4/910-unaligned_access_hacks.patch
|
||||
@@ -929,3 +929,119 @@
|
||||
|
@ -9,7 +9,7 @@ old defaults get replaced properly.
|
||||
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||||
|
||||
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
|
||||
index c971de4deee7cd331ddcad6b87eb9fefd7af6a64..55e67a97d03df7d96cf8a4aac3c5325ce7105c80 100644
|
||||
index f473ef732106eb8fa05e7c5b59df176fef33e42d..32b1ce0923cb984ff32e4444a18eccdad7572d70 100644
|
||||
--- a/package/base-files/Makefile
|
||||
+++ b/package/base-files/Makefile
|
||||
@@ -59,8 +59,6 @@ define Package/base-files/conffiles
|
||||
|
@ -163,7 +163,7 @@ index 5e8a06a7ae70ec349693c09deedbfce41a52cfc2..491b5d5a98b44844f14441d4024f2ad9
|
||||
|
||||
echo "Sysupgrade is not yet supported on $board."
|
||||
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
|
||||
index 396a4fa02adb37c6e5f9f7f1cc40fd1014361654..45bf500643837a7270b45e32b22225c06c5fb841 100644
|
||||
index b84e1cb584f3afce016d0685fb2397962ee85645..9f449973b17a1d82098fb5b50f4b8f6cc9f869f8 100644
|
||||
--- a/target/linux/ar71xx/config-4.4
|
||||
+++ b/target/linux/ar71xx/config-4.4
|
||||
@@ -106,6 +106,7 @@ CONFIG_ATH79_MACH_ESR1750=y
|
||||
@ -174,7 +174,7 @@ index 396a4fa02adb37c6e5f9f7f1cc40fd1014361654..45bf500643837a7270b45e32b22225c0
|
||||
CONFIG_ATH79_MACH_GL_AR150=y
|
||||
CONFIG_ATH79_MACH_GL_AR300=y
|
||||
CONFIG_ATH79_MACH_GL_AR300M=y
|
||||
@@ -373,6 +374,7 @@ CONFIG_MTD_PHYSMAP=y
|
||||
@@ -374,6 +375,7 @@ CONFIG_MTD_PHYSMAP=y
|
||||
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
|
||||
CONFIG_MTD_REDBOOT_PARTS=y
|
||||
CONFIG_MTD_SPI_NOR=y
|
||||
|
@ -79,10 +79,10 @@ index 336d078f72a06073e3465c36ca98035c7d70282f..01d3b787bedcab82a5797c9a4801e813
|
||||
;;
|
||||
qihoo-c301)
|
||||
diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
index 91bdf0d3c591516f58030b165052b3dd2751314f..1626622a8e46484bbf2719f19843e61d9cc92506 100644
|
||||
index 65251284bba605afda8709c4799060e7a5554193..3b1e408f00846f8cc39e05d90600992e382b314a 100644
|
||||
--- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
|
||||
@@ -103,6 +103,7 @@ case "$FIRMWARE" in
|
||||
@@ -109,6 +109,7 @@ case "$FIRMWARE" in
|
||||
ath10kcal_extract "art" 20480 2116
|
||||
ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth1/address) -2)
|
||||
;;
|
||||
@ -129,7 +129,7 @@ index 03677ad1240c9a5af341354b95561f9d493a9cd8..236520b27c4d6d0b1b7e483d1100fb5a
|
||||
gl-mifi|\
|
||||
hiwifi-hc6361|\
|
||||
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
|
||||
index 45bf500643837a7270b45e32b22225c06c5fb841..d96642b97c36187febb1f3843e7dd9acfab0e40d 100644
|
||||
index 9f449973b17a1d82098fb5b50f4b8f6cc9f869f8..d5ad6396a5c422b9b68b0a94658962226c13006e 100644
|
||||
--- a/target/linux/ar71xx/config-4.4
|
||||
+++ b/target/linux/ar71xx/config-4.4
|
||||
@@ -110,6 +110,7 @@ CONFIG_ATH79_MACH_FRITZ4020=y
|
||||
|
@ -9,10 +9,10 @@ rid of statically defined "kernel" and "rootfs" partitions in cmdline.
|
||||
Signed-off-by: Piotr Dymacz <pepe2k@gmail.com>
|
||||
|
||||
diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4
|
||||
index d96642b97c36187febb1f3843e7dd9acfab0e40d..6c29cd7748b3ce7e53adf359cd5002ba01066fbd 100644
|
||||
index d5ad6396a5c422b9b68b0a94658962226c13006e..26f855e66796106cd0f232c9c5e920b02365de31 100644
|
||||
--- a/target/linux/ar71xx/config-4.4
|
||||
+++ b/target/linux/ar71xx/config-4.4
|
||||
@@ -379,6 +379,7 @@ CONFIG_MTD_SPLIT_EVA_FW=y
|
||||
@@ -380,6 +380,7 @@ CONFIG_MTD_SPLIT_EVA_FW=y
|
||||
CONFIG_MTD_SPLIT_FIRMWARE=y
|
||||
CONFIG_MTD_SPLIT_LZMA_FW=y
|
||||
CONFIG_MTD_SPLIT_SEAMA_FW=y
|
||||
|
@ -0,0 +1,33 @@
|
||||
From: David Bauer <mail@david-bauer.net>
|
||||
Date: Tue, 11 Sep 2018 17:04:16 +0200
|
||||
Subject: ar71xx: flag FritzBox 4020 buttons as active low
|
||||
|
||||
Buttons of AVM FritzBox 4020 are incorrectly flagged as active high.
|
||||
|
||||
This was an oversight as RFKill button was working as expected even
|
||||
with incorrectly flagged GPIO.
|
||||
|
||||
Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
|
||||
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz4020.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz4020.c
|
||||
index ed7f9a8b3ead80dbbe7f8d27c7dd5ecf0543d733..c00cf681b2da3ff4989fbf4c3de7b44075bb395a 100644
|
||||
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz4020.c
|
||||
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-fritz4020.c
|
||||
@@ -169,7 +169,7 @@ static struct gpio_keys_button fritz4020_gpio_keys[] __initdata = {
|
||||
.code = KEY_RFKILL,
|
||||
.debounce_interval = FRITZ4020_KEYS_DEBOUNCE_INTERVAL,
|
||||
.gpio = FRITZ4020_GPIO_BTN_WLAN,
|
||||
- .active_low = 0,
|
||||
+ .active_low = 1,
|
||||
},
|
||||
{
|
||||
.desc = "WPS button",
|
||||
@@ -177,7 +177,7 @@ static struct gpio_keys_button fritz4020_gpio_keys[] __initdata = {
|
||||
.code = KEY_WPS_BUTTON,
|
||||
.debounce_interval = FRITZ4020_KEYS_DEBOUNCE_INTERVAL,
|
||||
.gpio = FRITZ4020_GPIO_BTN_WPS,
|
||||
- .active_low = 0,
|
||||
+ .active_low = 1,
|
||||
},
|
||||
};
|
||||
|
@ -0,0 +1,73 @@
|
||||
From: Jonas Gorski <jonas.gorski@gmail.com>
|
||||
Date: Thu, 20 Jul 2017 22:34:54 +0200
|
||||
Subject: kernel: collect module symvers for external modules
|
||||
|
||||
Collect module symvers for all external modules to make them available
|
||||
for modpost. This fixes dependencies for most external modules.
|
||||
|
||||
Example:
|
||||
|
||||
Before:
|
||||
|
||||
root@LEDE:/# modinfo mt76
|
||||
module: /lib/modules/4.4.74/mt76.ko
|
||||
license: Dual BSD/GPL
|
||||
depends:
|
||||
|
||||
After:
|
||||
|
||||
root@LEDE:/# modinfo mt76
|
||||
module: /lib/modules/4.4.74/mt76.ko
|
||||
license: Dual BSD/GPL
|
||||
depends: mac80211,cfg80211
|
||||
|
||||
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
|
||||
|
||||
Origin: backport, https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=2e496876c60cc45a06ac610e02c00ec767028b64
|
||||
|
||||
diff --git a/include/kernel.mk b/include/kernel.mk
|
||||
index d8d457fe7a5d3584d8aa4e27430da84533c85ed0..10a264c9394c2b9a06801c10ae91d563adc7ee3f 100644
|
||||
--- a/include/kernel.mk
|
||||
+++ b/include/kernel.mk
|
||||
@@ -85,6 +85,33 @@ else
|
||||
LINUX_KARCH := $(ARCH)
|
||||
endif
|
||||
|
||||
+PKG_EXTMOD_SUBDIRS ?= .
|
||||
+
|
||||
+define populate_module_symvers
|
||||
+ @mkdir -p $(PKG_INFO_DIR)
|
||||
+ cat /dev/null > $(PKG_INFO_DIR)/$(PKG_NAME).symvers; \
|
||||
+ for subdir in $(PKG_EXTMOD_SUBDIRS); do \
|
||||
+ cat $(PKG_INFO_DIR)/*.symvers 2>/dev/null > $(PKG_BUILD_DIR)/$$$$subdir/Module.symvers; \
|
||||
+ done
|
||||
+endef
|
||||
+
|
||||
+define collect_module_symvers
|
||||
+ for subdir in $(PKG_EXTMOD_SUBDIRS); do \
|
||||
+ grep -F $$$$(readlink -f $(PKG_BUILD_DIR)) $(PKG_BUILD_DIR)/$$$$subdir/Module.symvers >> $(PKG_BUILD_DIR)/Module.symvers.tmp; \
|
||||
+ done; \
|
||||
+ sort -u $(PKG_BUILD_DIR)/Module.symvers.tmp > $(PKG_BUILD_DIR)/Module.symvers; \
|
||||
+ mv $(PKG_BUILD_DIR)/Module.symvers $(PKG_INFO_DIR)/$(PKG_NAME).symvers
|
||||
+endef
|
||||
+
|
||||
+define KernelPackage/hooks
|
||||
+ ifneq ($(PKG_NAME),kernel)
|
||||
+ Hooks/Compile/Pre += populate_module_symvers
|
||||
+ Hooks/Compile/Post += collect_module_symvers
|
||||
+ endif
|
||||
+ define KernelPackage/hooks
|
||||
+ endef
|
||||
+endef
|
||||
+
|
||||
define KernelPackage/Defaults
|
||||
FILES:=
|
||||
AUTOLOAD:=
|
||||
@@ -192,6 +219,7 @@ $(call KernelPackage/$(1)/config)
|
||||
endif
|
||||
|
||||
$(call KernelPackage/depends)
|
||||
+ $(call KernelPackage/hooks)
|
||||
|
||||
ifneq ($(if $(filter-out %=y %=n %=m,$(KCONFIG)),$(filter m y,$(foreach c,$(filter-out %=y %=n %=m,$(KCONFIG)),$($(c)))),.),)
|
||||
define Package/kmod-$(1)/install
|
@ -13,7 +13,6 @@ $(eval $(call GluonTarget,x86,geode))
|
||||
$(eval $(call GluonTarget,x86,64))
|
||||
|
||||
ifneq ($(GLUON_WLAN_MESH_11s)$(BROKEN),)
|
||||
$(eval $(call GluonTarget,ipq806x))
|
||||
$(eval $(call GluonTarget,ramips,mt7620))
|
||||
$(eval $(call GluonTarget,ramips,mt7628))
|
||||
$(eval $(call GluonTarget,ramips,rt305x))
|
||||
@ -22,5 +21,6 @@ endif
|
||||
ifneq ($(BROKEN),)
|
||||
$(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
|
||||
$(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
|
||||
$(eval $(call GluonTarget,ipq806x)) # BROKEN: unstable wifi drivers
|
||||
$(eval $(call GluonTarget,mvebu)) # BROKEN: No AP+IBSS or 11s support
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user