freifunk-franken/firmware
9
7
Fork 14
Code Issues 45 Pull Requests 9 Actions Releases 20 Wiki Activity

Fixup OpenWrt 23.05 network configuration changes #304

Closed
fbl wants to merge 5 commits from fbl/firmware:fixup-openwrt2305 into master
pull from: fbl/firmware:fixup-openwrt2305
merge into: freifunk-franken:master
Conversation 1 Commits 5 Files Changed 6 +102 -6
fbl commented 2024-01-25 18:15:02 +01:00
Owner
Copy Link

A few particulares were missed during the upgrade to OpenWrt 23.05:

  • The cpuport of FritzBox 4040 has to be removed
  • The network configuration of TP-Link TL-WDR4900 must be migrated to DSA
    • The compat_version has to be retained, simliar to FritzBox 4040
  • A migration script for the DSA network changes has to be added and the config_version bumped
A few particulares were missed during the upgrade to OpenWrt 23.05: - The cpuport of FritzBox 4040 has to be removed - The network configuration of TP-Link TL-WDR4900 must be migrated to DSA - The compat_version has to be retained, simliar to FritzBox 4040 - A migration script for the DSA network changes has to be added and the config_version bumped
fbl added this to the 20240401-beta milestone 2024-01-25 18:15:02 +01:00
fbl added 5 commits 2024-01-25 18:15:02 +01:00 
With OpenWrt 23.05 a few more devices have been migrated to DSA. Bump
the config_version of layer3-config to reflect the necessary migration.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
When adjusting our configuration for the DSA migration of the FritzBox
4040, the cpuport was forgotten. The cpuport has to be removed for DSA
devices.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
the TL-WDR4900 was migrated to a DSA driver with OpenWrt 23.05. Adjust
our network configuration accordingly.

Fixes: #302

Signed-off-by: Fabian Bläse <fabian@blaese.de>
OpenWrt images contain a compat_version, which is used to block upgrades
to newer versions with incompatible configuration, if the configuration
cannot be migrated.

As we maintain our own configuration and all OpenWrt configuration files
are dropped on an upgrade, this upgrade block is not required.

To simplify the upgrade process, retain the old compat_version for the
next sysupgrade release. The compat_version will then be bumped
automatically by the `05_compat-version` board.d script.

Signed-off-by: Fabian Bläse <fabian@blaese.de>
layer3-config: Add DSA migration script for migrated devices
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
da0a853e69 
Because of to the switch from swconfig to DSA, the switchport names
have to be migrated for a few devices. Due to past migrations, we
already have developed a migration script for that.

Duplicate and adjust the script for the newly migrated devices. While at
it, rename the old script to reflect the configuration version bump.

Fixes: #301

Signed-off-by: Fabian Bläse <fabian@blaese.de>
fbl commented 2024-02-22 14:25:54 +01:00
Author
Owner
Copy Link

applied.

applied.
fbl closed this pull request 2024-02-22 14:25:54 +01:00
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
RFC

   
RFT

   
WIP

   
blocked

   
bsp

touching bsp files or adding devices

  
bug

Something is not working

  
build/scripts/tools

touching buildscript or other tools

  
duplicate

This issue or pull request already exists

  
feature

New feature

  
fixed

Issue that got resolved

  
layer3

only for layer3 FW

  
mantis

Imported from mantis

  
more details required

Reported information is insufficient to debug the issue

  
needs changes

   
node

only for node FW

  
packages/fff

touching our packages

  
rejected

Rejected or won't fix

  
security

   
trivial

simple non-functional changes that are mostly matter of taste

  
upstream

touching upstream version, build or feed patches

No Label
RFC
RFT
WIP
blocked
bsp
bug
build/scripts/tools
duplicate
feature
fixed
layer3
mantis
more details required
needs changes
node
packages/fff
rejected
security
trivial
upstream
Milestone
Clear milestone
No items
No Milestone
20240401-beta
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: freifunk-franken/firmware#304
No description provided.
Delete Branch "fbl/firmware:fixup-openwrt2305"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?