Skip to content

Conversation

@troglobit
Copy link
Contributor

Description

  • Fix group owner and permissions of /cfg/backup directory
  • Fix backup version of files in /cfg/backup/startup-config-$VER.cfg
  • Fix Infix 25.02 broken on NanoPi R2S #1006
  • New kernel for NanoPi R2S, with LAN LED patch added to kkit-linux-6.12.y branch

Checklist

Tick relevant boxes, this PR is-a or has-a:

  • Bugfix
    • Regression tests
    • ChangeLog updates (for next release)
  • Feature
    • YANG model change => revision updated?
    • Regression tests added?
    • ChangeLog updates (for next release)
    • Documentation added?
  • Test changes
    • Checked in changed Readme.adoc (make test-spec)
    • Added new test to group Readme.adoc and yaml file
  • Code style update (formatting, renaming)
  • Refactoring (please detail in commit messages)
  • Build related changes
  • Documentation content changes
    • ChangeLog updated (for major changes)
  • Other (please describe):

 - Bump kernel to 6.12.21, same as other tier one boards
 - Fix #1006 byt enabling netlink for ethtool (now works!)
 - Sync defconfigs:
   - LIBXCRYPT now in an rdep of another package
   - Disable FORCE check hashes for now
 - Drop patches for 6.10 tree (r2s kernel)
 - Port RTL8153b patch for R2S LAN LED support

Fixes #1006

Signed-off-by: Joachim Wiberg <[email protected]>
 - Update usage text for readability, add example
 - Reindent getopts case and add -h
 - Allow 'git rm -f' to remove already staged patches

Signed-off-by: Joachim Wiberg <[email protected]>
@troglobit troglobit requested review from Copilot and mattiaswal and removed request for Copilot April 7, 2025 04:22
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copilot reviewed 19 out of 38 changed files in this pull request and generated no comments.

Files not reviewed (19)
  • board/aarch64/r2s/linux_defconfig: Language not supported
  • board/common/rootfs/usr/libexec/infix/init.d/30-cfg-migrate: Language not supported
  • configs/r2s_defconfig: Language not supported
  • patches/linux/6.10.3/0001-net-bridge-avoid-classifying-unknown-multicast-as-mr.patch: Language not supported
  • patches/linux/6.10.3/0002-net-bridge-Ignore-router-ports-when-forwarding-L2-mu.patch: Language not supported
  • patches/linux/6.10.3/0003-net-bridge-drop-delay-for-applying-strict-multicast-.patch: Language not supported
  • patches/linux/6.10.3/0004-usb-core-adjust-log-level-for-unauthorized-devices.patch: Language not supported
  • patches/linux/6.12.21/0001-FIX-net-dsa-mv88e6xxx-Fix-timeout-on-waiting-for-PPU.patch: Language not supported
  • patches/linux/6.12.21/0002-net-dsa-mv88e6xxx-Improve-indirect-register-access-p.patch: Language not supported
  • patches/linux/6.12.21/0003-net-dsa-mv88e6xxx-Honor-ports-being-managed-via-in-b.patch: Language not supported
  • patches/linux/6.12.21/0004-net-dsa-mv88e6xxx-Limit-rsvd2cpu-policy-to-user-port.patch: Language not supported
  • patches/linux/6.12.21/0005-net-dsa-mv88e6xxx-Add-LED-infrastructure.patch: Language not supported
  • patches/linux/6.12.21/0006-net-dsa-mv88e6xxx-Add-LED-support-for-6393X.patch: Language not supported
  • patches/linux/6.12.21/0007-net-dsa-tag_dsa-Use-tag-priority-as-initial-skb-prio.patch: Language not supported
  • patches/linux/6.12.21/0008-net-dsa-Support-MDB-memberships-whose-L2-addresses-o.patch: Language not supported
  • patches/linux/6.12.21/0009-net-dsa-Support-EtherType-based-priority-overrides.patch: Language not supported
  • patches/linux/6.12.21/0010-net-dsa-mv88e6xxx-Support-EtherType-based-priority-o.patch: Language not supported
  • patches/linux/6.12.21/0011-net-dsa-mv88e6xxx-Add-mqprio-qdisc-support.patch: Language not supported
  • patches/linux/6.12.21/0012-net-dsa-mv88e6xxx-Use-VLAN-prio-over-IP-when-both-ar.patch: Language not supported

Copy link
Contributor

@mattiaswal mattiaswal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@troglobit troglobit merged commit b188e78 into main Apr 7, 2025
6 checks passed
@troglobit troglobit deleted the r2s-fixes branch April 7, 2025 06:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Infix 25.02 broken on NanoPi R2S

3 participants