Skip to content

Respberrypi jchang#1593

Open
JianpengChang wants to merge 3 commits into
agherzan:masterfrom
JianpengChang:respberrypi-jchang
Open

Respberrypi jchang#1593
JianpengChang wants to merge 3 commits into
agherzan:masterfrom
JianpengChang:respberrypi-jchang

Conversation

@JianpengChang

Copy link
Copy Markdown

Small bug fixes found during integration:

  • sdcard_image-rpi: guard sysv sysctl block with if/fi to avoid orphan sysctl.conf on systemd images
  • layer.conf: remove duplicate parselogs_rpi test suite entries
  • rpidistro-ffmpeg: add missing --disable-libv4l2 flag in PACKAGECONFIG
  • rpi-config: use if/elif for mutually exclusive DWC2 modes

@kraj

kraj commented Jun 7, 2026

Copy link
Copy Markdown
Collaborator

Please reconsile this with #1594 as I am inclining towards accepting that change before this one.

Jianpeng Chang added 3 commits June 9, 2026 09:49
The RPI-specific PACKAGECONFIG[v4l2] override was missing the
--disable-libv4l2 flag, leaving it to ffmpeg autodetection when v4l2
is not in PACKAGECONFIG. This may cause non-deterministic builds
depending on sysroot contents.

Signed-off-by: Jianpeng Chang <jianpeng.chang.cn@windriver.com>
The test -e only guarded the sed command, while the echo commands
always executed, creating an orphan /etc/sysctl.conf on systemd-only
images. Wrap the entire sysv block in if/fi so it only runs when
sysctl.conf already exists.

Signed-off-by: Jianpeng Chang <jianpeng.chang.cn@windriver.com>
The DWC2 HOST block had no mutual exclusion check, allowing conflicting
dtoverlay=dwc2 entries in config.txt when multiple ENABLE_DWC2_* variables
were set. Replace three separate if blocks with a single if/elif chain
to ensure only one dr_mode is written.

Signed-off-by: Jianpeng Chang <jianpeng.chang.cn@windriver.com>
@JianpengChang JianpengChang reopened this Jun 9, 2026
@JianpengChang

Copy link
Copy Markdown
Author

Deleted layer.conf: remove duplicate parselogs_rpi test suite entries. Use the fix in #1594

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.

2 participants