Skip to content

recomputer-rk3588-devkit: drop duplicate common.inc sourcing - #10649

Merged
igorpecovnik merged 1 commit into
armbian:mainfrom
Seeed-Studio:fix/rk3588-devkit-double-source
Sep 7, 2026
Merged

recomputer-rk3588-devkit: drop duplicate common.inc sourcing#10649
igorpecovnik merged 1 commit into
armbian:mainfrom
Seeed-Studio:fix/rk3588-devkit-double-source

Conversation

@Mkiring

@Mkiring Mkiring commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Description

The board conf sourced recomputer-rk35xx-common.inc and enabled radxa-aic8800 unconditionally before the BRANCH case, which does both again for BRANCH=vendor — so common.inc was sourced twice. Each sourcing runs enable_extension "seeed_armbian_extension", and with the OTA extension enabled the second pass aborts the build at config stage:

extensions/seeed_armbian_extension/armbian-ota/ota-support.sh: line 9: OTA_COMMON_ROOTFS: readonly variable

The BRANCH case already covers both branches, so the pre-case lines are simply removed.

GitHub issue reference: N/A
Jira reference: N/A

How Has This Been Tested?

  • Building recomputer-rk3588-devkit with BRANCH=vendor previously aborted at config_source_board_file with the error above; with the duplicate source removed, the extension chain is enabled exactly once and the build proceeds.

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • My changes generate no new warnings

Summary by CodeRabbit

  • New Features
    • Added branch-specific configuration for the ReComputer RK3588 DevKit.
    • Mainline builds now use the updated device tree and Panthor GPU stack.
    • Vendor builds retain the vendor extension and shared board configuration.
  • Bug Fixes
    • Improved board package selection for non-vendor builds.

…RANCH case

The unconditional `enable_extension "radxa-aic8800"` and
`source recomputer-rk35xx-common.inc` at the top of the board conf
duplicated what the BRANCH case below already does for vendor, so
BRANCH=vendor sourced common.inc twice. Each sourcing runs
`enable_extension "seeed_armbian_extension"`, which enables
`armbian-ota/ota-support` again; the second pass trips
"OTA_COMMON_ROOTFS: readonly variable" (ota-support.sh declares it
readonly) and aborts the build. The case statement covers both
branches, so the pre-case lines are simply removed.
@github-actions github-actions Bot added the size/small PR with less then 50 lines label Sep 7, 2026
@coderabbitai

coderabbitai Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Team

Run ID: 783712a7-8568-4dea-ae8f-2c3e47de289e

📥 Commits

Reviewing files that changed from the base of the PR and between 10d9e4d and 9404c34.

📒 Files selected for processing (1)
  • config/boards/recomputer-rk3588-devkit.conf
💤 Files with no reviewable changes (1)
  • config/boards/recomputer-rk3588-devkit.conf

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The board configuration now applies branch-specific settings for the vendor and default branches. It also sets RECOMPUTER_GPU_STACK to panthor.

Changes

Cohort / File(s) Summary
Board branch configuration
config/boards/recomputer-rk3588-devkit.conf
Moves extension and common include handling into branch logic. The default branch uses the mainline DTB, sets board packages, and enables the panthor GPU stack.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to 9404c

The board configuration removes duplicate extension setup that prevented vendor-branch builds; no remaining merge-blocking risk is identified.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the board and the main change: removing duplicate common.inc sourcing.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added 11 Milestone: Fourth quarter release Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... labels Sep 7, 2026
@github-actions

github-actions Bot commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

✅ This PR has been reviewed and approved — all set for merge!

@github-actions github-actions Bot added Ready to merge Reviewed, tested and ready for merge and removed Needs review Seeking for review labels Sep 7, 2026
@igorpecovnik
igorpecovnik merged commit 2c8bcb4 into armbian:main Sep 7, 2026
15 checks passed
@Mkiring
Mkiring deleted the fix/rk3588-devkit-double-source branch September 7, 2026 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

11 Milestone: Fourth quarter release Hardware Hardware related like kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/small PR with less then 50 lines

Development

Successfully merging this pull request may close these issues.

2 participants