Skip to content

sysupgrade: say what --kernel, --rootfs, -k and -r take on each layout - #2539

Merged
widgetii merged 1 commit into
masterfrom
sysupgrade-help-formats
Oct 5, 2026
Merged

widgetii merged 1 commit into
masterfrom
sysupgrade-help-formats

Conversation

@widgetii

@widgetii widgetii commented Oct 4, 2026

Copy link
Copy Markdown
Member

The help said --kernel takes a uImage and --rootfs a squashfs. That is only part of it:

The help now says so. Help text only; no behaviour changes.

sh -n passes, and .github/scripts/test_sysupgrade.sh passes on top of #2538.

The help said --kernel takes a uImage and --rootfs a squashfs. The
kernel can also be a FIT (cv6xx) or zboot.img (Rockchip). On a UBIFS
NAND camera (root=ubi0:rootfs) the rootfs is rootfs.ubifs and carries
the kernel: -k and -r both write it, and --kernel on its own is refused
with a pointer to --rootfs. The help now says so.
@qodo-free-for-open-source-projects

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Grey Divider

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

Grey Divider

Tip of the day
💡 Did you know, you can describe a rule in plain language on the Rules page and Qodo drafts it for you

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

Grey Divider

Qodo Logo

@qodo-free-for-open-source-projects

Copy link
Copy Markdown

PR Summary by Qodo

Clarify sysupgrade image formats by device layout

📝 Documentation 🕐 Less than 10 minutes

Grey Divider

AI Description

• Clarifies that kernel files may be uImage, FIT, or Rockchip zboot.img images.
• Explains that UBIFS NAND cameras use rootfs.ubifs for both online update flags and require
 --rootfs for local files.
• Changes help text only; upgrade behavior is unchanged.
Diagram

graph TD
  Help["sysupgrade help"] --> Remote["Online flags"] --> Layout{"UBIFS NAND?"} -->|Yes| UBIFS["rootfs.ubifs only"]
  Help --> Local["Local file flags"] --> Layout -->|No| Standard["Platform image formats"]
Loading
High-Level Assessment

Updating the existing usage text is appropriate for a documentation-only correction. Changing upgrade logic or adding separate layout-specific help paths would add complexity without addressing a behavior defect.

Files changed (1) +7 / -2

Documentation (1) +7 / -2
sysupgradeDocument layout-specific sysupgrade image requirements +7/-2

Document layout-specific sysupgrade image requirements

• The usage text now lists uImage, FIT, and Rockchip zboot.img kernel formats. It also explains that UBIFS NAND cameras use rootfs.ubifs for both online flags and require --rootfs, rather than --kernel, for a local image.

general/overlay/usr/sbin/sysupgrade

@widgetii
widgetii merged commit 922db5d into master Oct 5, 2026
122 of 123 checks passed
@widgetii
widgetii deleted the sysupgrade-help-formats branch October 5, 2026 04:24
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.

1 participant