Skip to content

Commit

Permalink
Merge tag 'v2023.2.2' into v2023.2.x-hwtest
Browse files Browse the repository at this point in the history
Gluon v2023.2.2
  • Loading branch information
ecsv committed Mar 14, 2024
2 parents b3ae319 + 6036aa6 commit 1d1fc7e
Showing 14 changed files with 59 additions and 93 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -59,7 +59,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 v2023.2.1 && make update`.
and switch to one by running `git checkout v2023.2.2 && 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 *might break* eventually.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@
author = 'Project Gluon'

# The short X.Y version
version = '2023.2.1'
version = '2023.2.2'
# The full version, including alpha/beta/rc tags
release = version

1 change: 1 addition & 0 deletions docs/releases/index.rst
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ Release Notes
:caption: Gluon 2023.2
:maxdepth: 2

v2023.2.2
v2023.2.1
v2023.2

43 changes: 43 additions & 0 deletions docs/releases/v2023.2.2.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
Gluon 2023.2.2
==============

Bugfixes
--------

* Fixed a bug where nodes connected using VXLAN would lose connectivity to all but one neighbor
(`#3191 <https://github.com/freifunk-gluon/gluon/issues/3191>`_)

* fastd-l2tp VPN did not re-generate the flow-label for the inner-tunnel traffic,
breaking QoS mechanisms
(`#3203 <https://github.com/freifunk-gluon/gluon/issues/3203>`_)

* Fixed silent-failures when image-customization files were not valid
(`#3218 <https://github.com/freifunk-gluon/gluon/issues/3218>`_)

* Multicast-snooping did stop working after extended uptime periods
(`#3176 <https://github.com/freifunk-gluon/gluon/issues/3176>`_)


Known issues
------------

* Unstable wireless with certain MediaTek devices (`#3154 <https://github.com/freifunk-gluon/gluon/issues/3154>`_)

* The integration of the BATMAN_V routing algorithm is incomplete.

- Mesh neighbors don't appear on the status page. (`#1726 <https://github.com/freifunk-gluon/gluon/issues/1726>`_)
Many tools have the BATMAN_IV metric hardcoded, these need to be updated to account for the new throughput
metric.
- Throughput values are not correctly acquired for different interface types.
(`#1728 <https://github.com/freifunk-gluon/gluon/issues/1728>`_)
This affects virtual interface types like bridges and VXLAN.

* 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.

* In configurations without VXLAN, 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 promiscuous mode is disallowed).
2 changes: 1 addition & 1 deletion docs/site-example/site.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
-- This is an example site configuration for Gluon v2023.2.1
-- This is an example site configuration for Gluon v2023.2.2
--
-- Take a look at the documentation located at
-- https://gluon.readthedocs.io/ for details.
4 changes: 2 additions & 2 deletions docs/user/getting_started.rst
Original file line number Diff line number Diff line change
@@ -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. *v2023.2.1*. Always get Gluon using git and don't try to download it
e.g. *v2023.2.2*. 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
@@ -53,7 +53,7 @@ Building the images
-------------------

To build Gluon, first check out the repository. Replace *RELEASE* with the
version you'd like to checkout, e.g. *v2023.2.1*.
version you'd like to checkout, e.g. *v2023.2.2*.

::

8 changes: 4 additions & 4 deletions modules
Original file line number Diff line number Diff line change
@@ -2,15 +2,15 @@ GLUON_FEEDS='gluon packages routing'

OPENWRT_REPO=https://github.com/openwrt/openwrt.git
OPENWRT_BRANCH=openwrt-23.05
OPENWRT_COMMIT=c909fdad1870361d5a6f0c0a2437d062e988f559
OPENWRT_COMMIT=1bbb94df9687e7376ca5f50c69f24aa15c704f85

PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
PACKAGES_GLUON_COMMIT=53ea3b89771fc7d7a80f1800ce25e98dfe1633aa
PACKAGES_GLUON_COMMIT=3d08b0fee8dc5d96d8bcdb985fad1d5564de4022

PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
PACKAGES_PACKAGES_BRANCH=openwrt-23.05
PACKAGES_PACKAGES_COMMIT=d877e449358210c6b0b59e8480f885e6d424a32b
PACKAGES_PACKAGES_COMMIT=229175a0bb3043b5ecbafc62d875122cca273881

PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
PACKAGES_ROUTING_BRANCH=openwrt-23.05
PACKAGES_ROUTING_COMMIT=2a3bad8349f1fad631aea8daa4f20343a8cc4457
PACKAGES_ROUTING_COMMIT=648753932d5a7deff7f2bdb33c000018a709ad84
Original file line number Diff line number Diff line change
@@ -174,7 +174,7 @@ index 0000000000000000000000000000000000000000..077a563b6066cd1d3aee4b1e82328e8c
+
+ int system_bridge_addif(struct device *bridge, struct device *dev)
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 214a1e6ecd83c067b96cb55ad052ae00b82fa8b5..bf6709ae2dbb87a21659558161d4882befd88b49 100644
index aaffee332963db8e8afe72db6e21f39c4db9a8a4..d1139b9614df97a72a5da803e54d028f86b91544 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -761,6 +761,7 @@ CONFIG_BRIDGE=y
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ Signed-off-by: Sven Eckelmann <[email protected]>
Forwarded: no

diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
index 6ff627b03813bb2de0cd1f465014cc74031106a3..fdd03142dbe655e5085241f5a781b807fbda3f5e 100644
index 6a37cbb22ea3983f0ad1085f1a7e9ec25d62f786..bf0e505d4f8c699fc1bfb7454192fbfe363a9d43 100644
--- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -1098,7 +1098,7 @@ drv_mac80211_setup() {

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/container.sh
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ TAG="gluon:${BRANCH:-latest}"
if [ "$(command -v podman)" ]
then
podman build -t "${TAG}" contrib/docker
podman run -it --rm -u "$(id -u):$(id -g)" --userns=keep-id --volume="$(pwd):/gluon" "${TAG}"
podman run -it --rm -u "$(id -u):$(id -g)" --userns=keep-id --volume="$(pwd):/gluon:z" "${TAG}"
elif [ "$(command -v docker)" ]
then
docker build -t "${TAG}" contrib/docker
24 changes: 1 addition & 23 deletions scripts/image_customization_lib.lua
Original file line number Diff line number Diff line change
@@ -90,26 +90,11 @@ local function evaluate_device(env, dev)
end

function M.get_selections(dev)
local return_object = {
features = {},
packages = {},
}

if M.customization_file == nil then
-- No customization file found
return return_object
end

local eval_result = evaluate_device(M.env, dev)
return eval_result.selections
end

function M.device_overrides(dev)
if M.customization_file == nil then
-- No customization file found
return {}
end

local eval_result = evaluate_device(M.env, dev)
return eval_result.device_overrides
end
@@ -118,14 +103,7 @@ function M.init(env)
local filename = env.GLUON_SITEDIR .. '/image-customization.lua'

M.env = env

local f, _ = loadfile(filename)
if not f then
-- No customization file found, nothing to do
return
end

M.customization_file = f
M.customization_file = assert(loadfile(filename))
end

return M
3 changes: 0 additions & 3 deletions targets/ath79-nand
Original file line number Diff line number Diff line change
@@ -45,9 +45,6 @@ device('gl.inet-gl-xe300', 'glinet_gl-xe300', {

device('netgear-wndr3700-v4', 'netgear_wndr3700-v4', {
factory_ext = '.img',
manifest_aliases = {
'netgear-wndr3700v4', -- Upgrade from OpenWrt 19.07
},
})

device('netgear-wndr4300', 'netgear_wndr4300', {
2 changes: 2 additions & 0 deletions targets/generic
Original file line number Diff line number Diff line change
@@ -41,6 +41,8 @@ config('ALL_NONSHARED', true)
try_config('PACKAGE_usbip', false) -- fails to build
try_config('PACKAGE_coova-chilli', false) -- fails to build
try_config('PACKAGE_kmod-ipt-coova', false) -- fails to build
try_config('PACKAGE_libpfring', false) -- fails to build
try_config('PACKAGE_kmod-pf-ring', false) -- fails to build

try_config('PACKAGE_ATH_DEBUG', true)

0 comments on commit 1d1fc7e

Please sign in to comment.